You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ak...@apache.org on 2007/05/04 12:32:47 UTC
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...
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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
<!-- $Rev$ $Date$ -->
@@ -83,7 +83,7 @@
<include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
</includes>
</dependencySet>
-
+
<dependencySet>
<outputDirectory>bin</outputDirectory>
<outputFileNameMapping>shutdown.jar</outputFileNameMapping>
@@ -107,6 +107,7 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>META-INF/**</exclude>
+ <exclude>var/**</exclude>
</excludes>
</fileSet>
@@ -144,10 +145,15 @@
</includes>
<lineEnding>dos</lineEnding>
</fileSet>
+
+ <fileSet>
+ <directory>target/boilerplate/var</directory>
+ <outputDirectory>${templateDir}/var</outputDirectory>
+ </fileSet>
<fileSet>
<directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${templateDir}</outputDirectory>
<includes>
<include>var/config/**</include>
</includes>
@@ -159,7 +165,30 @@
<fileSet>
<directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${templateDir}</outputDirectory>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>var/config/config.xml</include>
+ </includes>
+ </fileSet>
+
+ <!-- make a copy of var for default server named geronimo0 -->
+ <fileSet>
+ <directory>target/boilerplate/var</directory>
+ <outputDirectory>${defaultServerName}/var</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>${defaultServerName}</outputDirectory>
+ <includes>
+ <include>var/config/**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>${defaultServerName}</outputDirectory>
<fileMode>0644</fileMode>
<includes>
<include>var/config/config.xml</include>
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 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>META-INF/**</exclude>
+ <exclude>var/**</exclude>
</excludes>
</fileSet>
@@ -136,10 +137,15 @@
</includes>
<lineEnding>dos</lineEnding>
</fileSet>
+
+ <fileSet>
+ <directory>target/boilerplate/var</directory>
+ <outputDirectory>${templateDir}/var</outputDirectory>
+ </fileSet>
<fileSet>
<directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${templateDir}</outputDirectory>
<includes>
<include>var/config/**</include>
</includes>
@@ -151,7 +157,30 @@
<fileSet>
<directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${templateDir}</outputDirectory>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>var/config/config.xml</include>
+ </includes>
+ </fileSet>
+
+ <!-- make a copy of var for default server named geronimo0 -->
+ <fileSet>
+ <directory>target/boilerplate/var</directory>
+ <outputDirectory>${defaultServerName}/var</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>${defaultServerName}</outputDirectory>
+ <includes>
+ <include>var/config/**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>${defaultServerName}</outputDirectory>
<fileMode>0644</fileMode>
<includes>
<include>var/config/config.xml</include>
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 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>META-INF/**</exclude>
+ <exclude>var/**</exclude>
</excludes>
</fileSet>
@@ -144,10 +145,15 @@
</includes>
<lineEnding>dos</lineEnding>
</fileSet>
+
+ <fileSet>
+ <directory>target/boilerplate/var</directory>
+ <outputDirectory>${templateDir}/var</outputDirectory>
+ </fileSet>
<fileSet>
<directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${templateDir}</outputDirectory>
<includes>
<include>var/config/**</include>
</includes>
@@ -159,7 +165,30 @@
<fileSet>
<directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${templateDir}</outputDirectory>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>var/config/config.xml</include>
+ </includes>
+ </fileSet>
+
+ <!-- make a copy of var for default server named geronimo0 -->
+ <fileSet>
+ <directory>target/boilerplate/var</directory>
+ <outputDirectory>${defaultServerName}/var</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>${defaultServerName}</outputDirectory>
+ <includes>
+ <include>var/config/**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>${defaultServerName}</outputDirectory>
<fileMode>0644</fileMode>
<includes>
<include>var/config/config.xml</include>
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 @@
<!--
NOTE: lib/endorsed/ is picked up from boilerplate.
-->
-
+
<dependencySet>
<outputDirectory>bin</outputDirectory>
<outputFileNameMapping>server.jar</outputFileNameMapping>
@@ -67,7 +67,7 @@
<include>org.apache.geronimo.configs:online-deployer</include>
</includes>
</dependencySet>
-
+
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
@@ -75,7 +75,7 @@
<include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
</includes>
</dependencySet>
-
+
<dependencySet>
<outputDirectory>bin</outputDirectory>
<outputFileNameMapping>shutdown.jar</outputFileNameMapping>
@@ -99,6 +99,7 @@
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>META-INF/**</exclude>
+ <exclude>var/**</exclude>
</excludes>
</fileSet>
@@ -136,10 +137,15 @@
</includes>
<lineEnding>dos</lineEnding>
</fileSet>
+
+ <fileSet>
+ <directory>target/boilerplate/var</directory>
+ <outputDirectory>${templateDir}/var</outputDirectory>
+ </fileSet>
<fileSet>
<directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${templateDir}</outputDirectory>
<includes>
<include>var/config/**</include>
</includes>
@@ -151,7 +157,30 @@
<fileSet>
<directory>target/classes</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>${templateDir}</outputDirectory>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>var/config/config.xml</include>
+ </includes>
+ </fileSet>
+
+ <!-- make a copy of var for default server named geronimo0 -->
+ <fileSet>
+ <directory>target/boilerplate/var</directory>
+ <outputDirectory>${defaultServerName}/var</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>${defaultServerName}</outputDirectory>
+ <includes>
+ <include>var/config/**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>${defaultServerName}</outputDirectory>
<fileMode>0644</fileMode>
<includes>
<include>var/config/config.xml</include>
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 @@
<packaging>pom</packaging>
<properties>
- <!--
- TODO: Move this where it can be shared with the configs/pom.xml values
-
- <PlanServerHostname>0.0.0.0</PlanServerHostname>
- <PlanNamingPort>1099</PlanNamingPort>
- <PlanOpenEJBPort>4201</PlanOpenEJBPort>
- <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
- <PlanIIOPPort>9000</PlanIIOPPort>
- <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
- <PlanCOSNamingPort>1050</PlanCOSNamingPort>
- <PlanCOSSunNamingPort>1050</PlanCOSSunNamingPort>
- <PlanORBHost>localhost</PlanORBHost>
- <PlanORBPort>6882</PlanORBPort>
- <PlanORBSunPort>6882</PlanORBSunPort>
- <PlanORBSSLHost>localhost</PlanORBSSLHost>
- <PlanORBSSLPort>2001</PlanORBSSLPort>
- <PlanORBSunSSLPort>2001</PlanORBSunSSLPort>
- <PlanActiveMQPort>61616</PlanActiveMQPort>
- <PlanDerbyPort>1527</PlanDerbyPort>
- <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
- <PlanLdapPort>1389</PlanLdapPort>
- <PlanHTTPPortPrimary>8080</PlanHTTPPortPrimary>
- <PlanHTTPSPortPrimary>8443</PlanHTTPSPortPrimary>
- <PlanAJPPortPrimary>8009</PlanAJPPortPrimary>
- <PlanHTTPPortSecondary>8090</PlanHTTPPortSecondary>
- <PlanHTTPSPortSecondary>8453</PlanHTTPSPortSecondary>
- <PlanAJPPortSecondary>8019</PlanAJPPortSecondary>
- <PlanJMXPort>9999</PlanJMXPort>
- -->
+ <!-- The template dir = GHOME/${templateDir} -->
+ <!-- default server instance is at GHOME/${defaultServerName} -->
+
+ <templateDir>template</templateDir>
+ <defaultServerName>geronimo0</defaultServerName>
<PlanJettyWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</PlanJettyWebBuilderDefaultNamespace>
<PlanTomcatWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</PlanTomcatWebBuilderDefaultNamespace>
</properties>
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
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...
Posted by Anita Kulshreshtha <a_...@yahoo.com>.
The other culprit could be online build. The latest geronimo
SNAPSHOTs were published on April 24th. In an online build, you can
never be certain that you are using your local copy.
Thanks
Anita
Anita Kulshreshtha <a_...@yahoo.com> wrote:
> Joe,
> Could you please rename the 'var' to varx and run another instance
> of geronimo in your current server image. If you can, it means tck
> setup is setting some property (most probably o.a.g.server.dir) to
> GHOME, an absolute path. This needs to be fixed. I will be offline
> for
> the evening and will check back around 11 p.m. EST. You should not
> need
> to set either o.a.g.server.dir or o.a.g.server.name for the default
> instance.
>
> Thanks
> Anita
>
> --- Joe Bohn <jo...@earthlink.net> wrote:
>
> > 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 @@
> > > <?xml version="1.0" encoding="UTF-8"?>
> > > <!--
> > > - Licensed to the Apache Software Foundation (ASF) under one or
> > more
> > > - contributor license agreements. See the NOTICE file
> distributed
> > with
> > > - this work for additional information regarding copyright
> > ownership.
> > > - The ASF licenses this file to You under the Apache License,
> > Version 2.0
> > > - (the "License"); you may not use this file except in
> compliance
> > with
> > > - the License. You may obtain a copy of the License at
> > > + Licensed to the Apache Software Foundation (ASF) under one
> or
> > more
> > > + contributor license agreements. See the NOTICE file
> > distributed with
> > > + this work for additional information regarding copyright
> > ownership.
> > > + The ASF licenses this file to You under the Apache License,
> > Version 2.0
> > > + (the "License"); you may not use this file except in
> > compliance with
> > > + the License. You may obtain a copy of the License at
> > >
> > > - http://www.apache.org/licenses/LICENSE-2.0
> > > + http://www.apache.org/licenses/LICENSE-2.0
> > >
> > > - Unless required by applicable law or agreed to in writing,
> > software
> > > - distributed under the License is distributed on an "AS IS"
> > BASIS,
> > > - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
> or
> > implied.
> > > - See the License for the specific language governing
> permissions
> > and
> > > - limitations under the License.
> > > + Unless required by applicable law or agreed to in writing,
> > software
> > > + distributed under the License is distributed on an "AS IS"
> > BASIS,
> > > + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
> > or implied.
> > > + See the License for the specific language governing
> > permissions and
> > > + limitations under the License.
> > > -->
> > >
> > > <!-- $Rev$ $Date$ -->
> > > @@ -83,7 +83,7 @@
> > >
> >
>
<include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> > > </includes>
> > > </dependencySet>
> > > -
> > > +
> > > <dependencySet>
> > > <outputDirectory>bin</outputDirectory>
> > >
> > <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
> > > @@ -107,6 +107,7 @@
> > > <outputDirectory>/</outputDirectory>
> > > <excludes>
> > > <exclude>META-INF/**</exclude>
> > > + <exclude>var/**</exclude>
> > > </excludes>
> > > </fileSet>
> > >
> > > @@ -144,10 +145,15 @@
> > > </includes>
> > > <lineEnding>dos</lineEnding>
> > > </fileSet>
> > > +
> > > + <fileSet>
> > > + <directory>target/boilerplate/var</directory>
> > > +
> <outputDirectory>${templateDir}/var</outputDirectory>
> > > + </fileSet>
> > >
> > > <fileSet>
> > > <directory>target/classes</directory>
> > > - <outputDirectory>/</outputDirectory>
> > > + <outputDirectory>${templateDir}</outputDirectory>
> > > <includes>
> > > <include>var/config/**</include>
> > > </includes>
> > > @@ -159,7 +165,30 @@
> > >
> > > <fileSet>
> > > <directory>target/classes</directory>
> > > - <outputDirectory>/</outputDirectory>
> > > + <outputDirectory>${templateDir}</outputDirectory>
> > > + <fileMode>0644</fileMode>
> > > + <includes>
> > > + <include>var/config/config.xml</include>
> > > + </includes>
> > > + </fileSet>
> > > +
> > > + <!-- make a copy of var for default server named
> geronimo0
> > -->
> > > + <fileSet>
> > > + <directory>target/boilerplate/var</directory>
> > > +
> > <outputDirectory>${defaultServerName}/var</outputDirectory>
> > > + </fileSet>
> > > +
> > > + <fileSet>
> > > + <directory>target/classes</directory>
> > > +
> > <outputDirectory>${defaultServerName}</outputDirectory>
>
=== message truncated ===
____________________________________________________________________________________
Finding fabulous fares is fun.
Let Yahoo! FareChase search your favorite travel sites to find flight and hotel bargains.
http://farechase.yahoo.com/promo-generic-14795097
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...
Posted by Anita Kulshreshtha <a_...@yahoo.com>.
Joe,
Could you please rename the 'var' to varx and run another instance
of geronimo in your current server image. If you can, it means tck
setup is setting some property (most probably o.a.g.server.dir) to
GHOME, an absolute path. This needs to be fixed. I will be offline for
the evening and will check back around 11 p.m. EST. You should not need
to set either o.a.g.server.dir or o.a.g.server.name for the default
instance.
Thanks
Anita
--- Joe Bohn <jo...@earthlink.net> wrote:
> 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 @@
> > <?xml version="1.0" encoding="UTF-8"?>
> > <!--
> > - Licensed to the Apache Software Foundation (ASF) under one or
> more
> > - contributor license agreements. See the NOTICE file distributed
> with
> > - this work for additional information regarding copyright
> ownership.
> > - The ASF licenses this file to You under the Apache License,
> Version 2.0
> > - (the "License"); you may not use this file except in compliance
> with
> > - the License. You may obtain a copy of the License at
> > + Licensed to the Apache Software Foundation (ASF) under one or
> more
> > + contributor license agreements. See the NOTICE file
> distributed with
> > + this work for additional information regarding copyright
> ownership.
> > + The ASF licenses this file to You under the Apache License,
> Version 2.0
> > + (the "License"); you may not use this file except in
> compliance with
> > + the License. You may obtain a copy of the License at
> >
> > - http://www.apache.org/licenses/LICENSE-2.0
> > + http://www.apache.org/licenses/LICENSE-2.0
> >
> > - Unless required by applicable law or agreed to in writing,
> software
> > - distributed under the License is distributed on an "AS IS"
> BASIS,
> > - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> implied.
> > - See the License for the specific language governing permissions
> and
> > - limitations under the License.
> > + Unless required by applicable law or agreed to in writing,
> software
> > + distributed under the License is distributed on an "AS IS"
> BASIS,
> > + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
> or implied.
> > + See the License for the specific language governing
> permissions and
> > + limitations under the License.
> > -->
> >
> > <!-- $Rev$ $Date$ -->
> > @@ -83,7 +83,7 @@
> >
>
<include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> > </includes>
> > </dependencySet>
> > -
> > +
> > <dependencySet>
> > <outputDirectory>bin</outputDirectory>
> >
> <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
> > @@ -107,6 +107,7 @@
> > <outputDirectory>/</outputDirectory>
> > <excludes>
> > <exclude>META-INF/**</exclude>
> > + <exclude>var/**</exclude>
> > </excludes>
> > </fileSet>
> >
> > @@ -144,10 +145,15 @@
> > </includes>
> > <lineEnding>dos</lineEnding>
> > </fileSet>
> > +
> > + <fileSet>
> > + <directory>target/boilerplate/var</directory>
> > + <outputDirectory>${templateDir}/var</outputDirectory>
> > + </fileSet>
> >
> > <fileSet>
> > <directory>target/classes</directory>
> > - <outputDirectory>/</outputDirectory>
> > + <outputDirectory>${templateDir}</outputDirectory>
> > <includes>
> > <include>var/config/**</include>
> > </includes>
> > @@ -159,7 +165,30 @@
> >
> > <fileSet>
> > <directory>target/classes</directory>
> > - <outputDirectory>/</outputDirectory>
> > + <outputDirectory>${templateDir}</outputDirectory>
> > + <fileMode>0644</fileMode>
> > + <includes>
> > + <include>var/config/config.xml</include>
> > + </includes>
> > + </fileSet>
> > +
> > + <!-- make a copy of var for default server named geronimo0
> -->
> > + <fileSet>
> > + <directory>target/boilerplate/var</directory>
> > +
> <outputDirectory>${defaultServerName}/var</outputDirectory>
> > + </fileSet>
> > +
> > + <fileSet>
> > + <directory>target/classes</directory>
> > +
> <outputDirectory>${defaultServerName}</outputDirectory>
> > + <includes>
> > + <include>var/config/**</include>
> > + </includes>
> > + </fileSet>
> > +
> > + <fileSet>
> > + <directory>target/classes</directory>
> > +
> <outputDirectory>${defaultServerName}</outputDirectory>
> > <fileMode>0644</fileMode>
> > <includes>
> > <include>var/config/config.xml</include>
> >
> > 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 @@
> > <outputDirectory>/</outputDirectory>
> > <excludes>
> > <exclude>META-INF/**</exclude>
> > + <exclude>var/**</exclude>
> > </excludes>
> > </fileSet>
> >
> > @@ -136,10 +137,15 @@
> > </includes>
> > <lineEnding>dos</lineEnding>
>
=== message truncated ===
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
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...
Posted by Joe Bohn <jo...@earthlink.net>.
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 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!--
> - Licensed to the Apache Software Foundation (ASF) under one or more
> - contributor license agreements. See the NOTICE file distributed with
> - this work for additional information regarding copyright ownership.
> - The ASF licenses this file to You under the Apache License, Version 2.0
> - (the "License"); you may not use this file except in compliance with
> - the License. You may obtain a copy of the License at
> + Licensed to the Apache Software Foundation (ASF) under one or more
> + contributor license agreements. See the NOTICE file distributed with
> + this work for additional information regarding copyright ownership.
> + The ASF licenses this file to You under the Apache License, Version 2.0
> + (the "License"); you may not use this file except in compliance with
> + the License. You may obtain a copy of the License at
>
> - http://www.apache.org/licenses/LICENSE-2.0
> + http://www.apache.org/licenses/LICENSE-2.0
>
> - Unless required by applicable law or agreed to in writing, software
> - distributed under the License is distributed on an "AS IS" BASIS,
> - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> - See the License for the specific language governing permissions and
> - limitations under the License.
> + Unless required by applicable law or agreed to in writing, software
> + distributed under the License is distributed on an "AS IS" BASIS,
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + See the License for the specific language governing permissions and
> + limitations under the License.
> -->
>
> <!-- $Rev$ $Date$ -->
> @@ -83,7 +83,7 @@
> <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> </includes>
> </dependencySet>
> -
> +
> <dependencySet>
> <outputDirectory>bin</outputDirectory>
> <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
> @@ -107,6 +107,7 @@
> <outputDirectory>/</outputDirectory>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>var/**</exclude>
> </excludes>
> </fileSet>
>
> @@ -144,10 +145,15 @@
> </includes>
> <lineEnding>dos</lineEnding>
> </fileSet>
> +
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${templateDir}/var</outputDirectory>
> + </fileSet>
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> <includes>
> <include>var/config/**</include>
> </includes>
> @@ -159,7 +165,30 @@
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> + <fileMode>0644</fileMode>
> + <includes>
> + <include>var/config/config.xml</include>
> + </includes>
> + </fileSet>
> +
> + <!-- make a copy of var for default server named geronimo0 -->
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${defaultServerName}/var</outputDirectory>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> + <includes>
> + <include>var/config/**</include>
> + </includes>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> <fileMode>0644</fileMode>
> <includes>
> <include>var/config/config.xml</include>
>
> 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 @@
> <outputDirectory>/</outputDirectory>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>var/**</exclude>
> </excludes>
> </fileSet>
>
> @@ -136,10 +137,15 @@
> </includes>
> <lineEnding>dos</lineEnding>
> </fileSet>
> +
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${templateDir}/var</outputDirectory>
> + </fileSet>
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> <includes>
> <include>var/config/**</include>
> </includes>
> @@ -151,7 +157,30 @@
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> + <fileMode>0644</fileMode>
> + <includes>
> + <include>var/config/config.xml</include>
> + </includes>
> + </fileSet>
> +
> + <!-- make a copy of var for default server named geronimo0 -->
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${defaultServerName}/var</outputDirectory>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> + <includes>
> + <include>var/config/**</include>
> + </includes>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> <fileMode>0644</fileMode>
> <includes>
> <include>var/config/config.xml</include>
>
> 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 @@
> <outputDirectory>/</outputDirectory>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>var/**</exclude>
> </excludes>
> </fileSet>
>
> @@ -144,10 +145,15 @@
> </includes>
> <lineEnding>dos</lineEnding>
> </fileSet>
> +
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${templateDir}/var</outputDirectory>
> + </fileSet>
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> <includes>
> <include>var/config/**</include>
> </includes>
> @@ -159,7 +165,30 @@
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> + <fileMode>0644</fileMode>
> + <includes>
> + <include>var/config/config.xml</include>
> + </includes>
> + </fileSet>
> +
> + <!-- make a copy of var for default server named geronimo0 -->
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${defaultServerName}/var</outputDirectory>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> + <includes>
> + <include>var/config/**</include>
> + </includes>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> <fileMode>0644</fileMode>
> <includes>
> <include>var/config/config.xml</include>
>
> 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 @@
> <!--
> NOTE: lib/endorsed/ is picked up from boilerplate.
> -->
> -
> +
> <dependencySet>
> <outputDirectory>bin</outputDirectory>
> <outputFileNameMapping>server.jar</outputFileNameMapping>
> @@ -67,7 +67,7 @@
> <include>org.apache.geronimo.configs:online-deployer</include>
> </includes>
> </dependencySet>
> -
> +
> <dependencySet>
> <outputDirectory>lib</outputDirectory>
> <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
> @@ -75,7 +75,7 @@
> <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> </includes>
> </dependencySet>
> -
> +
> <dependencySet>
> <outputDirectory>bin</outputDirectory>
> <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
> @@ -99,6 +99,7 @@
> <outputDirectory>/</outputDirectory>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>var/**</exclude>
> </excludes>
> </fileSet>
>
> @@ -136,10 +137,15 @@
> </includes>
> <lineEnding>dos</lineEnding>
> </fileSet>
> +
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${templateDir}/var</outputDirectory>
> + </fileSet>
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> <includes>
> <include>var/config/**</include>
> </includes>
> @@ -151,7 +157,30 @@
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> + <fileMode>0644</fileMode>
> + <includes>
> + <include>var/config/config.xml</include>
> + </includes>
> + </fileSet>
> +
> + <!-- make a copy of var for default server named geronimo0 -->
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${defaultServerName}/var</outputDirectory>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> + <includes>
> + <include>var/config/**</include>
> + </includes>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> <fileMode>0644</fileMode>
> <includes>
> <include>var/config/config.xml</include>
>
> 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 @@
> <packaging>pom</packaging>
>
> <properties>
> - <!--
> - TODO: Move this where it can be shared with the configs/pom.xml values
> -
> - <PlanServerHostname>0.0.0.0</PlanServerHostname>
> - <PlanNamingPort>1099</PlanNamingPort>
> - <PlanOpenEJBPort>4201</PlanOpenEJBPort>
> - <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
> - <PlanIIOPPort>9000</PlanIIOPPort>
> - <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
> - <PlanCOSNamingPort>1050</PlanCOSNamingPort>
> - <PlanCOSSunNamingPort>1050</PlanCOSSunNamingPort>
> - <PlanORBHost>localhost</PlanORBHost>
> - <PlanORBPort>6882</PlanORBPort>
> - <PlanORBSunPort>6882</PlanORBSunPort>
> - <PlanORBSSLHost>localhost</PlanORBSSLHost>
> - <PlanORBSSLPort>2001</PlanORBSSLPort>
> - <PlanORBSunSSLPort>2001</PlanORBSunSSLPort>
> - <PlanActiveMQPort>61616</PlanActiveMQPort>
> - <PlanDerbyPort>1527</PlanDerbyPort>
> - <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
> - <PlanLdapPort>1389</PlanLdapPort>
> - <PlanHTTPPortPrimary>8080</PlanHTTPPortPrimary>
> - <PlanHTTPSPortPrimary>8443</PlanHTTPSPortPrimary>
> - <PlanAJPPortPrimary>8009</PlanAJPPortPrimary>
> - <PlanHTTPPortSecondary>8090</PlanHTTPPortSecondary>
> - <PlanHTTPSPortSecondary>8453</PlanHTTPSPortSecondary>
> - <PlanAJPPortSecondary>8019</PlanAJPPortSecondary>
> - <PlanJMXPort>9999</PlanJMXPort>
> - -->
> + <!-- The template dir = GHOME/${templateDir} -->
> + <!-- default server instance is at GHOME/${defaultServerName} -->
> +
> + <templateDir>template</templateDir>
> + <defaultServerName>geronimo0</defaultServerName>
> <PlanJettyWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</PlanJettyWebBuilderDefaultNamespace>
> <PlanTomcatWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</PlanTomcatWebBuilderDefaultNamespace>
> </properties>
>
> 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
>
>
>
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...
Posted by Joe Bohn <jo...@earthlink.net>.
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 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <!--
> - Licensed to the Apache Software Foundation (ASF) under one or more
> - contributor license agreements. See the NOTICE file distributed with
> - this work for additional information regarding copyright ownership.
> - The ASF licenses this file to You under the Apache License, Version 2.0
> - (the "License"); you may not use this file except in compliance with
> - the License. You may obtain a copy of the License at
> + Licensed to the Apache Software Foundation (ASF) under one or more
> + contributor license agreements. See the NOTICE file distributed with
> + this work for additional information regarding copyright ownership.
> + The ASF licenses this file to You under the Apache License, Version 2.0
> + (the "License"); you may not use this file except in compliance with
> + the License. You may obtain a copy of the License at
>
> - http://www.apache.org/licenses/LICENSE-2.0
> + http://www.apache.org/licenses/LICENSE-2.0
>
> - Unless required by applicable law or agreed to in writing, software
> - distributed under the License is distributed on an "AS IS" BASIS,
> - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> - See the License for the specific language governing permissions and
> - limitations under the License.
> + Unless required by applicable law or agreed to in writing, software
> + distributed under the License is distributed on an "AS IS" BASIS,
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> + See the License for the specific language governing permissions and
> + limitations under the License.
> -->
>
> <!-- $Rev$ $Date$ -->
> @@ -83,7 +83,7 @@
> <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> </includes>
> </dependencySet>
> -
> +
> <dependencySet>
> <outputDirectory>bin</outputDirectory>
> <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
> @@ -107,6 +107,7 @@
> <outputDirectory>/</outputDirectory>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>var/**</exclude>
> </excludes>
> </fileSet>
>
> @@ -144,10 +145,15 @@
> </includes>
> <lineEnding>dos</lineEnding>
> </fileSet>
> +
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${templateDir}/var</outputDirectory>
> + </fileSet>
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> <includes>
> <include>var/config/**</include>
> </includes>
> @@ -159,7 +165,30 @@
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> + <fileMode>0644</fileMode>
> + <includes>
> + <include>var/config/config.xml</include>
> + </includes>
> + </fileSet>
> +
> + <!-- make a copy of var for default server named geronimo0 -->
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${defaultServerName}/var</outputDirectory>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> + <includes>
> + <include>var/config/**</include>
> + </includes>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> <fileMode>0644</fileMode>
> <includes>
> <include>var/config/config.xml</include>
>
> 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 @@
> <outputDirectory>/</outputDirectory>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>var/**</exclude>
> </excludes>
> </fileSet>
>
> @@ -136,10 +137,15 @@
> </includes>
> <lineEnding>dos</lineEnding>
> </fileSet>
> +
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${templateDir}/var</outputDirectory>
> + </fileSet>
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> <includes>
> <include>var/config/**</include>
> </includes>
> @@ -151,7 +157,30 @@
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> + <fileMode>0644</fileMode>
> + <includes>
> + <include>var/config/config.xml</include>
> + </includes>
> + </fileSet>
> +
> + <!-- make a copy of var for default server named geronimo0 -->
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${defaultServerName}/var</outputDirectory>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> + <includes>
> + <include>var/config/**</include>
> + </includes>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> <fileMode>0644</fileMode>
> <includes>
> <include>var/config/config.xml</include>
>
> 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 @@
> <outputDirectory>/</outputDirectory>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>var/**</exclude>
> </excludes>
> </fileSet>
>
> @@ -144,10 +145,15 @@
> </includes>
> <lineEnding>dos</lineEnding>
> </fileSet>
> +
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${templateDir}/var</outputDirectory>
> + </fileSet>
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> <includes>
> <include>var/config/**</include>
> </includes>
> @@ -159,7 +165,30 @@
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> + <fileMode>0644</fileMode>
> + <includes>
> + <include>var/config/config.xml</include>
> + </includes>
> + </fileSet>
> +
> + <!-- make a copy of var for default server named geronimo0 -->
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${defaultServerName}/var</outputDirectory>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> + <includes>
> + <include>var/config/**</include>
> + </includes>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> <fileMode>0644</fileMode>
> <includes>
> <include>var/config/config.xml</include>
>
> 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 @@
> <!--
> NOTE: lib/endorsed/ is picked up from boilerplate.
> -->
> -
> +
> <dependencySet>
> <outputDirectory>bin</outputDirectory>
> <outputFileNameMapping>server.jar</outputFileNameMapping>
> @@ -67,7 +67,7 @@
> <include>org.apache.geronimo.configs:online-deployer</include>
> </includes>
> </dependencySet>
> -
> +
> <dependencySet>
> <outputDirectory>lib</outputDirectory>
> <outputFileNameMapping>jsr88-deploymentfactory.jar</outputFileNameMapping>
> @@ -75,7 +75,7 @@
> <include>org.apache.geronimo.configs:jsr88-deploymentfactory</include>
> </includes>
> </dependencySet>
> -
> +
> <dependencySet>
> <outputDirectory>bin</outputDirectory>
> <outputFileNameMapping>shutdown.jar</outputFileNameMapping>
> @@ -99,6 +99,7 @@
> <outputDirectory>/</outputDirectory>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>var/**</exclude>
> </excludes>
> </fileSet>
>
> @@ -136,10 +137,15 @@
> </includes>
> <lineEnding>dos</lineEnding>
> </fileSet>
> +
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${templateDir}/var</outputDirectory>
> + </fileSet>
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> <includes>
> <include>var/config/**</include>
> </includes>
> @@ -151,7 +157,30 @@
>
> <fileSet>
> <directory>target/classes</directory>
> - <outputDirectory>/</outputDirectory>
> + <outputDirectory>${templateDir}</outputDirectory>
> + <fileMode>0644</fileMode>
> + <includes>
> + <include>var/config/config.xml</include>
> + </includes>
> + </fileSet>
> +
> + <!-- make a copy of var for default server named geronimo0 -->
> + <fileSet>
> + <directory>target/boilerplate/var</directory>
> + <outputDirectory>${defaultServerName}/var</outputDirectory>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> + <includes>
> + <include>var/config/**</include>
> + </includes>
> + </fileSet>
> +
> + <fileSet>
> + <directory>target/classes</directory>
> + <outputDirectory>${defaultServerName}</outputDirectory>
> <fileMode>0644</fileMode>
> <includes>
> <include>var/config/config.xml</include>
>
> 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 @@
> <packaging>pom</packaging>
>
> <properties>
> - <!--
> - TODO: Move this where it can be shared with the configs/pom.xml values
> -
> - <PlanServerHostname>0.0.0.0</PlanServerHostname>
> - <PlanNamingPort>1099</PlanNamingPort>
> - <PlanOpenEJBPort>4201</PlanOpenEJBPort>
> - <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
> - <PlanIIOPPort>9000</PlanIIOPPort>
> - <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
> - <PlanCOSNamingPort>1050</PlanCOSNamingPort>
> - <PlanCOSSunNamingPort>1050</PlanCOSSunNamingPort>
> - <PlanORBHost>localhost</PlanORBHost>
> - <PlanORBPort>6882</PlanORBPort>
> - <PlanORBSunPort>6882</PlanORBSunPort>
> - <PlanORBSSLHost>localhost</PlanORBSSLHost>
> - <PlanORBSSLPort>2001</PlanORBSSLPort>
> - <PlanORBSunSSLPort>2001</PlanORBSunSSLPort>
> - <PlanActiveMQPort>61616</PlanActiveMQPort>
> - <PlanDerbyPort>1527</PlanDerbyPort>
> - <PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
> - <PlanLdapPort>1389</PlanLdapPort>
> - <PlanHTTPPortPrimary>8080</PlanHTTPPortPrimary>
> - <PlanHTTPSPortPrimary>8443</PlanHTTPSPortPrimary>
> - <PlanAJPPortPrimary>8009</PlanAJPPortPrimary>
> - <PlanHTTPPortSecondary>8090</PlanHTTPPortSecondary>
> - <PlanHTTPSPortSecondary>8453</PlanHTTPSPortSecondary>
> - <PlanAJPPortSecondary>8019</PlanAJPPortSecondary>
> - <PlanJMXPort>9999</PlanJMXPort>
> - -->
> + <!-- The template dir = GHOME/${templateDir} -->
> + <!-- default server instance is at GHOME/${defaultServerName} -->
> +
> + <templateDir>template</templateDir>
> + <defaultServerName>geronimo0</defaultServerName>
> <PlanJettyWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</PlanJettyWebBuilderDefaultNamespace>
> <PlanTomcatWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</PlanTomcatWebBuilderDefaultNamespace>
> </properties>
>
> 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
>
>
>