Author: jlaskowski Date: Mon Nov 29 06:41:11 2004 New Revision: 106911 URL: http://svn.apache.org/viewcvs?view=rev&rev=106911 Log:
o module finally builds and deploys o Upgrade to Apache Tomcat 5.5.4 (libs still on my account at cvs.apache.org) o TomcatGBean renamed to TomcatContainer to be consistent with the Jetty module ideas o org/apache/geronimo/Tomcat can be started from any directory (use of the ServerInfo class) o TODO: Deploy wars according to Geronimo rules (see jetty-builder) To Eclipse users: don't forget to 'maven eclipse' in the module/tomcat directory. Added: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java - copied, changed from r106910, geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java Removed: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java Modified: geronimo/trunk/modules/tomcat/maven.xml geronimo/trunk/modules/tomcat/project.xml geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml geronimo/trunk/modules/tomcat/src/var/server.xml Modified: geronimo/trunk/modules/tomcat/maven.xml Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/maven.xml?view=diff&rev=106911&p1=geronimo/trunk/modules/tomcat/maven.xml&r1=106910&p2=geronimo/trunk/modules/tomcat/maven.xml&r2=106911 ============================================================================== --- geronimo/trunk/modules/tomcat/maven.xml (original) +++ geronimo/trunk/modules/tomcat/maven.xml Mon Nov 29 06:41:11 2004 @@ -74,52 +74,22 @@ file="${maven.repo.local}/commons-modeler/jars/commons-modeler-&commons-modeler-version;.jar"/> <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/xerces/jars" file="${maven.repo.local}/xerces/jars/xercesImpl-&xerces-version;.jar"/> - - <!-- Pre-load the server's repository (copied from assembly's maven.xml) --> - <!-- - <j:set var="repoDir" value="../assembly/target/${pom.groupId}-${pom.currentVersion}/repository"/> - <ant:mkdir dir="${repoDir}"/> - <ant:copy todir="${repoDir}"> - <ant:fileset dir="${maven.repo.local}"> - <j:forEach var="artifact" items="${pom.artifacts}"> - <j:set var="dependency" value="${artifact.dependency}"/> - <j:if test="${dependency.getProperty('repository') == 'true'}"> - <ant:include name="${dependency.getArtifactDirectory()}/${dependency.getType()}s/${dependency.getArtifact()}"/> - </j:if> - </j:forEach> - </ant:fileset> - </ant:copy> - --> + <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/mx4j/jars" + file="${maven.repo.local}/mx4j/jars/mx4j-&mx4j-version;.jar"/> <copy todir="${geronimoHome}/var/catalina/conf" file="src/var/server.xml"/> <copy todir="${geronimoHome}/var/catalina/conf" file="src/var/web.xml"/> + <j:set var="tomcatWebappDir" value="${geronimoHome}/var/catalina/webapps"/> + <echo>Deploy your webapps to ${tomcatWebappDir}</echo> + <mkdir dir="${tomcatWebappDir}"/> + <echo>Deploying Apache Tomcat configuration</echo> - <java fork="true" jar="../assembly/target/geronimo-${pom.currentVersion}/bin/deployer.jar" - failonerror="true"> + <java fork="true" jar="../assembly/target/geronimo-${pom.currentVersion}/bin/deployer.jar" failonerror="true"> <jvmarg value="-ea"/> - <arg value="--install"/> - <arg value="--plan"/> + <arg value="distribute"/> <arg value="src/plan/tomcat-plan.xml"/> </java> </postGoal> - -<!-- - <postGoal name="jar:jar"> - <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/geronimo/jars" - file="target/${maven.final.name}.jar"/> - </postGoal> - - <goal name="deploy"> - <echo>Deploying Apache Tomcat configuration</echo> - <java fork="true" jar="../assembly/target/geronimo-${pom.currentVersion}/bin/deployer.jar" - failonerror="true"> - <jvmarg value="-ea"/> - <arg value="- -install"/> - <arg value="- -plan"/> - <arg value="src/plan/tomcat-plan.xml"/> - </java> - </goal> ---> </project> Modified: geronimo/trunk/modules/tomcat/project.xml Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/project.xml?view=diff&rev=106911&p1=geronimo/trunk/modules/tomcat/project.xml&r1=106910&p2=geronimo/trunk/modules/tomcat/project.xml&r2=106911 ============================================================================== --- geronimo/trunk/modules/tomcat/project.xml (original) +++ geronimo/trunk/modules/tomcat/project.xml Mon Nov 29 06:41:11 2004 @@ -53,6 +53,11 @@ <version>${pom.currentVersion}</version> </dependency> <dependency> + <groupId>geronimo</groupId> + <artifactId>geronimo-system</artifactId> + <version>${pom.currentVersion}</version> + </dependency> + <dependency> <groupId>geronimo-spec</groupId> <artifactId>geronimo-spec-j2ee</artifactId> <version>&geronimo-spec-j2ee-version;</version> @@ -63,7 +68,9 @@ <dependency> <groupId>tomcat</groupId> <artifactId>catalina</artifactId> - <version>&tomcat-version;</version> + <!-- Don't want to break the other modules that rely on the libs --> + <!--version>&tomcat-version;</version--> + <version>5.5.4</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> <repository>true</repository> @@ -72,7 +79,9 @@ <dependency> <groupId>tomcat</groupId> <artifactId>tomcat-coyote</artifactId> - <version>&tomcat-version;</version> + <!-- Don't want to break the other modules that rely on the libs --> + <!--version>&tomcat-version;</version--> + <version>5.5.4</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> <repository>true</repository> @@ -80,8 +89,10 @@ </dependency> <dependency> <groupId>tomcat</groupId> - <artifactId>tomcat-http11</artifactId> - <version>&tomcat-version;</version> + <artifactId>tomcat-http</artifactId> + <!-- Don't want to break the other modules that rely on the libs --> + <!--version>&tomcat-version;</version--> + <version>5.5.4</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> <repository>true</repository> @@ -90,7 +101,9 @@ <dependency> <groupId>tomcat</groupId> <artifactId>jasper-compiler</artifactId> - <version>&tomcat-version;</version> + <!-- Don't want to break the other modules that rely on the libs --> + <!--version>&tomcat-version;</version--> + <version>5.5.4</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> <repository>true</repository> @@ -99,7 +112,9 @@ <dependency> <groupId>tomcat</groupId> <artifactId>jasper-runtime</artifactId> - <version>&tomcat-version;</version> + <!-- Don't want to break the other modules that rely on the libs --> + <!--version>&tomcat-version;</version--> + <version>5.5.4</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> <repository>true</repository> @@ -108,16 +123,9 @@ <dependency> <groupId>tomcat</groupId> <artifactId>tomcat-util</artifactId> - <version>&tomcat-version;</version> - <url>http://jakarta.apache.org/tomcat/</url> - <properties> - <repository>true</repository> - </properties> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>naming-common</artifactId> - <version>&tomcat-version;</version> + <!-- Don't want to break the other modules that rely on the libs --> + <!--version>&tomcat-version;</version--> + <version>5.5.4</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> <repository>true</repository> @@ -126,16 +134,9 @@ <dependency> <groupId>tomcat</groupId> <artifactId>naming-resources</artifactId> - <version>&tomcat-version;</version> - <url>http://jakarta.apache.org/tomcat/</url> - <properties> - <repository>true</repository> - </properties> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>servlets-common</artifactId> - <version>&tomcat-version;</version> + <!-- Don't want to break the other modules that rely on the libs --> + <!--version>&tomcat-version;</version--> + <version>5.5.4</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> <repository>true</repository> @@ -144,7 +145,9 @@ <dependency> <groupId>tomcat</groupId> <artifactId>servlets-default</artifactId> - <version>&tomcat-version;</version> + <!-- Don't want to break the other modules that rely on the libs --> + <!--version>&tomcat-version;</version--> + <version>5.5.4</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> <repository>true</repository> @@ -153,7 +156,9 @@ <dependency> <groupId>tomcat</groupId> <artifactId>servlets-invoker</artifactId> - <version>&tomcat-version;</version> + <!-- Don't want to break the other modules that rely on the libs --> + <!--version>&tomcat-version;</version--> + <version>5.5.4</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> <repository>true</repository> @@ -220,6 +225,14 @@ <artifactId>regexp</artifactId> <version>®exp-version;</version> <url>http://jakarta.apache.org/regexp/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>mx4j</groupId> + <artifactId>mx4j</artifactId> + <version>&mx4j-version;</version> <properties> <repository>true</repository> </properties> Copied: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java (from r106910, geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java) Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java?view=diff&rev=106911&p1=geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java&r1=106910&p2=geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java&r2=106911 ============================================================================== --- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java (original) +++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatContainer.java Mon Nov 29 06:41:11 2004 @@ -1,128 +1,128 @@ -/** - * - * Copyright 2003-2004 The Apache Software Foundation - * - * Licensed 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 - * - * 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. - */ -package org.apache.geronimo.tomcat; - -import org.apache.catalina.startup.Catalina; -import org.apache.catalina.util.ServerInfo; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.geronimo.gbean.GBeanInfo; -import org.apache.geronimo.gbean.GBeanInfoBuilder; -import org.apache.geronimo.gbean.GBeanLifecycle; -import org.apache.geronimo.gbean.GReferenceInfo; - -/** - * Apache Tomcat GBean - * - * @see http://wiki.apache.org/geronimo/Tomcat - * @see http://nagoya.apache.org/jira/browse/GERONIMO-215 - * - * @version $Rev: 46019 $ $Date: 2004-09-14 11:56:06 +0200 (Tue, 14 Sep 2004) $ - */ -public class TomcatGBean implements GBeanLifecycle { - - private static final Log log = LogFactory.getLog(TomcatGBean.class); - - /** - * Reference to the org.apache.catalina.startup.Bootstrap shell. Right now - * we're just wrapping up the shell, but we'll be replacing it with our own - * GBean shell for ease of management. - */ - private Catalina shell; - - /** - * Reference to the ServerInfo object. This is received through the - * constructor, and can be used to get information about the Server, most - * notably including the location of the server installation directory (and - * thus the Tomcat base dir). - */ - private final ServerInfo serverInfo; - - private String catalinaHome; - - private String catalinaBase; - - private String catalinaConfig = "var/catalina/server.xml"; - - /** - * Reference to the Catalina shell, to which calls are delegated. - * - * The catalina shell relies on the "catalina.home" and "catalina.base" - * System properties. Presumably, these could be added in a simple - * properties file, but I'm going to work under the assumption that we'll - * want them as persistent attributes in a server configuration. This will - * make them more easily manageable (in theory--we'll see) - */ - public TomcatGBean(ServerInfo serverInfo, String catalinaHome, String catalinaBase, String catalinaConfig) { - this.serverInfo = serverInfo; - this.catalinaHome = catalinaHome; - this.catalinaBase = catalinaBase; - this.catalinaConfig = catalinaConfig; - } - - public void doFail() { - try { - doStop(); - } catch (Exception ignored) { - } - } - - public void doStart() throws Exception { - log.debug("catalinaHome: " + catalinaHome + ", catalinaBase: " + catalinaBase + ", catalinaConfig: " - + catalinaConfig); - if (shell == null) { - shell = new Catalina(); - } - if (catalinaHome != null && catalinaHome.length() > 0) { - shell.setCatalinaHome(catalinaHome); - } - if (catalinaBase != null && catalinaBase.length() > 0) { - shell.setCatalinaBase(catalinaBase); - } - if (catalinaConfig != null && catalinaConfig.length() > 0) { - shell.setConfig(catalinaConfig); - } - shell.setParentClassLoader(this.getClass().getClassLoader()); - shell.setUseNaming(false); - shell.start(); - } - - public void doStop() throws Exception { - if (shell != null) { - shell.stop(); - shell = null; - } - } - - public static final GBeanInfo GBEAN_INFO; - - static { - GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(TomcatGBean.class.getName()); - - infoFactory.setConstructor(new String[] { "ServerInfo", "CatalinaHome", "CatalinaBase", "CatalinaConfig" }); - - infoFactory.addReference(new GReferenceInfo("ServerInfo", ServerInfo.class.getName())); - infoFactory.addAttribute("CatalinaHome", String.class, true); - infoFactory.addAttribute("CatalinaBase", String.class, true); - infoFactory.addAttribute("CatalinaConfig", String.class, true); - GBEAN_INFO = infoFactory.getBeanInfo(); - } - - public static GBeanInfo getGBeanInfo() { - return GBEAN_INFO; - } +/** + * + * Copyright 2003-2004 The Apache Software Foundation + * + * Licensed 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 + * + * 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. + */ +package org.apache.geronimo.tomcat; + +import org.apache.catalina.startup.Catalina; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.geronimo.gbean.GBeanInfo; +import org.apache.geronimo.gbean.GBeanInfoBuilder; +import org.apache.geronimo.gbean.GBeanLifecycle; +import org.apache.geronimo.system.serverinfo.ServerInfo; + +/** + * Apache Tomcat GBean + * + * @see http://wiki.apache.org/geronimo/Tomcat + * @see http://nagoya.apache.org/jira/browse/GERONIMO-215 + * + * @version $Rev: 46019 $ $Date: 2004-09-14 11:56:06 +0200 (Tue, 14 Sep 2004) $ + */ +public class TomcatContainer implements GBeanLifecycle { + + private static final Log log = LogFactory.getLog(TomcatContainer.class); + + /** + * Reference to the org.apache.catalina.startup.Bootstrap shell. Right now + * we're just wrapping up the shell, but we'll be replacing it with our own + * GBean shell for ease of management. + */ + private Catalina shell; + + /** + * Used to resolve the location of the configuration file. + */ + private final ServerInfo serverInfo; + + private String catalinaHome; + + private String catalinaBase; + + private String catalinaConfig = "var/catalina/server.xml"; + + /** + * Reference to the Catalina shell, to which calls are delegated. + * + * The catalina shell relies on the "catalina.home" and "catalina.base" + * System properties. Presumably, these could be added in a simple + * properties file, but I'm going to work under the assumption that we'll + * want them as persistent attributes in a server configuration. This will + * make them more easily manageable (in theory--we'll see) + */ + public TomcatContainer(ServerInfo serverInfo, String catalinaHome, String catalinaBase, String catalinaConfig) { + this.serverInfo = serverInfo; + this.catalinaHome = catalinaHome; + this.catalinaBase = catalinaBase; + this.catalinaConfig = catalinaConfig; + } + + public void doFail() { + try { + doStop(); + } catch (Exception ignored) { + } + } + + public void doStart() throws Exception { + log.debug("catalinaHome: " + catalinaHome + ", catalinaBase: " + catalinaBase + ", catalinaConfig: " + + catalinaConfig); + if (shell == null) { + shell = new Catalina(); + } + if (catalinaHome != null && catalinaHome.length() > 0) { + catalinaHome = serverInfo.resolve(catalinaHome).getPath(); + log.debug("catalinaHome ServerInfo.resolve'd: " + catalinaHome); + shell.setCatalinaHome(catalinaHome); + } + if (catalinaBase != null && catalinaBase.length() > 0) { + catalinaBase = serverInfo.resolve(catalinaBase).getPath(); + log.debug("catalinaBase ServerInfo.resolve'd: " + catalinaBase); + shell.setCatalinaBase(catalinaBase); + } + if (catalinaConfig != null && catalinaConfig.length() > 0) { + shell.setConfig(catalinaConfig); + } + shell.setParentClassLoader(this.getClass().getClassLoader()); + shell.setUseNaming(false); + shell.start(); + } + + public void doStop() throws Exception { + if (shell != null) { + shell.stop(); + shell = null; + } + } + + public static final GBeanInfo GBEAN_INFO; + + static { + GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("Tomcat Web Container", TomcatContainer.class); + + infoFactory.setConstructor(new String[] { "ServerInfo", "CatalinaHome", "CatalinaBase", "CatalinaConfig" }); + + infoFactory.addReference("ServerInfo", ServerInfo.class); + infoFactory.addAttribute("CatalinaHome", String.class, true); + infoFactory.addAttribute("CatalinaBase", String.class, true); + infoFactory.addAttribute("CatalinaConfig", String.class, true); + GBEAN_INFO = infoFactory.getBeanInfo(); + } + + public static GBeanInfo getGBeanInfo() { + return GBEAN_INFO; + } } Deleted: /geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java?view=auto&rev=106910 ============================================================================== Modified: geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml?view=diff&rev=106911&p1=geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml&r1=106910&p2=geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml&r2=106911 ============================================================================== --- geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml (original) +++ geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml Mon Nov 29 06:41:11 2004 @@ -10,40 +10,37 @@ <uri>geronimo/jars/geronimo-tomcat-1.0-SNAPSHOT.jar</uri> </dependency> <dependency> - <uri>geronimo-spec/jars/geronimo-spec-j2ee-1.4-SNAPSHOT.jar</uri> + <uri>geronimo/jars/geronimo-system-1.0-SNAPSHOT.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/catalina-5.0.28.jar</uri> + <uri>geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc3.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/jasper-compiler-5.0.28.jar</uri> + <uri>tomcat/jars/catalina-5.5.4.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/jasper-runtime-5.0.28.jar</uri> + <uri>tomcat/jars/jasper-compiler-5.5.4.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/tomcat-coyote-5.0.28.jar</uri> + <uri>tomcat/jars/jasper-runtime-5.5.4.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/tomcat-http11-5.0.28.jar</uri> + <uri>tomcat/jars/tomcat-coyote-5.5.4.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/tomcat-util-5.0.28.jar</uri> + <uri>tomcat/jars/tomcat-http-5.5.4.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/naming-common-5.0.28.jar</uri> + <uri>tomcat/jars/tomcat-util-5.5.4.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/naming-resources-5.0.28.jar</uri> + <uri>tomcat/jars/naming-resources-5.5.4.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/servlets-common-5.0.28.jar</uri> + <uri>tomcat/jars/servlets-default-5.5.4.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/servlets-default-5.0.28.jar</uri> - </dependency> - <dependency> - <uri>tomcat/jars/servlets-invoker-5.0.28.jar</uri> + <uri>tomcat/jars/servlets-invoker-5.5.4.jar</uri> </dependency> <dependency> <uri>commons-beanutils/jars/commons-beanutils-1.6.1.jar</uri> @@ -66,8 +63,13 @@ <dependency> <uri>mx4j/jars/mx4j-2.0.1.jar</uri> </dependency> + <!-- Required to deploy ROOT webapp --> + <dependency> + <uri>xerces/jars/xercesImpl-2.6.0.jar</uri> + </dependency> - <gbean name="geronimo.tomcat:name=Apache Tomcat" class="org.apache.geronimo.tomcat.TomcatGBean"> + <gbean name="geronimo.server:type=WebContainer,container=Apache Tomcat" class="org.apache.geronimo.tomcat.TomcatContainer"> + <reference name="ServerInfo">geronimo.system:role=ServerInfo</reference> <attribute name="CatalinaHome" type="java.lang.String">var/catalina</attribute> <attribute name="CatalinaBase" type="java.lang.String">var/catalina</attribute> <attribute name="CatalinaConfig" type="java.lang.String">conf/server.xml</attribute> Modified: geronimo/trunk/modules/tomcat/src/var/server.xml Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/var/server.xml?view=diff&rev=106911&p1=geronimo/trunk/modules/tomcat/src/var/server.xml&r1=106910&p2=geronimo/trunk/modules/tomcat/src/var/server.xml&r2=106911 ============================================================================== --- geronimo/trunk/modules/tomcat/src/var/server.xml (original) +++ geronimo/trunk/modules/tomcat/src/var/server.xml Mon Nov 29 06:41:11 2004 @@ -1,22 +1,9 @@ <Server port="8005" shutdown="SHUTDOWN" debug="0"> <Service name="Catalina"> - <Connector port="8080" - maxThreads="150" minSpareThreads="25" maxSpareThreads="75" - enableLookups="false" acceptCount="100" - debug="0" connectionTimeout="20000"/> + <Connector port="8080"/> <Engine name="Geronimo" defaultHost="localhost" debug="0"> - <Logger className="org.apache.catalina.logger.FileLogger" - directory="../../var/log" prefix="catalina_log." suffix=".txt" timestamp="true"/> - - <Host name="localhost" debug="0" appBase="webapps" - unpackWARs="true" autoDeploy="true" - xmlValidation="false" xmlNamespaceAware="false"> - - <Logger className="org.apache.catalina.logger.FileLogger" - directory="../../var/log" prefix="localhost_log." suffix=".txt" - timestamp="true"/> - </Host> + <Host name="localhost" debug="0" appBase="webapps"/> </Engine> </Service> </Server>