Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 4116 invoked from network); 4 May 2007 10:33:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 May 2007 10:33:10 -0000 Received: (qmail 74718 invoked by uid 500); 4 May 2007 10:33:16 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 74674 invoked by uid 500); 4 May 2007 10:33:16 -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 74661 invoked by uid 99); 4 May 2007 10:33:16 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2007 03:33:16 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2007 03:33:08 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 892871A9838; Fri, 4 May 2007 03:32:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r535158 - in /geronimo/server/trunk: assemblies/ assemblies/geronimo-jetty6-jee5/src/main/assembly/ assemblies/geronimo-jetty6-minimal/src/main/assembly/ assemblies/geronimo-tomcat6-jee5/src/main/assembly/ assemblies/geronimo-tomcat6-minima... Date: Fri, 04 May 2007 10:32:47 -0000 To: scm@geronimo.apache.org From: akulshreshtha@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070504103248.892871A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akulshreshtha Date: Fri May 4 03:32:45 2007 New Revision: 535158 URL: http://svn.apache.org/viewvc?view=rev&rev=535158 Log: GERONIMO-3123 Move the 'var' directory to geronimo0/var and create a copy named template/var in GERONIMO_HOME Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml geronimo/server/trunk/assemblies/pom.xml geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java (contents, props changed) Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml?view=diff&rev=535158&r1=535157&r2=535158 ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml (original) +++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/assembly/bin.xml Fri May 4 03:32:45 2007 @@ -1,19 +1,19 @@ @@ -83,7 +83,7 @@ org.apache.geronimo.configs:jsr88-deploymentfactory - + bin shutdown.jar @@ -107,6 +107,7 @@ / META-INF/** + var/** @@ -144,10 +145,15 @@ dos + + + target/boilerplate/var + ${templateDir}/var + target/classes - / + ${templateDir} var/config/** @@ -159,7 +165,30 @@ target/classes - / + ${templateDir} + 0644 + + var/config/config.xml + + + + + + target/boilerplate/var + ${defaultServerName}/var + + + + target/classes + ${defaultServerName} + + var/config/** + + + + + target/classes + ${defaultServerName} 0644 var/config/config.xml Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml?view=diff&rev=535158&r1=535157&r2=535158 ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml (original) +++ geronimo/server/trunk/assemblies/geronimo-jetty6-minimal/src/main/assembly/bin.xml Fri May 4 03:32:45 2007 @@ -99,6 +99,7 @@ / META-INF/** + var/** @@ -136,10 +137,15 @@ dos + + + target/boilerplate/var + ${templateDir}/var + target/classes - / + ${templateDir} var/config/** @@ -151,7 +157,30 @@ target/classes - / + ${templateDir} + 0644 + + var/config/config.xml + + + + + + target/boilerplate/var + ${defaultServerName}/var + + + + target/classes + ${defaultServerName} + + var/config/** + + + + + target/classes + ${defaultServerName} 0644 var/config/config.xml Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml?view=diff&rev=535158&r1=535157&r2=535158 ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml (original) +++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/assembly/bin.xml Fri May 4 03:32:45 2007 @@ -107,6 +107,7 @@ / META-INF/** + var/** @@ -144,10 +145,15 @@ dos + + + target/boilerplate/var + ${templateDir}/var + target/classes - / + ${templateDir} var/config/** @@ -159,7 +165,30 @@ target/classes - / + ${templateDir} + 0644 + + var/config/config.xml + + + + + + target/boilerplate/var + ${defaultServerName}/var + + + + target/classes + ${defaultServerName} + + var/config/** + + + + + target/classes + ${defaultServerName} 0644 var/config/config.xml Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml?view=diff&rev=535158&r1=535157&r2=535158 ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml (original) +++ geronimo/server/trunk/assemblies/geronimo-tomcat6-minimal/src/main/assembly/bin.xml Fri May 4 03:32:45 2007 @@ -43,7 +43,7 @@ - + bin server.jar @@ -67,7 +67,7 @@ org.apache.geronimo.configs:online-deployer - + lib jsr88-deploymentfactory.jar @@ -75,7 +75,7 @@ org.apache.geronimo.configs:jsr88-deploymentfactory - + bin shutdown.jar @@ -99,6 +99,7 @@ / META-INF/** + var/** @@ -136,10 +137,15 @@ dos + + + target/boilerplate/var + ${templateDir}/var + target/classes - / + ${templateDir} var/config/** @@ -151,7 +157,30 @@ target/classes - / + ${templateDir} + 0644 + + var/config/config.xml + + + + + + target/boilerplate/var + ${defaultServerName}/var + + + + target/classes + ${defaultServerName} + + var/config/** + + + + + target/classes + ${defaultServerName} 0644 var/config/config.xml Modified: geronimo/server/trunk/assemblies/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?view=diff&rev=535158&r1=535157&r2=535158 ============================================================================== --- geronimo/server/trunk/assemblies/pom.xml (original) +++ geronimo/server/trunk/assemblies/pom.xml Fri May 4 03:32:45 2007 @@ -35,35 +35,11 @@ pom - + + + + template + geronimo0 http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0 http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0 Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java?view=diff&rev=535158&r1=535157&r2=535158 ============================================================================== --- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java (original) +++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java Fri May 4 03:32:45 2007 @@ -26,14 +26,17 @@ /** * - * @version $Rev: 476049 $ $Date: 2006-11-17 15:35:17 +1100 (Fri, 17 Nov 2006) $ + * @version $Rev$ $Date$ */ public class MainConfigurationBootstrapper { public final static String ARGUMENT_VERBOSE_SHORTFORM = "-v"; public final static String ARGUMENT_VERBOSE = "--verbose"; public final static String ARGUMENT_MORE_VERBOSE_SHORTFORM = "-vv"; public final static String ARGUMENT_MORE_VERBOSE = "--veryverbose"; - + public final static String SERVER_NAME_SYS_PROP = "org.apache.geronimo.server.name"; + public final static String SERVER_DIR_SYS_PROP = "org.apache.geronimo.server.dir"; + public final static String DEFAULT_SERVER_NAME = "geronimo0"; + public static String getVerboseLevel(String[] args) { String verboseArg = null; for (int i = 0; i < args.length; i++) { @@ -67,6 +70,7 @@ } public static void main(MainConfigurationBootstrapper bootstrapper, String[] args) { + setSysProperties(); bootstrapper.initializeLogging(args); Main main = bootstrapper.getMain(MainConfigurationBootstrapper.class.getClassLoader()); @@ -156,6 +160,14 @@ } } GeronimoLogging.initialize(level); + } + + private static void setSysProperties() { + String serverDir = System.getProperty(SERVER_DIR_SYS_PROP); + if ((serverDir == null) || (serverDir.length() == 0)) { + // use server name to set server dir + System.setProperty(SERVER_NAME_SYS_PROP, System.getProperty(SERVER_NAME_SYS_PROP, DEFAULT_SERVER_NAME)); + } } } Propchange: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Propchange: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/MainConfigurationBootstrapper.java ------------------------------------------------------------------------------ svn:mime-type = text/plain