[Smartfrog-checkins] SF.net SVN: smartfrog: [6589] trunk/core/smartfrog/bin

[<an...@us...>]

Revision: 6589
          http://smartfrog.svn.sourceforge.net/smartfrog/?rev=6589&view=rev
Author:   anfarr
Date:     2008-06-02 08:16:15 -0700 (Mon, 02 Jun 2008)

Log Message:
-----------
SF-217: Addition of extra environment variable for java.library.path

Modified Paths:
--------------
    trunk/core/smartfrog/bin/setSFDefaultProperties
    trunk/core/smartfrog/bin/setSFDefaultProperties.bat
    trunk/core/smartfrog/bin/sfParse
    trunk/core/smartfrog/bin/sfParse.bat
    trunk/core/smartfrog/bin/sfStart
    trunk/core/smartfrog/bin/sfStart.bat

Modified: trunk/core/smartfrog/bin/setSFDefaultProperties
===================================================================
--- trunk/core/smartfrog/bin/setSFDefaultProperties	2008-06-02 15:14:38 UTC (rev 6588)
+++ trunk/core/smartfrog/bin/setSFDefaultProperties	2008-06-02 15:16:15 UTC (rev 6589)
@@ -1,42 +1,45 @@
-#!/bin/sh
-
-
-# INFO
-# JVM ARGS are declared using -J token in the command line
-# e.g. -J "-Djava.library.path=/libs -Xmx400M"
-# e.g. -J "-Djava.library.path=/libs" -J -Xmx400M
-
-
-#------------------------------------------------------
-# SF ENV PROPERTIES  - Please edit with your preferences
-# ------------------------------------------------------
-
-# -- User libs directory --
-#export SFUSERHOME="$SFHOME/mylibs"
-
-#export SFUSERHOME=%SFHOME%\mylibs
-#export SFUSERHOME1=%SFHOME%\mylibs1
-#export SFUSERHOME2=%SFHOME%\mylibs2
-#export SFUSERHOME3=%SFHOME%\mylibs3
-#export SFUSERHOME4=%SFHOME%\mylibs4
-#export SFUSERCLASSPATH=%SFHOME%\myotheruserlibs
-
-# -- server hostname for multihomed machines
-#export SFSERVERHOSTNAME=127.0.0.1
-
-
-# -- default.ini and default.sf without security --
-if ! test "$SFDEFAULTINI";then 
-   export SFDEFAULTINI=-Dorg.smartfrog.iniFile="$SFHOME/bin/default.ini"
-fi
-if ! test "$SFDEFAULTSF";then     
-   export SFDEFAULTSF=-Dorg.smartfrog.sfcore.processcompound.sfDefault.sfDefault="$SFHOME/bin/default.sf"
-fi
-if ! test "$SFDEFAULTSECURITY";then
-	export SFDEFAULTSECURITY="-Djava.security.policy==$SFHOME/private/sf.no.security.policy -Djava.security.manager"
-fi
-
-if  test "$SFSERVERHOSTNAME";then
-   export SFRMIHOSTNAME=-Djava.rmi.server.hostname="$SFSERVERHOSTNAME"
-fi  
-# -------------------End user properties---------------
+#!/bin/sh
+
+
+# INFO
+# JVM ARGS are declared using -J token in the command line
+# e.g. -J "-Djava.library.path=/libs -Xmx400M"
+# e.g. -J "-Djava.library.path=/libs" -J -Xmx400M
+
+
+#------------------------------------------------------
+# SF ENV PROPERTIES  - Please edit with your preferences
+# ------------------------------------------------------
+
+# -- User libs directory --
+#export SFUSERHOME="$SFHOME/mylibs"
+
+#export SFUSERHOME=%SFHOME%\mylibs
+#export SFUSERHOME1=%SFHOME%\mylibs1
+#export SFUSERHOME2=%SFHOME%\mylibs2
+#export SFUSERHOME3=%SFHOME%\mylibs3
+#export SFUSERHOME4=%SFHOME%\mylibs4
+#export SFUSERCLASSPATH=%SFHOME%\myotheruserlibs
+
+# -- server hostname for multihomed machines
+#export SFSERVERHOSTNAME=127.0.0.1
+
+
+# -- default.ini and default.sf without security --
+if ! test "$SFLIBRARYPATH";then 
+   export SFLIBRARYPATH=-Djava.library.path="$SFHOME/lib/NuSMV"
+fi
+if ! test "$SFDEFAULTINI";then 
+   export SFDEFAULTINI=-Dorg.smartfrog.iniFile="$SFHOME/bin/default.ini"
+fi
+if ! test "$SFDEFAULTSF";then     
+   export SFDEFAULTSF=-Dorg.smartfrog.sfcore.processcompound.sfDefault.sfDefault="$SFHOME/bin/default.sf"
+fi
+if ! test "$SFDEFAULTSECURITY";then
+	export SFDEFAULTSECURITY="-Djava.security.policy==$SFHOME/private/sf.no.security.policy -Djava.security.manager"
+fi
+
+if  test "$SFSERVERHOSTNAME";then
+   export SFRMIHOSTNAME=-Djava.rmi.server.hostname="$SFSERVERHOSTNAME"
+fi  
+# -------------------End user properties---------------

