From: <ju...@us...> - 2007-10-12 10:53:13
|
Revision: 5256 http://smartfrog.svn.sourceforge.net/smartfrog/?rev=5256&view=rev Author: julgui Date: 2007-10-12 03:53:09 -0700 (Fri, 12 Oct 2007) Log Message: ----------- Added new env property to shell scripts: if SFSECURERESOURCES_OFF=ENABLED is defined in the enviroment then -Dorg.smartfrog.sfcore.security.secureResourcesOff=true is added to the CLI. http://jira.smartfrog.org/jira/browse/SFOS-486 Modified Paths: -------------- trunk/core/smartfrog/bin/setSFProperties trunk/core/smartfrog/bin/setSFProperties.bat trunk/core/smartfrog/bin/setSFSecurityProperties trunk/core/smartfrog/bin/setSFSecurityProperties.bat Modified: trunk/core/smartfrog/bin/setSFProperties =================================================================== --- trunk/core/smartfrog/bin/setSFProperties 2007-10-11 19:13:32 UTC (rev 5255) +++ trunk/core/smartfrog/bin/setSFProperties 2007-10-12 10:53:09 UTC (rev 5256) @@ -10,6 +10,9 @@ # Uncomment to enable Security #export SFSECURITY_ON=ENABLED +# Uncomment to load local descriptions when security is on +# export SFSECURERESOURCES_OFF=ENABLED + # To define a user classpath, use variable SFUSERCLASSPATH # export SFUSERCLASSPATH=. Modified: trunk/core/smartfrog/bin/setSFProperties.bat =================================================================== --- trunk/core/smartfrog/bin/setSFProperties.bat 2007-10-11 19:13:32 UTC (rev 5255) +++ trunk/core/smartfrog/bin/setSFProperties.bat 2007-10-12 10:53:09 UTC (rev 5256) @@ -10,6 +10,10 @@ rem Uncomment to enable Security rem set SFSECURITY_ON=ENABLED +rem Uncomment to load local descriptions when security is on +rem set SFSECURERESOURCES_OFF=ENABLED + + rem To define a user classpath, use variable SFUSERCLASSPATH rem set SFUSERCLASSPATH=. Modified: trunk/core/smartfrog/bin/setSFSecurityProperties =================================================================== --- trunk/core/smartfrog/bin/setSFSecurityProperties 2007-10-11 19:13:32 UTC (rev 5255) +++ trunk/core/smartfrog/bin/setSFSecurityProperties 2007-10-12 10:53:09 UTC (rev 5256) @@ -16,6 +16,10 @@ # -- Security properties -- export SFSECURITY="-Djava.security.policy==$SFPRIVATE/sf.policy -Djava.security.manager -Dorg.smartfrog.sfcore.security.keyStoreName=$SFPRIVATE/$SFHOSTNAME/mykeys.st -Dorg.smartfrog.sfcore.security.propFile=$SFPRIVATE/$SFHOSTNAME/SFSecurity.properties" +if test "$SFSECURERESOURCES_OFF"; then + export SFSECURITY="$SFSECURITY -Dorg.smartfrog.sfcore.security.secureResourcesOff=true" +fi + # -- default.ini and default.sf with security. These files need to be inside a jar file-- export SFDEFAULTINI=-Dorg.smartfrog.iniFile=org/smartfrog/default.ini export SFDEFAULTSF=-Dorg.smartfrog.sfcore.processcompound.sfDefault.sfDefault=org/smartfrog/default.sf Modified: trunk/core/smartfrog/bin/setSFSecurityProperties.bat =================================================================== --- trunk/core/smartfrog/bin/setSFSecurityProperties.bat 2007-10-11 19:13:32 UTC (rev 5255) +++ trunk/core/smartfrog/bin/setSFSecurityProperties.bat 2007-10-12 10:53:09 UTC (rev 5256) @@ -14,6 +14,8 @@ rem -- Security properties -- set SFSECURITY=-Djava.security.policy=="%SFPRIVATE%\sf.policy" -Djava.security.manager -Dorg.smartfrog.sfcore.security.keyStoreName="%SFPRIVATE%\%SFHOSTNAME%\mykeys.st" -Dorg.smartfrog.sfcore.security.propFile="%SFPRIVATE%\%SFHOSTNAME%\SFSecurity.properties" +if defined SFSECURERESOURCES_OFF set SFSECURITY=%SFSECURITY% -Dorg.smartfrog.sfcore.security.secureResourcesOff=true + rem -- default.ini and default.sf with security. These files need to be inside a jar file-- set SFDEFAULTINI=-Dorg.smartfrog.iniFile=org/smartfrog/default.ini set SFDEFAULTSF=-Dorg.smartfrog.sfcore.processcompound.sfDefault.sfDefault=org/smartfrog/default.sf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |