geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1383790 - in /geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution: text/etc/system.properties unix-shell/bin/geronimo windows-text/bin/geronimo.bat
Date Wed, 12 Sep 2012 05:53:12 GMT
Author: gawor
Date: Wed Sep 12 05:53:11 2012
New Revision: 1383790

URL: http://svn.apache.org/viewvc?rev=1383790&view=rev
Log:
GERONIMO-6132: Move the searchWiredBundles=false property to etc/system.properties file for
easier maintenance

Modified:
    geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
    geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
    geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat

Modified: geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties?rev=1383790&r1=1383789&r2=1383790&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
(original)
+++ geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/text/etc/system.properties
Wed Sep 12 05:53:11 2012
@@ -78,12 +78,15 @@ geronimo.cleanDirectoryList=${karaf.base
 #
 #osgi.debug=${karaf.base}/etc/equinox-debug.properties
 
-
 #
 # Allows applications that assume TCCL to be a URLClassLoader to still run ok, default is
true.
 #
 org.apache.geronimo.equinox.useURLClassLoader=true
 
+#
+# Configure whether META-INF/ resource lookup should also check wired bundles.
+#
+org.apache.xbean.osgi.bundle.util.BundleResourceHelper.searchWiredBundles=false
 
 #
 # org.apache.catalina.STRICT_SERVLET_COMPLIANCE is false by default. 

Modified: geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo?rev=1383790&r1=1383789&r2=1383790&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
(original)
+++ geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
Wed Sep 12 05:53:11 2012
@@ -275,8 +275,6 @@ if [ "$1" = "jpda" ] ; then
   shift
 fi
 
-GERONIMO_OPTS="-Dorg.apache.xbean.osgi.bundle.util.BundleResourceHelper.searchWiredBundles=false
$GERONIMO_OPTS"
-
 if [ "$1" = "debug" ] ; then
   if $os400; then
     echo "Debug command not available on OS400"

Modified: geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat?rev=1383790&r1=1383789&r2=1383790&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
(original)
+++ geronimo/server/branches/3.0/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
Wed Sep 12 05:53:11 2012
@@ -339,11 +339,11 @@ cmd /c exit /b 0
 
 @REM Execute Java with the applicable properties
 if not "%JDB%" == "" goto doJDB
-%_EXECJAVA% -Dorg.apache.xbean.osgi.bundle.util.BundleResourceHelper.searchWiredBundles=false
%JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% %CONSOLE_OPTS% -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"
-Dorg.apache.geronimo.server.dir="%GERONIMO_SERVER%" -Dkaraf.home="%GERONIMO_HOME%" -Dkaraf.base="%GERONIMO_SERVER%"
-Djava.util.logging.config.file="%GERONIMO_SERVER%\etc\java.util.logging.properties" -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed"
-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Djava.io.tmpdir="%GERONIMO_TMPDIR%"
-classpath "%CLASSPATH%" %MAINCLASS% %_LONG_OPT% %CMD_LINE_ARGS%
+%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% %CONSOLE_OPTS% -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"
-Dorg.apache.geronimo.server.dir="%GERONIMO_SERVER%" -Dkaraf.home="%GERONIMO_HOME%" -Dkaraf.base="%GERONIMO_SERVER%"
-Djava.util.logging.config.file="%GERONIMO_SERVER%\etc\java.util.logging.properties" -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed"
-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Djava.io.tmpdir="%GERONIMO_TMPDIR%"
-classpath "%CLASSPATH%" %MAINCLASS% %_LONG_OPT% %CMD_LINE_ARGS%
 goto end
 
 :doJDB
-%_EXECJAVA% -Dorg.apache.xbean.osgi.bundle.util.BundleResourceHelper.searchWiredBundles=false
%JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -sourcepath "%JDB_SRCPATH%" %CONSOLE_OPTS% -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%"
-Dorg.apache.geronimo.server.dir="%GERONIMO_SERVER%" -Dkaraf.home="%GERONIMO_HOME%" -Dkaraf.base="%GERONIMO_SERVER%"
-Djava.util.logging.config.file="%GERONIMO_SERVER%\etc\java.util.logging.properties" -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed"
-Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Djava.io.tmpdir="%GERONIMO_TMPDIR%"
-classpath "%CLASSPATH%" %MAINCLASS% %CMD_LINE_ARGS%
+%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -sourcepath "%JDB_SRCPATH%" %CONSOLE_OPTS%
-Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Dorg.apache.geronimo.server.dir="%GERONIMO_SERVER%"
-Dkaraf.home="%GERONIMO_HOME%" -Dkaraf.base="%GERONIMO_SERVER%" -Djava.util.logging.config.file="%GERONIMO_SERVER%\etc\java.util.logging.properties"
-Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext"
-Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath "%CLASSPATH%" %MAINCLASS% %CMD_LINE_ARGS%
 goto end
 
 :end



Mime
View raw message