Modified: trunk/core/smartfrog/bin/setSFDefaultProperties.bat
===================================================================
--- trunk/core/smartfrog/bin/setSFDefaultProperties.bat	2008-06-02 15:14:38 UTC (rev 6588)
+++ trunk/core/smartfrog/bin/setSFDefaultProperties.bat	2008-06-02 15:16:15 UTC (rev 6589)
@@ -21,6 +21,7 @@
 rem set SFSERVERHOSTNAME=localhost
 
 rem -- default.ini and default.sf without security --
+if not defined SFDEFAULTINI set SFLIBRARYPATH=-Djava.library.path="%SFHOME%\lib\NuSMV"
 if not defined SFDEFAULTINI set SFDEFAULTINI=-Dorg.smartfrog.iniFile="%SFHOME%\bin\default.ini"
 if not defined SFDEFAULTSF set SFDEFAULTSF=-Dorg.smartfrog.sfcore.processcompound.sfDefault.sfDefault="%SFHOME%\bin\default.sf"
 if not defined SFDEFAULTSECURITY set SFDEFAULTSECURITY=-Djava.security.policy=="%SFHOME%\private\sf.no.security.policy" -Djava.security.manager

Modified: trunk/core/smartfrog/bin/sfParse
===================================================================
--- trunk/core/smartfrog/bin/sfParse	2008-06-02 15:14:38 UTC (rev 6588)
+++ trunk/core/smartfrog/bin/sfParse	2008-06-02 15:16:15 UTC (rev 6589)
@@ -10,13 +10,12 @@
 . "$SFHOME/bin/setSFProperties"
 
 
-
 if test "$SFCODEBASE" && ! test "$SFSECURITY"; then
-        java "$SFDEFAULTINI" $SFCODEBASE org.smartfrog.SFParse "$@"
+        java "$SFDEFAULTINI" $SFLIBRARYPATH $SFCODEBASE org.smartfrog.SFParse "$@"
 elif test "$SFSECURITY" && ! test "$SFCODEBASE"; then
-        java "$SFDEFAULTINI" $SFSECURITY org.smartfrog.SFParse "$@"
+        java "$SFDEFAULTINI" $SFLIBRARYPATH $SFSECURITY org.smartfrog.SFParse "$@"
 elif test "$SFCODEBASE" && test "$SFSECURITY"; then
-        java "$SFDEFAULTINI" $SFCODEBASE $SFSECURITY org.smartfrog.SFParse "$@"
+        java "$SFDEFAULTINI" $SFLIBRARYPATH $SFCODEBASE $SFSECURITY org.smartfrog.SFParse "$@"
 else
-        java "$SFDEFAULTINI" $SFDEFAULTSECURITY org.smartfrog.SFParse "$@"
+        java "$SFDEFAULTINI" $SFLIBRARYPATH $SFDEFAULTSECURITY org.smartfrog.SFParse "$@"
 fi

Modified: trunk/core/smartfrog/bin/sfParse.bat
===================================================================
--- trunk/core/smartfrog/bin/sfParse.bat	2008-06-02 15:14:38 UTC (rev 6588)
+++ trunk/core/smartfrog/bin/sfParse.bat	2008-06-02 15:16:15 UTC (rev 6589)
@@ -9,6 +9,6 @@
 
 call "%SFHOME%\bin\setSFProperties"
 
