Author: jlaskowski Date: Mon Sep 20 07:53:11 2004 New Revision: 46937 Added: geronimo/trunk/modules/tomcat/project.properties Modified: geronimo/trunk/etc/version-info.ent geronimo/trunk/modules/jetty/project.properties geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml geronimo/trunk/modules/tomcat/maven.xml geronimo/trunk/modules/tomcat/project.xml geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml geronimo/trunk/modules/tomcat/src/var/server.xml Log: Further enhancements to Tomcat embedded into Geronimo - it is running almost well (cannot connect to localhost:8080, though); upgrade to 5.0.28 (files are at http://www.apache.org/~jlaskowski/maven as Tomcat jars are not updated regularly at iBiblio)
Modified: geronimo/trunk/etc/version-info.ent ============================================================================== --- geronimo/trunk/etc/version-info.ent (original) +++ geronimo/trunk/etc/version-info.ent Mon Sep 20 07:53:11 2004 @@ -19,12 +19,14 @@ <!ENTITY axis-version "SNAPSHOT"> <!ENTITY cglib-version "2.0"> <!ENTITY castor-version "0.9.3.9"> +<!ENTITY commons-beanutils-version "1.6.1"> <!ENTITY commons-cli-version "1.0"> <!ENTITY commons-collections-version "2.1"> <!ENTITY commons-el-version "1.0"> <!ENTITY commons-fileupload-version "1.0"> <!ENTITY commons-jxpath-version "1.1"> <!ENTITY commons-logging-version "1.0.3"> +<!ENTITY commons-modeler-version "1.1-dev"> <!ENTITY commons-primitives-version "1.0"> <!ENTITY commons-digester-version "1.6"> <!ENTITY concurrent-version "1.3.4"> @@ -41,7 +43,7 @@ <!ENTITY mx4j-version "2.0.1"> <!ENTITY regexp-version "1.3"> <!ENTITY spring-version "1.0.1"> -<!ENTITY tomcat-version "5.0.16"> +<!ENTITY tomcat-version "5.0.28"> <!ENTITY velocity-version "dep-1.4-rc1"> <!ENTITY xerces-version "2.6.0"> <!ENTITY xml-apis-version "1.0.b2"> Modified: geronimo/trunk/modules/jetty/project.properties ============================================================================== --- geronimo/trunk/modules/jetty/project.properties (original) +++ geronimo/trunk/modules/jetty/project.properties Mon Sep 20 07:53:11 2004 @@ -4,7 +4,7 @@ # the directory containing the geronimo website in CVS -maven.repo.remote=http://www.openejb.org/maven, http://dist.codehaus.org, http://www.ibiblio.org/maven +maven.repo.remote=http://www.apache.org/~jlaskowski/maven, http://www.openejb.org/maven, http://dist.codehaus.org, http://www.ibiblio.org/maven maven.junit.jvmargs=-Djava.security.auth.login.config=src/test-resources/data/login.config maven.junit.fork=true Modified: geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml ============================================================================== --- geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml (original) +++ geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml Mon Sep 20 07:53:11 2004 @@ -21,10 +21,10 @@ <uri>jetty/jars/org.mortbay.jetty-5.0.0.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/jasper-compiler-5.0.16.jar</uri> + <uri>tomcat/jars/jasper-compiler-5.0.28.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/jasper-runtime-5.0.16.jar</uri> + <uri>tomcat/jars/jasper-runtime-5.0.28.jar</uri> </dependency> <dependency> <uri>commons-el/jars/commons-el-1.0.jar</uri> Modified: geronimo/trunk/modules/tomcat/maven.xml ============================================================================== --- geronimo/trunk/modules/tomcat/maven.xml (original) +++ geronimo/trunk/modules/tomcat/maven.xml Mon Sep 20 07:53:11 2004 @@ -16,6 +16,12 @@ limitations under the License. --> +<!DOCTYPE project [ +<!ENTITY % locator SYSTEM "file:locator.ent"> +%locator; +%versions; +]> + <!-- $Rev: 46019 $ $Date: 2004-09-14 11:56:06 +0200 (Tue, 14 Sep 2004) $ --> <project default="default" @@ -52,18 +58,27 @@ <!-- - TODO: There must be a better way! - copy the dependencies (specified in tomcat-plan.xml) - - note the version is explicity referenced --> <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/geronimo/jars" file="target/${maven.final.name}.jar"/> <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/tomcat/jars" - file="${maven.repo.local}/tomcat/jars/catalina-5.0.16.jar"/> + file="${maven.repo.local}/tomcat/jars/catalina-&tomcat-version;.jar"/> <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/tomcat/jars" - file="${maven.repo.local}/tomcat/jars/tomcat-util-5.0.16.jar"/> - <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/commons-digester/jars" - file="${maven.repo.local}/commons-digester/jars/commons-digester-1.6.jar"/> + file="${maven.repo.local}/tomcat/jars/tomcat-coyote-&tomcat-version;.jar"/> + <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/tomcat/jars" + file="${maven.repo.local}/tomcat/jars/tomcat-http11-&tomcat-version;.jar"/> + <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/tomcat/jars" + file="${maven.repo.local}/tomcat/jars/tomcat-util-&tomcat-version;.jar"/> + <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/tomcat/jars" + file="${maven.repo.local}/tomcat/jars/naming-common-&tomcat-version;.jar"/> + <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/commons-beanutils/jars" + file="${maven.repo.local}/commons-beanutils/jars/commons-beanutils-&commons-beanutils-version;.jar"/> <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/commons-collections/jars" - file="${maven.repo.local}/commons-collections/jars/commons-collections-2.1.jar"/> + file="${maven.repo.local}/commons-collections/jars/commons-collections-&commons-collections-version;.jar"/> + <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/commons-digester/jars" + file="${maven.repo.local}/commons-digester/jars/commons-digester-&commons-digester-version;.jar"/> + <copy todir="../assembly/target/geronimo-${pom.currentVersion}/repository/commons-modeler/jars" + file="${maven.repo.local}/commons-modeler/jars/commons-modeler-&commons-modeler-version;.jar"/> <!-- Pre-load the server's repository (copied from assembly's maven.xml) --> <!-- Added: geronimo/trunk/modules/tomcat/project.properties ============================================================================== --- (empty file) +++ geronimo/trunk/modules/tomcat/project.properties Mon Sep 20 07:53:11 2004 @@ -0,0 +1,5 @@ +## +## $Rev: 46019 $ $Date: 2004-09-14 11:56:06 +0200 (Tue, 14 Sep 2004) $ +## + +maven.repo.remote=http://www.apache.org/~jlaskowski/maven, http://www.ibiblio.org/maven Modified: geronimo/trunk/modules/tomcat/project.xml ============================================================================== --- geronimo/trunk/modules/tomcat/project.xml (original) +++ geronimo/trunk/modules/tomcat/project.xml Mon Sep 20 07:53:11 2004 @@ -36,9 +36,9 @@ <id>geronimo-tomcat</id> <shortDescription>Geronimo Tomcat</shortDescription> <description>Geronimo Tomcat integration</description> - <url>http://incubator.apache.org/projects/geronimo/tomcat</url> + <url>http://geronimo.apache.org/modules/tomcat</url> <siteDirectory>/www/geronimo.apache.org/modules/tomcat</siteDirectory> - <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds/tomcat</distributionDirectory> + <distributionDirectory>/www/www.apache.org/projects/geronimo/builds/tomcat</distributionDirectory> <package>org.apache.geronimo.tomcat</package> @@ -53,8 +53,16 @@ <version>${pom.currentVersion}</version> </dependency> <dependency> + <groupId>geronimo-spec</groupId> + <artifactId>geronimo-spec-j2ee</artifactId> + <version>&geronimo-spec-j2ee-version;</version> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> <groupId>tomcat</groupId> - <artifactId>bootstrap</artifactId> + <artifactId>catalina</artifactId> <version>&tomcat-version;</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> @@ -63,7 +71,16 @@ </dependency> <dependency> <groupId>tomcat</groupId> - <artifactId>catalina</artifactId> + <artifactId>tomcat-coyote</artifactId> + <version>&tomcat-version;</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>tomcat-http11</artifactId> <version>&tomcat-version;</version> <url>http://jakarta.apache.org/tomcat/</url> <properties> @@ -80,6 +97,33 @@ </properties> </dependency> <dependency> + <groupId>tomcat</groupId> + <artifactId>naming-common</artifactId> + <version>&tomcat-version;</version> + <url>http://jakarta.apache.org/tomcat/</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>&commons-beanutils-version;</version> + <url>http://jakarta.apache.org/commons/beanutils</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>&commons-collections-version;</version> + <url>http://jakarta.apache.org/commons/collections</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> <version>&commons-digester-version;</version> @@ -95,10 +139,19 @@ <url>http://jakarta.apache.org/commons/logging</url> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>&commons-collections-version;</version> - <url>http://jakarta.apache.org/commons/collections</url> + <groupId>commons-modeler</groupId> + <artifactId>commons-modeler</artifactId> + <version>&commons-modeler-version;</version> + <url>http://jakarta.apache.org/commons/modeler</url> + <properties> + <repository>true</repository> + </properties> + </dependency> + <dependency> + <groupId>regexp</groupId> + <artifactId>regexp</artifactId> + <version>®exp-version;</version> + <url>http://jakarta.apache.org/regexp/</url> <properties> <repository>true</repository> </properties> Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java ============================================================================== --- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java (original) +++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatGBean.java Mon Sep 20 07:53:11 2004 @@ -56,6 +56,8 @@ private String catalinaBase; + private String catalinaConfig = "var/catalina/server.xml"; + /** * Reference to the Catalina shell, to which calls are delegated. * @@ -65,10 +67,11 @@ * 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) { + 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() { @@ -79,16 +82,21 @@ } public void doStart() throws Exception { - log.debug("catalinaHome: " + catalinaHome + ", catalinaBase: " + catalinaBase); + log.debug("catalinaHome: " + catalinaHome + ", catalinaBase: " + catalinaBase + ", catalinaConfig: " + + catalinaConfig); if (shell == null) { shell = new Catalina(); } - if (catalinaHome != null) { - shell.setCatalinaHome("catalina.home"); + if (catalinaHome != null && catalinaHome.length() > 0) { + shell.setCatalinaHome(catalinaHome); + } + if (catalinaBase != null && catalinaBase.length() > 0) { + shell.setCatalinaBase(catalinaBase); } - if (catalinaBase != null) { - shell.setCatalinaBase("catalina.base"); + if (catalinaConfig != null && catalinaConfig.length() > 0) { + shell.setConfig(catalinaConfig); } + shell.setParentClassLoader(this.getClass().getClassLoader()); shell.start(); } @@ -104,11 +112,12 @@ static { GBeanInfoFactory infoFactory = new GBeanInfoFactory(TomcatGBean.class.getName()); - infoFactory.setConstructor(new String[] { "ServerInfo", "CatalinaHome", "CatalinaBase" }); + 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(); } Modified: geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml ============================================================================== --- geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml (original) +++ geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml Mon Sep 20 07:53:11 2004 @@ -10,21 +10,43 @@ <uri>geronimo/jars/geronimo-tomcat-1.0-SNAPSHOT.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/catalina-5.0.16.jar</uri> + <uri>geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc2.jar</uri> </dependency> <dependency> - <uri>tomcat/jars/tomcat-util-5.0.16.jar</uri> + <uri>tomcat/jars/catalina-5.0.28.jar</uri> </dependency> <dependency> - <uri>commons-digester/jars/commons-digester-1.6.jar</uri> + <uri>tomcat/jars/tomcat-coyote-5.0.28.jar</uri> + </dependency> + <dependency> + <uri>tomcat/jars/tomcat-http11-5.0.28.jar</uri> + </dependency> + <dependency> + <uri>tomcat/jars/tomcat-util-5.0.28.jar</uri> + </dependency> + <dependency> + <uri>tomcat/jars/naming-common-5.0.28.jar</uri> + </dependency> + <dependency> + <uri>commons-beanutils/jars/commons-beanutils-1.6.1.jar</uri> </dependency> <dependency> <uri>commons-collections/jars/commons-collections-2.1.jar</uri> </dependency> + <dependency> + <uri>commons-digester/jars/commons-digester-1.6.jar</uri> + </dependency> + <dependency> + <uri>commons-modeler/jars/commons-modeler-XXX.jar</uri> + </dependency> + <dependency> + <uri>regexp/jars/regexp-1.3.jar</uri> + </dependency> <gbean name="geronimo.tomcat:name=Apache Tomcat" class="org.apache.geronimo.tomcat.TomcatGBean"> <attribute name="CatalinaHome" type="java.lang.String">.</attribute> - <attribute name="CatalinaHome" type="java.lang.String">.</attribute> + <attribute name="CatalinaBase" type="java.lang.String">.</attribute> + <attribute name="CatalinaConfig" type="java.lang.String">var/catalina/server.xml</attribute> </gbean> </configuration> Modified: geronimo/trunk/modules/tomcat/src/var/server.xml ============================================================================== --- geronimo/trunk/modules/tomcat/src/var/server.xml (original) +++ geronimo/trunk/modules/tomcat/src/var/server.xml Mon Sep 20 07:53:11 2004 @@ -1,8 +1,22 @@ <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"/> - </Service> + <Service name="Catalina"> + <Connector port="8080" + maxThreads="150" minSpareThreads="25" maxSpareThreads="75" + enableLookups="false" acceptCount="100" + debug="0" connectionTimeout="20000"/> + + <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> + </Engine> + </Service> </Server>
