Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 78734 invoked from network); 4 May 2007 18:04:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 May 2007 18:04:47 -0000 Received: (qmail 19600 invoked by uid 500); 4 May 2007 18:04:49 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 19569 invoked by uid 500); 4 May 2007 18:04:49 -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 19489 invoked by uid 99); 4 May 2007 18:04:49 -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 11:04:49 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: local policy) Received: from [209.86.89.65] (HELO elasmtp-kukur.atl.sa.earthlink.net) (209.86.89.65) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2007 11:04:41 -0700 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=dk20050327; d=earthlink.net; b=X0d5jaqXXU7KSIqvK5je6SkGlkAXFPAhaCwu9EthOsVmTMpWVQ7qhAmc6d+yaZ9x; h=Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding:X-ELNK-Trace:X-Originating-IP; Received: from [129.33.49.251] (helo=[9.37.214.136]) by elasmtp-kukur.atl.sa.earthlink.net with asmtp (Exim 4.34) id 1Hk28h-0004fF-N8; Fri, 04 May 2007 14:04:19 -0400 Message-ID: <463B75AD.4040403@earthlink.net> Date: Fri, 04 May 2007 14:04:29 -0400 From: Joe Bohn User-Agent: Thunderbird 1.5.0.10 (Macintosh/20070221) MIME-Version: 1.0 To: dev@geronimo.apache.org CC: scm@geronimo.apache.org Subject: Re: 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... References: <20070504103248.892871A9838@eris.apache.org> In-Reply-To: <20070504103248.892871A9838@eris.apache.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ELNK-Trace: c408501814fc19611aa676d7e74259b7b3291a7d08dfec79fba1865c4a87cde40dc98e5cb8d0c447350badd9bab72f9c350badd9bab72f9c350badd9bab72f9c X-Originating-IP: 129.33.49.251 X-Virus-Checked: Checked by ClamAV on apache.org Anita, Would it be too much to ask that we back this change and 535200 as well ... at least for now? It's hindering us on getting the TCK working since there are comparable changes necessary there. So far I must be missing something because I still can't get things working. It also sounds like there might be some debate on the appropriate default configuration when only one server instance is required. Thanks, Joe akulshreshtha@apache.org wrote: > 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 > > >