-%SFJVM% %SFCMDPARAMETERS%  org.smartfrog.SFParse %1 %2 %3 %4 %5 %6 %7 %8 %9
+%SFJVM% %SFCMDPARAMETERS% %SFLIBRARYPATH% org.smartfrog.SFParse %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 endlocal

Modified: trunk/core/smartfrog/bin/sfStart
===================================================================
--- trunk/core/smartfrog/bin/sfStart	2008-06-02 15:14:38 UTC (rev 6588)
+++ trunk/core/smartfrog/bin/sfStart	2008-06-02 15:16:15 UTC (rev 6589)
@@ -49,11 +49,11 @@
 
 
 if test "$SFCODEBASE" && ! test "$SFSECURITY"; then
-        java "$SFDEFAULTINI" $SFCODEBASE org.smartfrog.SFSystem -a \"$APPNAME\":DEPLOY:\"$3\"::$1: $OPTION -e
+        java "$SFDEFAULTINI" $SFCODEBASE $SFLIBRARYPATH org.smartfrog.SFSystem -a \"$APPNAME\":DEPLOY:\"$3\"::$1: $OPTION -e
 elif test "$SFSECURITY" && ! test "$SFCODEBASE"; then
-        java "$SFDEFAULTINI" $SFSECURITY org.smartfrog.SFSystem -a \"$APPNAME\":DEPLOY:\"$3\"::$1: $OPTION -e
+        java "$SFDEFAULTINI" $SFSECURITY $SFLIBRARYPATH org.smartfrog.SFSystem -a \"$APPNAME\":DEPLOY:\"$3\"::$1: $OPTION -e
 elif test "$SFCODEBASE" && test "$SFSECURITY"; then
-        java "$SFDEFAULTINI" $SFCODEBASE $SFSECURITY org.smartfrog.SFSystem -a \"$APPNAME\":DEPLOY:\"$3\"::$1: $OPTION -e
+        java "$SFDEFAULTINI" $SFCODEBASE $SFLIBRARYPATH $SFSECURITY org.smartfrog.SFSystem -a \"$APPNAME\":DEPLOY:\"$3\"::$1: $OPTION -e
 else
-        java "$SFDEFAULTINI" $SFDEFAULTSECURITY org.smartfrog.SFSystem -a \"$APPNAME\":DEPLOY:\"$3\"::$1: $OPTION -e
+        java "$SFDEFAULTINI" $SFDEFAULTSECURITY $SFLIBRARYPATH org.smartfrog.SFSystem -a \"$APPNAME\":DEPLOY:\"$3\"::$1: $OPTION -e
 fi

Modified: trunk/core/smartfrog/bin/sfStart.bat
===================================================================
--- trunk/core/smartfrog/bin/sfStart.bat	2008-06-02 15:14:38 UTC (rev 6588)
+++ trunk/core/smartfrog/bin/sfStart.bat	2008-06-02 15:16:15 UTC (rev 6589)
@@ -24,11 +24,11 @@
 :run
 if (%4)==(-p) GOTO execute
 rem %SFJVM% %SFCMDPARAMETERS% org.smartfrog.SFSystem -a \"%2\":DEPLOY:\"%3\"::%1: -e
-%SFJVM% %SFCMDPARAMETERS% org.smartfrog.SFSystem -a \"%APPNAME%\":DEPLOY:\"%3\"::%1: -e
+%SFJVM% %SFCMDPARAMETERS% %SFLIBRARYPATH% org.smartfrog.SFSystem -a \"%APPNAME%\":DEPLOY:\"%3\"::%1: -e
 GOTO end
 :execute
 if (%5)==() goto usage
-%SFJVM% %SFCMDPARAMETERS% org.smartfrog.SFSystem -a \"%APPNAME%\":DEPLOY:\"%3\"::%1: -p %5 -e
+%SFJVM% %SFCMDPARAMETERS% %SFLIBRARYPATH% org.smartfrog.SFSystem -a \"%APPNAME%\":DEPLOY:\"%3\"::%1: -p %5 -e
 
 
 GOTO end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.