THIS IS A TEST INSTANCE. ALL YOUR CHANGES WILL BE LOST!!!!
This page outlines the game plan for integrating tomcat v6 into Geronimo2.0
Stage 1 - update specs
Tomcat v6 has the following spec dependencies
geronimo-servlet_2.5_spec
- already in geronimo/specs/trunk
geronimo-annotation_1.0_spec
- already in geronimo/specs/trunk
geronimo-jsp_2.1_spec
geronimo-el
Get all these specs published to a maven repo
Stage 2 - update modules and configs
request tomcat dev team to publish 6.0.2 beta artifacts in a maven repository
- build tomcat v6.0.2 beta locally and publish in a temporary m2 repo
http://people.apache.org/~pmcmahan/maven2/
- use groupid "tomcat6" to avoid maven bug (I suspect MNG2340)
used groupid org/apache/tomcat
modules/geronimo-tomcat
add repository http://people.apache.org/~pmcmahan/maven2/ to pom
- this will be removed when tomcat publishes v6 artifacts
update pom to use tomcat 6.0.2 beta jars
remove outdated clustering (o.a.g.tomcat.cluster)
update resources in src/main/resources/META-INF/geronimo-tomcat/var/catalina
update dependencies in src/main/resources/META-INF/geronimo-dependency.xml
update test cases
modules/geronimo-tomcat-builder
remove outdated references to clustering support
update test cases
configs/tomcat
add repository http://people.apache.org/~pmcmahan/maven2/ to pom
- this will be removed when tomcat publishes v6 artifacts
configs/webconsole-tomcat
remove dependencies on jasper-runtime from pom.xml and plan.xml
configs/jee5-specs
use servlet 2.5, jsp 2.1, el 1.0, annotation 1.0
configs/tomcat-deployer
update pom.xml to use new web25-builder
assemblies/geronimo-tomcat-j2ee
rename to geronimo-tomcat-jee5
synch pom.xml and config.xml with same from jetty6-jee assembly
cursory test of admin console
test cases
add new unit test for servlet 2.5 to geronimo-tomcat
test deployment of 2.5 WAR from command line and admin console
test bringup of tomcat-minimal and jetty6-jee5 assemblies
Geronimo 2.0 milestone build – Dec 23
Stage 3 - update builder
modules/geronimo-web-builder
Merge webmodule-builder changes from sandbox/jee5 branch (thanks djencks)
- modules/geronimo-tomcat-builder
- add support for annotations
- updated schema
- test & fix as necessary
- deploy/undeploy WAR
- deploy/undeploy EAR containing WAR
- geronimo welcome
- JSP and servlet example plugins
- geronimo admin console
Stage 4
- use updated jspc maven plugin (JSP 1.2 support)
remove unnecessary reference to jasper-runtime from poms using jspc-maven-plugin
console
demo
ca-helper
jsp-examples
ldap-demo
remote-deploy
uddi-server
welcome
magic GBall
Stage 5
- replace clustering support removed in Stage 2 with catalina-ha
- TBD how does Jeff's clustering work affect this?
Stage 6
- add integration tests