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 <[EMAIL PROTECTED]> 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 > > > [EMAIL PROTECTED] 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
