Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 20911 invoked from network); 11 Dec 2005 00:14:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Dec 2005 00:14:34 -0000 Received: (qmail 70668 invoked by uid 500); 11 Dec 2005 00:14:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 70655 invoked by uid 500); 11 Dec 2005 00:14:32 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 70637 invoked by uid 99); 11 Dec 2005 00:14:32 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Dec 2005 16:14:32 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 10 Dec 2005 16:14:31 -0800 Received: (qmail 19717 invoked by uid 65534); 11 Dec 2005 00:14:10 -0000 Message-ID: <20051211001410.19703.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r355819 - in /geronimo/branches/1.0: assemblies/j2ee-installer/src/var/log/ assemblies/j2ee-jetty-server/src/var/log/ assemblies/j2ee-tomcat-server/src/var/log/ modules/scripts/src/resources/bin/ modules/system/src/java/org/apache/geronimo/... Date: Sun, 11 Dec 2005 00:14:03 -0000 To: scm@geronimo.apache.org From: sppatel@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sppatel Date: Sat Dec 10 16:13:45 2005 New Revision: 355819 URL: http://svn.apache.org/viewcvs?rev=355819&view=rev Log: GERONIMO-1290 Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/client-log4j.properties geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/deployer-log4j.properties geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/client-log4j.properties geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/client-log4j.properties geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationDump.java geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java geronimo/branches/1.0/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java geronimo/branches/1.0/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/client-log4j.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/client-log4j.properties?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/client-log4j.properties (original) +++ geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/client-log4j.properties Sat Dec 10 16:13:45 2005 @@ -34,7 +34,7 @@ # overwritten without archiving the previous version of the log. # log4j.appender.FILE.append=true -log4j.appender.FILE.file=${geronimo.base.dir}/var/log/client.log +log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/client.log log4j.appender.FILE.bufferedIO=false log4j.appender.FILE.maxBackupIndex=3 log4j.appender.FILE.maxFileSize=10MB Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/deployer-log4j.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/deployer-log4j.properties?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/deployer-log4j.properties (original) +++ geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/deployer-log4j.properties Sat Dec 10 16:13:45 2005 @@ -34,7 +34,7 @@ # overwritten without archiving the previous version of the log. # log4j.appender.FILE.append=true -log4j.appender.FILE.file=${geronimo.base.dir}/var/log/deployer.log +log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/deployer.log log4j.appender.FILE.bufferedIO=false log4j.appender.FILE.maxBackupIndex=3 log4j.appender.FILE.maxFileSize=10MB Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties (original) +++ geronimo/branches/1.0/assemblies/j2ee-installer/src/var/log/server-log4j.properties Sat Dec 10 16:13:45 2005 @@ -34,7 +34,7 @@ # overwritten without archiving the previous version of the log. # log4j.appender.FILE.append=true -log4j.appender.FILE.file=${geronimo.base.dir}/var/log/geronimo.log +log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/geronimo.log log4j.appender.FILE.bufferedIO=false log4j.appender.FILE.maxBackupIndex=3 log4j.appender.FILE.maxFileSize=10MB Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/client-log4j.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/client-log4j.properties?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/client-log4j.properties (original) +++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/client-log4j.properties Sat Dec 10 16:13:45 2005 @@ -34,7 +34,7 @@ # overwritten without archiving the previous version of the log. # log4j.appender.FILE.append=true -log4j.appender.FILE.file=${geronimo.base.dir}/var/log/client.log +log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/client.log log4j.appender.FILE.bufferedIO=false log4j.appender.FILE.maxBackupIndex=3 log4j.appender.FILE.maxFileSize=10MB Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties (original) +++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/deployer-log4j.properties Sat Dec 10 16:13:45 2005 @@ -34,7 +34,7 @@ # overwritten without archiving the previous version of the log. # log4j.appender.FILE.append=true -log4j.appender.FILE.file=${geronimo.base.dir}/var/log/deployer.log +log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/deployer.log log4j.appender.FILE.bufferedIO=false log4j.appender.FILE.maxBackupIndex=3 log4j.appender.FILE.maxFileSize=10MB Modified: geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties (original) +++ geronimo/branches/1.0/assemblies/j2ee-jetty-server/src/var/log/server-log4j.properties Sat Dec 10 16:13:45 2005 @@ -34,7 +34,7 @@ # overwritten without archiving the previous version of the log. # log4j.appender.FILE.append=true -log4j.appender.FILE.file=${geronimo.base.dir}/var/log/geronimo.log +log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/geronimo.log log4j.appender.FILE.bufferedIO=false log4j.appender.FILE.maxBackupIndex=3 log4j.appender.FILE.maxFileSize=10MB Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/client-log4j.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/client-log4j.properties?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/client-log4j.properties (original) +++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/client-log4j.properties Sat Dec 10 16:13:45 2005 @@ -34,7 +34,7 @@ # overwritten without archiving the previous version of the log. # log4j.appender.FILE.append=true -log4j.appender.FILE.file=${geronimo.base.dir}/var/log/client.log +log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/client.log log4j.appender.FILE.bufferedIO=false log4j.appender.FILE.maxBackupIndex=3 log4j.appender.FILE.maxFileSize=10MB Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties (original) +++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/deployer-log4j.properties Sat Dec 10 16:13:45 2005 @@ -34,7 +34,7 @@ # overwritten without archiving the previous version of the log. # log4j.appender.FILE.append=true -log4j.appender.FILE.file=${geronimo.base.dir}/var/log/deployer.log +log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/deployer.log log4j.appender.FILE.bufferedIO=false log4j.appender.FILE.maxBackupIndex=3 log4j.appender.FILE.maxFileSize=10MB Modified: geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties (original) +++ geronimo/branches/1.0/assemblies/j2ee-tomcat-server/src/var/log/server-log4j.properties Sat Dec 10 16:13:45 2005 @@ -34,7 +34,7 @@ # overwritten without archiving the previous version of the log. # log4j.appender.FILE.append=true -log4j.appender.FILE.file=${geronimo.base.dir}/var/log/geronimo.log +log4j.appender.FILE.file=${org.apache.geronimo.base.dir}/var/log/geronimo.log log4j.appender.FILE.bufferedIO=false log4j.appender.FILE.maxBackupIndex=3 log4j.appender.FILE.maxFileSize=10MB Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat (original) +++ geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.bat Sat Dec 10 16:13:45 2005 @@ -250,15 +250,15 @@ @REM Execute Java with the applicable properties if not "%JDB%" == "" goto doJDB if not "%JPDA%" == "" goto doJpda -%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dgeronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS% +%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS% goto end :doJDB -%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -sourcepath "%JDB_SRCPATH%" -Dgeronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath %_JARFILE% %MAINCLASS% %CMD_LINE_ARGS% +%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -sourcepath "%JDB_SRCPATH%" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath %_JARFILE% %MAINCLASS% %CMD_LINE_ARGS% goto end :doJpda -%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% -Dgeronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS% +%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS% goto end :end Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh (original) +++ geronimo/branches/1.0/modules/scripts/src/resources/bin/geronimo.sh Sat Dec 10 16:13:45 2005 @@ -245,7 +245,7 @@ shift exec "$_RUNJDB" $JAVA_OPTS $GERONIMO_OPTS \ -sourcepath "$JDB_SRCPATH" \ - -Dgeronimo.base.dir="$GERONIMO_BASE" \ + -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \ -Djava.io.tmpdir="$GERONIMO_TMPDIR" \ -classpath "$GERONIMO_HOME"/bin/server.jar \ org.apache.geronimo.system.main.Daemon $LONG_OPT "$@" @@ -256,7 +256,7 @@ shift exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ - -Dgeronimo.base.dir="$GERONIMO_BASE" \ + -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \ -Djava.io.tmpdir="$GERONIMO_TMPDIR" \ -jar "$GERONIMO_HOME"/bin/server.jar $LONG_OPT "$@" @@ -266,7 +266,7 @@ touch $GERONIMO_OUT $START_OS_CMD "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \ -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" \ - -Dgeronimo.base.dir="$GERONIMO_BASE" \ + -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \ -Djava.io.tmpdir="$GERONIMO_TMPDIR" \ -jar "$GERONIMO_HOME"/bin/server.jar $LONG_OPT "$@" \ >> $GERONIMO_OUT 2>&1 & @@ -287,7 +287,7 @@ fi "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \ - -Dgeronimo.base.dir="$GERONIMO_BASE" \ + -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \ -Djava.io.tmpdir="$GERONIMO_TMPDIR" \ -jar "$GERONIMO_HOME"/bin/shutdown.jar "$@" Modified: geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationDump.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationDump.java?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationDump.java (original) +++ geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/configuration/ConfigurationDump.java Sat Dec 10 16:13:45 2005 @@ -56,7 +56,7 @@ public static void main(String[] args) throws Exception { File geronimoBaseDir = new File(args[0]); - System.setProperty("geronimo.base.dir", geronimoBaseDir.getAbsolutePath()); + System.setProperty("org.apache.geronimo.base.dir", geronimoBaseDir.getAbsolutePath()); // create the kernel Kernel kernel = KernelFactory.newInstance().createKernel("geronimo"); Modified: geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java (original) +++ geronimo/branches/1.0/modules/system/src/java/org/apache/geronimo/system/serverinfo/BasicServerInfo.java Sat Dec 10 16:13:45 2005 @@ -49,7 +49,7 @@ // Before we try the persistent value, we always check the // system properties first. This lets an admin override this // on the command line. - baseDirectory = System.getProperty("geronimo.base.dir", baseDirectory); + baseDirectory = System.getProperty("org.apache.geronimo.base.dir", baseDirectory); if (baseDirectory == null || baseDirectory.length() == 0) { base = DirectoryUtils.getGeronimoInstallDirectory(); if (base == null) { @@ -64,7 +64,7 @@ } baseURI = base.toURI(); - System.setProperty("geronimo.base.dir", base.getAbsolutePath()); + System.setProperty("org.apache.geronimo.base.dir", base.getAbsolutePath()); } /** Modified: geronimo/branches/1.0/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java (original) +++ geronimo/branches/1.0/modules/system/src/test/org/apache/geronimo/system/serverinfo/ServerInfoTest.java Sat Dec 10 16:13:45 2005 @@ -76,7 +76,7 @@ try { file = File.createTempFile("geronimo", null); // a workaround - ServerInfo sets system-wide property - System.setProperty("geronimo.base.dir", file.getName()); + System.setProperty("org.apache.geronimo.base.dir", file.getName()); new BasicServerInfo(file.getName()); fail("ServerInfo should throw exception when given non-directory path"); } catch (IOException ioe) { @@ -86,12 +86,12 @@ String basedir = "."; // a workaround - ServerInfo sets system-wide property - System.setProperty("geronimo.base.dir", basedir); + System.setProperty("org.apache.geronimo.base.dir", basedir); ServerInfo si = new BasicServerInfo(basedir); - assertNotNull(System.getProperty("geronimo.base.dir")); + assertNotNull(System.getProperty("org.apache.geronimo.base.dir")); assertEquals("base directory is incorrect", basedir, si.getBaseDirectory()); } finally { - System.getProperties().remove("geronimo.base.dir"); + System.getProperties().remove("org.apache.geronimo.base.dir"); } } } Modified: geronimo/branches/1.0/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java?rev=355819&r1=355818&r2=355819&view=diff ============================================================================== --- geronimo/branches/1.0/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java (original) +++ geronimo/branches/1.0/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java Sat Dec 10 16:13:45 2005 @@ -87,7 +87,7 @@ } public void execute() throws Exception { - System.setProperty("geronimo.base.dir", getGeronimoHome()); + System.setProperty("org.apache.geronimo.base.dir", getGeronimoHome()); List configList = new ArrayList(); for (StringTokenizer st = new StringTokenizer(configs); st.hasMoreTokens();) { configList.add(new URI(st.nextToken()));