+0
On Dec 6, 2006, at 8:11 PM, David Jencks wrote:
> I'm not sure who I've talked to about this or where but I think
> really really strongly that we should include the major version
> number of the projects we integrate in our artifactIds relating to
> those external projects.
>
> A couple people have pointed out that something like jetty_6 or
> geronimo-jetty6-builder is more consistent with our spec naming
> than jetty6 or geronimo-jetty6-naming.
> I don't really care about that, although I think the shorter
> tomcat6 is perfectly clear and easier to type.
>
> Other stuff:
> axis >> axis1
> cxf >> cxf1
> openjpa >> openjpa1
>
> I think this will really reduce confusion about what is running in
> a server.
>
> So, I'd like the tomcat modules to be renamed geronimo-tomcat6,
> geronimo-tomcat6-builder, tomcat6, tomcat6-deployer.
>
> Can we discuss and settle this soon?
>
> thanks
> david jencks
>
>
> ps. I'm planning to remove the jetty[5] stuff from trunk soon.
>
>
> On Dec 6, 2006, at 11:52 AM, pmcmahan@apache.org wrote:
>
>> Author: pmcmahan
>> Date: Wed Dec 6 11:52:09 2006
>> New Revision: 483201
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=483201
>> Log:
>> GERONIMO-2628 - upgrade to tomcat 6.0.2 beta
>>
>> changes:
>> * 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
>> ** disabled a test case that fails intermittently
>>
>> * 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-jee
>>
>> * test cases
>> ** add new unit test for servlet 2.5 to geronimo-tomcat
>>
>> * 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
>>
>> Added:
>> geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/
>> - copied from r482206, geronimo/server/trunk/assemblies/
>> geronimo-tomcat-j2ee/
>> geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/LICENSE.txt
>> - copied unchanged from r483164, geronimo/server/trunk/
>> assemblies/geronimo-tomcat-j2ee/LICENSE.txt
>> geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/NOTICE.txt
>> - copied unchanged from r483164, geronimo/server/trunk/
>> assemblies/geronimo-tomcat-j2ee/NOTICE.txt
>> geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/pom.xml
>> - copied, changed from r483164, geronimo/server/trunk/
>> assemblies/geronimo-tomcat-j2ee/pom.xml
>> geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/src/
>> - copied from r483164, geronimo/server/trunk/assemblies/
>> geronimo-tomcat-j2ee/src/
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> data/web.xml
>> - copied, changed from r482672, geronimo/server/trunk/
>> modules/geronimo-tomcat/src/main/resources/META-INF/geronimo-
>> tomcat/var/catalina/conf/web.xml
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/classes/
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/classes/org/
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/classes/org/apache/
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/classes/org/apache/geronimo/
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/classes/org/apache/
>> geronimo/tomcat/
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/classes/org/apache/
>> geronimo/tomcat/app/
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/classes/org/apache/
>> geronimo/tomcat/app/Filter1.class (with props)
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/classes/org/apache/
>> geronimo/tomcat/app/Servlet1.class (with props)
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/geronimo-web.xml
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/web.xml
>> Removed:
>> geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/cluster/CatalinaClusterGBean.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/cluster/ClusterDeployerGBean.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/cluster/FarmWarDeployerGBean.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/cluster/MembershipServiceGBean.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/cluster/MessageListenerGBean.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/cluster/ReceiverGBean.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/cluster/SenderGBean.java
>> Modified:
>> geronimo/server/trunk/applications/console/geronimo-console-
>> framework/pom.xml
>> geronimo/server/trunk/applications/console/geronimo-console-
>> standard/pom.xml
>> geronimo/server/trunk/applications/demo/pom.xml
>> geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml
>> geronimo/server/trunk/applications/geronimo-examples/geronimo-
>> jsp-examples/pom.xml
>> geronimo/server/trunk/applications/geronimo-ldap-demo/pom.xml
>> geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml
>> geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml
>> geronimo/server/trunk/applications/geronimo-welcome/pom.xml
>> geronimo/server/trunk/applications/magicGball/magicGball-web/
>> pom.xml
>> geronimo/server/trunk/assemblies/pom.xml
>> geronimo/server/trunk/configs/jee-specs/pom.xml
>> geronimo/server/trunk/configs/tomcat-deployer/pom.xml
>> geronimo/server/trunk/configs/tomcat/pom.xml
>> geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
>> geronimo/server/trunk/configs/webconsole-tomcat/src/plan/plan.xml
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/main/
>> java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
>> geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> java/org/apache/geronimo/tomcat/deployment/
>> TomcatModuleBuilderTest.java
>> geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/EngineGBean.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/GeronimoStandardContext.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/HostGBean.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/HttpsConnectorGBean.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatContainer.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatContext.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatWebAppContext.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/realm/TomcatJAASRealm.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> resources/META-INF/geronimo-dependency.xml
>> geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml
>> geronimo/server/trunk/modules/geronimo-tomcat/src/test/java/
>> org/apache/geronimo/tomcat/AbstractWebModuleTest.java
>> geronimo/server/trunk/modules/geronimo-tomcat/src/test/java/
>> org/apache/geronimo/tomcat/JAASSecurityTest.java
>>
>> Modified: geronimo/server/trunk/applications/console/geronimo-
>> console-framework/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/
>> applications/console/geronimo-console-framework/pom.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/applications/console/geronimo-console-
>> framework/pom.xml (original)
>> +++ geronimo/server/trunk/applications/console/geronimo-console-
>> framework/pom.xml Wed Dec 6 11:52:09 2006
>> @@ -65,13 +65,6 @@
>> <scope>provided</scope>
>> </dependency>
>>
>> - <!-- Required for JSPC compilation -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - <scope>provided</scope>
>> - </dependency>
>> -
>> <dependency>
>> <groupId>org.apache.geronimo.applications.console</
>> groupId>
>> <artifactId>geronimo-console-core</artifactId>
>>
>> Modified: geronimo/server/trunk/applications/console/geronimo-
>> console-standard/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/
>> applications/console/geronimo-console-standard/pom.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/applications/console/geronimo-console-
>> standard/pom.xml (original)
>> +++ geronimo/server/trunk/applications/console/geronimo-console-
>> standard/pom.xml Wed Dec 6 11:52:09 2006
>> @@ -142,13 +142,6 @@
>> <scope>provided</scope>
>> </dependency>
>>
>> - <!-- Required for JSPC compilation -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - <scope>provided</scope>
>> - </dependency>
>> -
>> </dependencies>
>>
>> <build>
>>
>> Modified: geronimo/server/trunk/applications/demo/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/
>> applications/demo/pom.xml?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/applications/demo/pom.xml (original)
>> +++ geronimo/server/trunk/applications/demo/pom.xml Wed Dec 6
>> 11:52:09 2006
>> @@ -34,14 +34,6 @@
>> <packaging>war</packaging>
>>
>> <dependencies>
>> -
>> - <!-- Required for JSPC compilation -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - <scope>provided</scope>
>> - </dependency>
>> -
>> </dependencies>
>>
>> <build>
>>
>> Modified: geronimo/server/trunk/applications/geronimo-ca-helper/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/
>> applications/geronimo-ca-helper/pom.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml
>> (original)
>> +++ geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml
>> Wed Dec 6 11:52:09 2006
>> @@ -65,12 +65,6 @@
>> <artifactId>geronimo-jsp_2.0_spec</artifactId>
>> </dependency>
>>
>> - <!-- Required for JSPC compilation -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - </dependency>
>> -
>> </dependencies>
>>
>> <build>
>>
>> Modified: geronimo/server/trunk/applications/geronimo-examples/
>> geronimo-jsp-examples/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/
>> applications/geronimo-examples/geronimo-jsp-examples/pom.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/applications/geronimo-examples/geronimo-
>> jsp-examples/pom.xml (original)
>> +++ geronimo/server/trunk/applications/geronimo-examples/geronimo-
>> jsp-examples/pom.xml Wed Dec 6 11:52:09 2006
>> @@ -57,12 +57,6 @@
>> <artifactId>jstl</artifactId>
>> </dependency>
>>
>> - <!-- Required for JSPC compilation -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - </dependency>
>> -
>> </dependencies>
>>
>> <build>
>>
>> Modified: geronimo/server/trunk/applications/geronimo-ldap-demo/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/
>> applications/geronimo-ldap-demo/pom.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/applications/geronimo-ldap-demo/pom.xml
>> (original)
>> +++ geronimo/server/trunk/applications/geronimo-ldap-demo/pom.xml
>> Wed Dec 6 11:52:09 2006
>> @@ -39,13 +39,6 @@
>> </description>
>>
>> <dependencies>
>> -
>> - <!-- Required for JSPC compilation -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - </dependency>
>> -
>> </dependencies>
>>
>> <build>
>>
>> Modified: geronimo/server/trunk/applications/geronimo-remote-
>> deploy/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/
>> applications/geronimo-remote-deploy/pom.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/applications/geronimo-remote-deploy/
>> pom.xml (original)
>> +++ geronimo/server/trunk/applications/geronimo-remote-deploy/
>> pom.xml Wed Dec 6 11:52:09 2006
>> @@ -53,12 +53,6 @@
>> <version>${version}</version>
>> </dependency>
>>
>> - <!-- Required for JSPC compilation -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - </dependency>
>> -
>> </dependencies>
>>
>> <build>
>>
>> Modified: geronimo/server/trunk/applications/geronimo-uddi-server/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/
>> applications/geronimo-uddi-server/pom.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/applications/geronimo-uddi-server/
>> pom.xml (original)
>> +++ geronimo/server/trunk/applications/geronimo-uddi-server/
>> pom.xml Wed Dec 6 11:52:09 2006
>> @@ -46,12 +46,6 @@
>> <artifactId>geronimo-jsp_2.0_spec</artifactId>
>> </dependency>
>>
>> - <!-- Required for JSPC compilation -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - </dependency>
>> -
>> </dependencies>
>>
>> <build>
>>
>> Modified: geronimo/server/trunk/applications/geronimo-welcome/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/
>> applications/geronimo-welcome/pom.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/applications/geronimo-welcome/pom.xml
>> (original)
>> +++ geronimo/server/trunk/applications/geronimo-welcome/pom.xml
>> Wed Dec 6 11:52:09 2006
>> @@ -53,12 +53,6 @@
>> <artifactId>geronimo-jsp_2.0_spec</artifactId>
>> </dependency>
>>
>> - <!-- Required for JSPC compilation -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - </dependency>
>> -
>> </dependencies>
>>
>> <build>
>>
>> Modified: geronimo/server/trunk/applications/magicGball/magicGball-
>> web/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/
>> applications/magicGball/magicGball-web/pom.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/applications/magicGball/magicGball-web/
>> pom.xml (original)
>> +++ geronimo/server/trunk/applications/magicGball/magicGball-web/
>> pom.xml Wed Dec 6 11:52:09 2006
>> @@ -41,12 +41,6 @@
>> <version>${version}</version>
>> </dependency>
>>
>> - <!-- Required for JSPC compilation -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - </dependency>
>> -
>> </dependencies>
>>
>> <build>
>>
>> Copied: geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/
>> pom.xml (from r483164, geronimo/server/trunk/assemblies/geronimo-
>> tomcat-j2ee/pom.xml)
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/
>> geronimo-tomcat-jee5/pom.xml?view=diff&rev=483201&p1=geronimo/
>> server/trunk/assemblies/geronimo-tomcat-j2ee/
>> pom.xml&r1=483164&p2=geronimo/server/trunk/assemblies/geronimo-
>> tomcat-jee5/pom.xml&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/assemblies/geronimo-tomcat-j2ee/pom.xml
>> (original)
>> +++ geronimo/server/trunk/assemblies/geronimo-tomcat-jee5/pom.xml
>> Wed Dec 6 11:52:09 2006
>> @@ -29,12 +29,12 @@
>> <relativePath>../pom.xml</relativePath>
>> </parent>
>>
>> - <artifactId>geronimo-tomcat-j2ee</artifactId>
>> - <name>Geronimo Assemblies :: J2EE + Tomcat</name>
>> + <artifactId>geronimo-tomcat-jee5</artifactId>
>> + <name>Geronimo Assemblies :: JEE5 + Tomcat</name>
>> <packaging>application-assembly</packaging>
>>
>> <description>
>> - An assembly of Geronimo into a J2EE Server using Tomcat
>> as the web container.
>> + An assembly of Geronimo into a JEE5 Server using Tomcat
>> as the web container.
>> </description>
>>
>> <dependencies>
>> @@ -83,10 +83,23 @@
>>
>> <dependency>
>> <groupId>org.apache.geronimo.configs</groupId>
>> + <artifactId>transaction-jta11</artifactId>
>> + <version>${version}</version>
>> + <type>car</type>
>> + </dependency>
>> +
>> + <dependency>
>> + <groupId>org.apache.geronimo.configs</groupId>
>> <artifactId>axis</artifactId>
>> <version>${version}</version>
>> <type>car</type>
>> </dependency>
>> + <dependency>
>> + <groupId>org.apache.geronimo.configs</groupId>
>> + <artifactId>cxf</artifactId>
>> + <version>${version}</version>
>> + <type>car</type>
>> + </dependency>
>>
>> <dependency>
>> <groupId>org.apache.geronimo.configs</groupId>
>> @@ -213,10 +226,9 @@
>> <version>${version}</version>
>> <type>car</type>
>> </dependency>
>> -
>> <dependency>
>> <groupId>org.apache.geronimo.configs</groupId>
>> - <artifactId>hot-deployer</artifactId>
>> + <artifactId>cxf-deployer</artifactId>
>> <version>${version}</version>
>> <type>car</type>
>> </dependency>
>> @@ -230,6 +242,13 @@
>>
>> <dependency>
>> <groupId>org.apache.geronimo.configs</groupId>
>> + <artifactId>hot-deployer</artifactId>
>> + <version>${version}</version>
>> + <type>car</type>
>> + </dependency>
>> +
>> + <dependency>
>> + <groupId>org.apache.geronimo.configs</groupId>
>> <artifactId>tomcat-deployer</artifactId>
>> <version>${version}</version>
>> <type>car</type>
>> @@ -284,16 +303,16 @@
>> <type>car</type>
>> </dependency>
>>
>> - <dependency>
>> + <dependency>
>> <groupId>org.apache.geronimo.configs</groupId>
>> - <artifactId>openjpa</artifactId>
>> + <artifactId>online-deployer</artifactId>
>> <version>${version}</version>
>> <type>car</type>
>> </dependency>
>>
>> - <dependency>
>> + <dependency>
>> <groupId>org.apache.geronimo.configs</groupId>
>> - <artifactId>online-deployer</artifactId>
>> + <artifactId>openjpa</artifactId>
>> <version>${version}</version>
>> <type>car</type>
>> </dependency>
>> @@ -327,7 +346,7 @@
>> <artifactItems>
>> <artifactItem>
>>
>> <groupId>org.apache.geronimo.assemblies</groupId>
>> - <artifactId>geronimo-
>> boilerplate-j2ee</artifactId>
>> + <artifactId>geronimo-
>> boilerplate-jee5</artifactId>
>> <version>${version}</version>
>> </artifactItem>
>> </artifactItems>
>>
>> Modified: geronimo/server/trunk/assemblies/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/
>> pom.xml?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/assemblies/pom.xml (original)
>> +++ geronimo/server/trunk/assemblies/pom.xml Wed Dec 6 11:52:09 2006
>> @@ -75,7 +75,7 @@
>> <module>geronimo-jetty-j2ee</module>
>> <module>geronimo-jetty-minimal</module>
>> <module>geronimo-jetty6-jee5</module>
>> - <module>geronimo-tomcat-j2ee</module>
>> + <module>geronimo-tomcat-jee5</module>
>> <module>geronimo-tomcat-minimal</module>
>> </modules>
>>
>>
>> Modified: geronimo/server/trunk/configs/jee-specs/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/
>> jee-specs/pom.xml?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/configs/jee-specs/pom.xml (original)
>> +++ geronimo/server/trunk/configs/jee-specs/pom.xml Wed Dec 6
>> 11:52:09 2006
>> @@ -43,11 +43,23 @@
>>
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> + <artifactId>geronimo-annotation_1.0_spec</artifactId>
>> + <version>1.0-SNAPSHOT</version>
>> + </dependency>
>> +
>> + <dependency>
>> + <groupId>org.apache.geronimo.specs</groupId>
>> <artifactId>geronimo-ejb_2.1_spec</artifactId>
>> </dependency>
>>
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> + <artifactId>geronimo-el_1.0_spec</artifactId>
>> + <version>1.0-SNAPSHOT</version>
>> + </dependency>
>> +
>> + <dependency>
>> + <groupId>org.apache.geronimo.specs</groupId>
>> <artifactId>geronimo-j2ee-connector_1.5_spec</
>> artifactId>
>> </dependency>
>>
>> @@ -83,7 +95,8 @@
>>
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> - <artifactId>geronimo-jsp_2.0_spec</artifactId>
>> + <artifactId>geronimo-jsp_2.1_spec</artifactId>
>> + <version>1.0-SNAPSHOT</version>
>> </dependency>
>>
>> <dependency>
>> @@ -104,7 +117,7 @@
>>
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> - <artifactId>geronimo-servlet_2.4_spec</artifactId>
>> + <artifactId>geronimo-servlet_2.5_spec</artifactId>
>> </dependency>
>>
>> <!-- build order hint -->
>>
>> Modified: geronimo/server/trunk/configs/tomcat-deployer/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/
>> tomcat-deployer/pom.xml?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/configs/tomcat-deployer/pom.xml (original)
>> +++ geronimo/server/trunk/configs/tomcat-deployer/pom.xml Wed Dec
>> 6 11:52:09 2006
>> @@ -64,6 +64,17 @@
>> <artifactId>geronimo-tomcat-builder</artifactId>
>> <version>${version}</version>
>> </dependency>
>> +
>> + <dependency>
>> + <groupId>org.apache.geronimo.modules</groupId>
>> + <artifactId>geronimo-web-2.5-builder</artifactId>
>> + <version>${version}</version>
>> + </dependency>
>> +
>> + <dependency>
>> + <groupId>org.apache.geronimo.schema</groupId>
>> + <artifactId>geronimo-schema-jee_5</artifactId>
>> + </dependency>
>>
>> </dependencies>
>>
>>
>> Modified: geronimo/server/trunk/configs/tomcat/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/
>> tomcat/pom.xml?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/configs/tomcat/pom.xml (original)
>> +++ geronimo/server/trunk/configs/tomcat/pom.xml Wed Dec 6
>> 11:52:09 2006
>> @@ -63,6 +63,21 @@
>> </dependency>
>>
>> </dependencies>
>> +
>> + <repositories>
>> + <repository>
>> + <id>tomcat6-repo</id>
>> + <url>http://people.apache.org/~pmcmahan/maven2</url>
>> + <layout>default</layout>
>> + <snapshots>
>> + <enabled>false</enabled>
>> + </snapshots>
>> + <releases>
>> + <enabled>true</enabled>
>> + <checksumPolicy>ignore</checksumPolicy>
>> + </releases>
>> + </repository>
>> + </repositories>
>>
>> <build>
>> <resources>
>>
>> Modified: geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/
>> webconsole-tomcat/pom.xml?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/configs/webconsole-tomcat/pom.xml
>> (original)
>> +++ geronimo/server/trunk/configs/webconsole-tomcat/pom.xml Wed
>> Dec 6 11:52:09 2006
>> @@ -162,11 +162,6 @@
>> </dependency>
>>
>> <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> <groupId>commons-digester</groupId>
>> <artifactId>commons-digester</artifactId>
>> </dependency>
>> @@ -194,6 +189,11 @@
>> <dependency>
>> <groupId>dwr</groupId>
>> <artifactId>dwr</artifactId>
>> + </dependency>
>> +
>> + <dependency>
>> + <groupId>xerces</groupId>
>> + <artifactId>xercesImpl</artifactId>
>> </dependency>
>>
>> <dependency>
>>
>> Modified: geronimo/server/trunk/configs/webconsole-tomcat/src/plan/
>> plan.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/
>> webconsole-tomcat/src/plan/plan.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/configs/webconsole-tomcat/src/plan/
>> plan.xml (original)
>> +++ geronimo/server/trunk/configs/webconsole-tomcat/src/plan/
>> plan.xml Wed Dec 6 11:52:09 2006
>> @@ -40,11 +40,6 @@
>> <artifactId>pluto-portal</artifactId>
>> <type>jar</type>
>> </dependency>
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - <type>jar</type>
>> - </dependency>
>> </dependencies>
>> <inverse-classloading/>
>> </environment>
>> @@ -103,11 +98,6 @@
>> <dependency>
>> <groupId>taglibs</groupId>
>> <artifactId>standard</artifactId>
>> - <type>jar</type>
>> - </dependency>
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> <type>jar</type>
>> </dependency>
>> </dependencies>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat-builder/pom.xml?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/pom.xml
>> Wed Dec 6 11:52:09 2006
>> @@ -34,24 +34,6 @@
>>
>> <dependencies>
>>
>> - <!--<dependency>-->
>> - <!--<groupId>${pom.groupId}</groupId>-->
>> - <!--<artifactId>geronimo-deployment</artifactId>-->
>> - <!--<version>${version}</version>-->
>> - <!--</dependency>-->
>> -
>> - <!--<dependency>-->
>> - <!--<groupId>${pom.groupId}</groupId>-->
>> - <!--<artifactId>geronimo-j2ee</artifactId>-->
>> - <!--<version>${version}</version>-->
>> - <!--</dependency>-->
>> -
>> - <!--<dependency>-->
>> - <!--<groupId>${pom.groupId}</groupId>-->
>> - <!--<artifactId>geronimo-j2ee-schema</artifactId>-->
>> - <!--<version>${version}</version>-->
>> - <!--</dependency>-->
>> -
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>> <artifactId>geronimo-naming-builder</artifactId>
>> @@ -84,7 +66,7 @@
>>
>> <dependency>
>> <groupId>${pom.groupId}</groupId>
>> - <artifactId>geronimo-web-builder</artifactId>
>> + <artifactId>geronimo-web-2.5-builder</artifactId>
>> <version>${version}</version>
>> </dependency>
>>
>> @@ -98,23 +80,16 @@
>> <artifactId>stax-api</artifactId>
>> </dependency>
>>
>> - <!--<dependency>-->
>> - <!--<groupId>${pom.groupId}</groupId>-->
>> - <!--<artifactId>geronimo-axis</artifactId>-->
>> - <!--<version>${version}</version>-->
>> - <!--<scope>test</scope>-->
>> - <!--</dependency>-->
>> -
>> - <!--<dependency>-->
>> - <!--<groupId>org.apache.geronimo.specs</groupId>-->
>> - <!--<artifactId>geronimo-servlet_2.4_spec</
>> artifactId>-->
>> - <!--<scope>test</scope>-->
>> - <!--</dependency>-->
>> -
>> - <!-- WFT??? why is this needed for tests all of a sudden?
>> -->
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> - <artifactId>geronimo-jsp_2.0_spec</artifactId>
>> + <artifactId>geronimo-annotation_1.0_spec</artifactId>
>> + <scope>test</scope>
>> + </dependency>
>> +
>> + <dependency>
>> + <groupId>org.apache.geronimo.specs</groupId>
>> + <artifactId>geronimo-jsp_2.1_spec</artifactId>
>> + <version>1.0-SNAPSHOT</version>
>> <scope>test</scope>
>> </dependency>
>>
>> @@ -219,6 +194,7 @@
>> <include name="war1/**"/>
>> <include name="war3/**"/>
>> <include name="war4/**"/>
>> + <include name="war6-jee5/
>> **"/>
>> </fileset>
>> </copy>
>> </tasks>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/
>> src/main/java/org/apache/geronimo/tomcat/deployment/
>> TomcatModuleBuilder.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat-builder/src/main/java/org/apache/geronimo/tomcat/
>> deployment/TomcatModuleBuilder.java?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat-builder/src/main/
>> java/org/apache/geronimo/tomcat/deployment/
>> TomcatModuleBuilder.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/src/main/
>> java/org/apache/geronimo/tomcat/deployment/
>> TomcatModuleBuilder.java Wed Dec 6 11:52:09 2006
>> @@ -48,7 +48,6 @@
>> import org.apache.geronimo.gbean.GBeanData;
>> import org.apache.geronimo.gbean.GBeanInfo;
>> import org.apache.geronimo.gbean.GBeanInfoBuilder;
>> -import org.apache.geronimo.gbean.SingleElementCollection;
>> import org.apache.geronimo.gbean.ReferencePatterns;
>> import org.apache.geronimo.j2ee.deployment.EARContext;
>> import org.apache.geronimo.j2ee.deployment.Module;
>> @@ -72,16 +71,15 @@
>> import org.apache.geronimo.tomcat.RealmGBean;
>> import org.apache.geronimo.tomcat.TomcatWebAppContext;
>> import org.apache.geronimo.tomcat.ValveGBean;
>> -import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
>> import org.apache.geronimo.tomcat.util.SecurityHolder;
>> -import org.apache.geronimo.web.deployment.AbstractWebModuleBuilder;
>> +import
>> org.apache.geronimo.web25.deployment.AbstractWebModuleBuilder;
>> import
>> org.apache.geronimo.web.deployment.GenericToSpecificPlanConverter;
>> import
>> org.apache.geronimo.xbeans.geronimo.web.tomcat.TomcatWebAppDocument;
>> import
>> org.apache.geronimo.xbeans.geronimo.web.tomcat.TomcatWebAppType;
>> import
>> org.apache.geronimo.xbeans.geronimo.web.tomcat.config.GerTomcatDocume
>> nt;
>> -import org.apache.geronimo.xbeans.j2ee.ServletType;
>> -import org.apache.geronimo.xbeans.j2ee.WebAppDocument;
>> -import org.apache.geronimo.xbeans.j2ee.WebAppType;
>> +import org.apache.geronimo.xbeans.javaee.ServletType;
>> +import org.apache.geronimo.xbeans.javaee.WebAppDocument;
>> +import org.apache.geronimo.xbeans.javaee.WebAppType;
>> import org.apache.xmlbeans.XmlException;
>> import org.apache.xmlbeans.XmlObject;
>>
>> @@ -346,11 +344,11 @@
>> webModuleData.setReferencePattern
>> ("TomcatValveChain", valveName);
>> }
>>
>> - if (tomcatWebApp.isSetCluster()) {
>> - String cluster = tomcatWebApp.getCluster().trim();
>> - AbstractName clusterName = earContext.getNaming
>> ().createChildName(moduleName, cluster,
>> CatalinaClusterGBean.J2EE_TYPE);
>> - webModuleData.setReferencePattern("Cluster",
>> clusterName);
>> - }
>> +// if (tomcatWebApp.isSetCluster()) {
>> +// String cluster = tomcatWebApp.getCluster().trim();
>> +// AbstractName clusterName = earContext.getNaming
>> ().createChildName(moduleName, cluster,
>> CatalinaClusterGBean.J2EE_TYPE);
>> +// webModuleData.setReferencePattern("Cluster",
>> clusterName);
>> +// }
>>
>> if (tomcatWebApp.isSetManager()) {
>> String manager = tomcatWebApp.getManager().trim();
>>
>> Copied: geronimo/server/trunk/modules/geronimo-tomcat-builder/src/
>> test/data/web.xml (from r482672, geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/resources/META-INF/geronimo-tomcat/var/
>> catalina/conf/web.xml)
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat-builder/src/test/data/web.xml?
>> view=diff&rev=483201&p1=geronimo/server/trunk/modules/geronimo-
>> tomcat/src/main/resources/META-INF/geronimo-tomcat/var/catalina/
>> conf/web.xml&r1=482672&p2=geronimo/server/trunk/modules/geronimo-
>> tomcat-builder/src/test/data/web.xml&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> resources/META-INF/geronimo-tomcat/var/catalina/conf/web.xml
>> (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> data/web.xml Wed Dec 6 11:52:09 2006
>> @@ -1,5 +1,6 @@
>> <?xml version="1.0" encoding="ISO-8859-1"?>
>> <!--
>> +
>> 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.
>> @@ -16,10 +17,10 @@
>> limitations under the License.
>> -->
>>
>> -<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
>> - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>> - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://
>> java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
>> - version="2.4">
>> +<web-app xmlns="http://java.sun.com/xml/ns/javaee"
>> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://
>> java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
>> + version="2.5" >
>>
>> <!-- ======================== Introduction
>> ============================== -->
>> <!-- This document defines default values for *all* web
>> applications -->
>> @@ -44,11 +45,17 @@
>> <!-- debug Debugging detail level for messages
>> logged -->
>> <!-- by this servlet.
>> [0] -->
>>
>> <!--
>> -->
>> + <!-- fileEncoding Encoding to be used to read static
>> resources -->
>> + <!-- [platform
>> default] -->
>> +
>> <!--
>> -->
>> <!-- input Input buffer size (in bytes) when
>> reading -->
>> <!-- resources to be served.
>> [2048] -->
>>
>> <!--
>> -->
>> <!-- listings Should directory listings be
>> produced if there -->
>> - <!-- is no welcome file in this
>> directory? [true] -->
>> + <!-- is no welcome file in this
>> directory? [false] -->
>> + <!-- WARNING: Listings for directories
>> with many -->
>> + <!-- entries can be slow and may
>> consume -->
>> + <!-- significant proportions of server
>> resources. -->
>>
>> <!--
>> -->
>> <!-- output Output buffer size (in bytes) when
>> writing -->
>> <!-- resources to be served.
>> [2048] -->
>> @@ -60,6 +67,11 @@
>> <!-- readmeFile File name to display with the
>> directory -->
>> <!-- contents.
>> [null] -->
>>
>> <!--
>> -->
>> + <!-- sendfileSize If the connector used supports
>> sendfile, this -->
>> + <!-- represents the minimal file size in
>> KB for -->
>> + <!-- which sendfile will be used. Use a
>> negative -->
>> + <!-- value to always disable sendfile.
>> [48] -->
>> +
>> <!--
>> -->
>> <!-- For directory listing customization. Checks
>> localXsltFile, then -->
>> <!-- globalXsltFile, then defaults to original
>> behavior. -->
>>
>> <!--
>> -->
>> @@ -76,16 +88,14 @@
>>
>> <servlet>
>> <servlet-name>default</servlet-name>
>> - <servlet-class>
>> - org.apache.catalina.servlets.DefaultServlet
>> - </servlet-class>
>> + <servlet-
>> class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
>> <init-param>
>> <param-name>debug</param-name>
>> <param-value>0</param-value>
>> </init-param>
>> <init-param>
>> <param-name>listings</param-name>
>> - <param-value>true</param-value>
>> + <param-value>false</param-value>
>> </init-param>
>> <load-on-startup>1</load-on-startup>
>> </servlet>
>> @@ -125,10 +135,20 @@
>> <!-- following initialization parameters (default values are in
>> square -->
>> <!--
>> brackets):
>> -->
>>
>> <!--
>> -->
>> - <!-- checkInterval If development is false and
>> reloading is true, -->
>> - <!-- background compiles are enabled.
>> checkInterval -->
>> - <!-- is the time in seconds between
>> checks to see -->
>> - <!-- if a JSP page needs to be
>> recompiled. [300] -->
>> + <!-- checkInterval If development is false and
>> checkInterval is -->
>> + <!-- greater than zero, background
>> compilations are -->
>> + <!-- enabled. checkInterval is the time
>> in seconds -->
>> + <!-- between checks to see if a JSP page
>> needs to -->
>> + <!-- be recompiled.
>> [0] -->
>> +
>> <!--
>> -->
>> + <!--
>> modificationTestInterval
>> -->
>> + <!-- Causes a JSP (and its dependent
>> files) to not -->
>> + <!-- be checked for modification during
>> the -->
>> + <!-- specified time interval (in seconds)
>> from the -->
>> + <!-- last time the JSP was checked
>> for -->
>> + <!-- modification. A value of 0 will
>> cause the JSP -->
>> + <!-- to be checked on every
>> access. -->
>> + <!-- Used in development mode only.
>> [4] -->
>>
>> <!--
>> -->
>> <!-- compiler Which compiler Ant should use to
>> compile JSP -->
>> <!-- pages. See the Ant documentation
>> for more -->
>> @@ -141,8 +161,10 @@
>> <!-- generated servlets? [Created
>> dynamically -->
>> <!-- based on the current web
>> application] -->
>>
>> <!--
>> -->
>> - <!-- development Is Jasper used in development mode
>> (will check -->
>> - <!-- for JSP modification on every
>> access)? [true] -->
>> + <!-- development Is Jasper used in development mode?
>> If true, -->
>> + <!-- the frequency at which JSPs are
>> checked for -->
>> + <!-- modification may be specified via
>> the -->
>> + <!-- modificationTestInterval parameter.
>> [true] -->
>>
>> <!--
>> -->
>> <!-- enablePooling Determines whether tag handler
>> pooling is -->
>> <!-- enabled
>> [true] -->
>> @@ -163,13 +185,11 @@
>>
>> <!--
>> -->
>> <!-- mappedfile Should we generate static content
>> with one -->
>> <!-- print statement per input line, to
>> ease -->
>> - <!-- debugging?
>> [true] -->
>> + <!-- debugging?
>> [true] -->
>>
>> <!--
>> -->
>> <!-- trimSpaces Should white spaces in template text
>> between -->
>> <!-- actions or directives be trimmed?
>> [false] -->
>>
>> <!--
>> -->
>> - <!-- reloading Should Jasper check for modified
>> JSPs? [true] -->
>> -
>> <!--
>> -->
>> <!-- suppressSmap Should the generation of SMAP info
>> for JSR45 -->
>> <!-- debugging be suppressed?
>> [false] -->
>>
>> <!--
>> -->
>> @@ -193,12 +213,19 @@
>> <!-- xpoweredBy Determines whether X-Powered-By
>> response -->
>> <!-- header is added by generated
>> servlet [false] -->
>>
>> <!--
>> -->
>> + <!-- compilerTargetVM Compiler target
>> VM -->
>> + <!-- default is
>> System.properties -->
>> + <!-- java.specification.version >
>> 1.4 -->
>> + <!-- [1.5] else
>> [1.4] -->
>> +
>> <!--
>> -->
>> + <!-- compilerSourceVM Compiler source
>> VM -->
>> + <!-- default is
>> System.properties -->
>> + <!-- java.specification.version >
>> 1.4 -->
>> + <!-- [1.5] else
>> [1.4] -->
>> +
>> <!--
>> -->
>> <!-- If you wish to use Jikes to compile JSP
>> pages: -->
>> - <!-- Set the init parameter "compiler" to "jikes".
>> Define -->
>> - <!-- the property "-Dbuild.compiler.emacs=true" when starting
>> Tomcat -->
>> - <!-- by adding the above to your CATALINA_OPTS environment
>> variable. -->
>> - <!-- If you get an error reporting that jikes can't use UTF8
>> encoding, -->
>> - <!-- try setting the init parameter "javaEncoding" to
>> "ISO-8859-1". -->
>> + <!-- Please see the "Using Jikes" section of the Jasper-
>> HowTo -->
>> + <!-- page in the Tomcat
>> documentation. -->
>>
>> <servlet>
>> <servlet-name>jsp</servlet-name>
>> @@ -219,6 +246,9 @@
>> </servlet>
>>
>>
>> + <!-- NOTE: An SSI Filter is also available as an alternative
>> SSI -->
>> + <!-- implementation. Use either the Servlet or the Filter but
>> NOT both. -->
>> +
>> <!--
>> -->
>> <!-- Server Side Includes processing servlet, which processes
>> SSI -->
>> <!-- directives in HTML pages consistent with similar support
>> in web -->
>> <!-- servers like Apache. Traditionally, this servlet is
>> mapped to the -->
>> @@ -239,6 +269,13 @@
>> <!-- relative to the context root,
>> instead of -->
>> <!-- the server root? (0=false, 1=true)
>> [0] -->
>>
>> <!--
>> -->
>> + <!-- inputEncoding The encoding to assume for SSI
>> resources if -->
>> + <!-- one is not available from the
>> resource. -->
>> + <!-- [Platform
>> default] -->
>> +
>> <!--
>> -->
>> + <!-- outputEncoding The encoding to use for the page
>> that results -->
>> + <!-- from the SSI processing.
>> [UTF-8] -->
>> +
>> <!--
>> -->
>>
>> <!--
>> -->
>> <!-- IMPORTANT: To use the SSI servlet, you also need to rename
>> the -->
>> <!-- $CATALINA_HOME/server/lib/servlets-
>> ssi.renametojar file -->
>> @@ -279,23 +316,22 @@
>> <!-- supports the following initialization parameters (default
>> values -->
>> <!-- are in square
>> brackets): -->
>>
>> <!--
>> -->
>> - <!-- cgiPathPrefix The CGI search path will start
>> at -->
>> - <!-- webAppRootDir + File.separator +
>> this prefix. -->
>> - <!-- [WEB-INF/
>> cgi] -->
>> -
>> <!--
>> -->
>> - <!-- clientInputTimeout The time (in milliseconds) to wait
>> for input -->
>> - <!-- from the browser before assuming
>> that there -->
>> - <!-- is none.
>> [100] -->
>> -
>> <!--
>> -->
>> - <!-- debug Debugging detail level for messages
>> logged -->
>> - <!-- by this servlet.
>> [0] -->
>> + <!-- cgiPathPrefix The CGI search path will start
>> at -->
>> + <!-- webAppRootDir + File.separator +
>> this prefix. -->
>> + <!-- [WEB-INF/
>> cgi] -->
>> +
>> <!--
>> -->
>> + <!-- debug Debugging detail level for messages
>> logged -->
>> + <!-- by this servlet.
>> [0] -->
>> +
>> <!--
>> -->
>> + <!-- executable Name of the exectuable used to run
>> the -->
>> + <!-- script.
>> [perl] -->
>> +
>> <!--
>> -->
>> + <!-- parameterEncoding Name of parameter encoding to be
>> used with -->
>> + <!-- CGI
>> servlet. -->
>> + <!-- [System.getProperty
>> ("file.encoding","UTF-8")] -->
>>
>> <!--
>> -->
>> - <!-- executable Name of the exectuable used to run
>> the script. -->
>> - <!--
>> [perl] -->
>> -
>> <!--
>> -->
>> - <!-- parameterEncoding Name of parameter encoding to be
>> used with CGI -->
>> - <!--
>> servlet. -->
>> - <!-- [System.getProperty
>> ("file.encoding","UTF-8")] -->
>> + <!-- passShellEnvironment Should the shell environment
>> variables (if -->
>> + <!-- any) be passed to the CGI script?
>> [false] -->
>>
>> <!--
>> -->
>> <!-- IMPORTANT: To use the CGI servlet, you also need to rename
>> the -->
>> <!-- $CATALINA_HOME/server/lib/servlets-
>> cgi.renametojar file -->
>> @@ -306,12 +342,8 @@
>> <servlet-name>cgi</servlet-name>
>> <servlet-class>org.apache.catalina.servlets.CGIServlet</
>> servlet-class>
>> <init-param>
>> - <param-name>clientInputTimeout</param-name>
>> - <param-value>100</param-value>
>> - </init-param>
>> - <init-param>
>> <param-name>debug</param-name>
>> - <param-value>6</param-value>
>> + <param-value>0</param-value>
>> </init-param>
>> <init-param>
>> <param-name>cgiPathPrefix</param-name>
>> @@ -487,7 +519,7 @@
>> </mime-mapping>
>> <mime-mapping>
>> <extension>dtd</extension>
>> - <mime-type>text/plain</mime-type>
>> + <mime-type>application/xml-dtd</mime-type>
>> </mime-mapping>
>> <mime-mapping>
>> <extension>dv</extension>
>> @@ -610,6 +642,10 @@
>> <mime-type>application/x-troff-man</mime-type>
>> </mime-mapping>
>> <mime-mapping>
>> + <extension>mathml</extension>
>> + <mime-type>application/mathml+xml</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> <extension>me</extension>
>> <mime-type>application/x-troff-me</mime-type>
>> </mime-mapping>
>> @@ -682,6 +718,80 @@
>> <mime-type>application/oda</mime-type>
>> </mime-mapping>
>> <mime-mapping>
>> + <!-- OpenDocument Database -->
>> + <extension>odb</extension>
>> + <mime-type>application/vnd.oasis.opendocument.database</
>> mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Chart -->
>> + <extension>odc</extension>
>> + <mime-type>application/vnd.oasis.opendocument.chart</mime-
>> type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Formula -->
>> + <extension>odf</extension>
>> + <mime-type>application/vnd.oasis.opendocument.formula</
>> mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Drawing -->
>> + <extension>odg</extension>
>> + <mime-type>application/vnd.oasis.opendocument.graphics</
>> mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Image -->
>> + <extension>odi</extension>
>> + <mime-type>application/vnd.oasis.opendocument.image</mime-
>> type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Master Document -->
>> + <extension>odm</extension>
>> + <mime-type>application/vnd.oasis.opendocument.text-
>> master</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Presentation -->
>> + <extension>odp</extension>
>> + <mime-type>application/
>> vnd.oasis.opendocument.presentation</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Spreadsheet -->
>> + <extension>ods</extension>
>> + <mime-type>application/
>> vnd.oasis.opendocument.spreadsheet</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Text -->
>> + <extension>odt</extension>
>> + <mime-type>application/vnd.oasis.opendocument.text</mime-
>> type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <extension>ogg</extension>
>> + <mime-type>application/ogg</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Drawing Template -->
>> + <extension>otg </extension>
>> + <mime-type>application/vnd.oasis.opendocument.graphics-
>> template</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- HTML Document Template -->
>> + <extension>oth</extension>
>> + <mime-type>application/vnd.oasis.opendocument.text-web</
>> mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Presentation Template -->
>> + <extension>otp</extension>
>> + <mime-type>application/
>> vnd.oasis.opendocument.presentation-template</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Spreadsheet Template -->
>> + <extension>ots</extension>
>> + <mime-type>application/vnd.oasis.opendocument.spreadsheet-
>> template </mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <!-- OpenDocument Text Template -->
>> + <extension>ott</extension>
>> + <mime-type>application/vnd.oasis.opendocument.text-
>> template</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> <extension>pbm</extension>
>> <mime-type>image/x-portable-bitmap</mime-type>
>> </mime-mapping>
>> @@ -754,6 +864,10 @@
>> <mime-type>image/x-cmu-raster</mime-type>
>> </mime-mapping>
>> <mime-mapping>
>> + <extension>rdf</extension>
>> + <mime-type>application/rdf+xml</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> <extension>rgb</extension>
>> <mime-type>image/x-rgb</mime-type>
>> </mime-mapping>
>> @@ -781,6 +895,12 @@
>> <extension>shar</extension>
>> <mime-type>application/x-shar</mime-type>
>> </mime-mapping>
>> +<!--
>> + <mime-mapping>
>> + <extension>shtml</extension>
>> + <mime-type>text/x-server-parsed-html</mime-type>
>> + </mime-mapping>
>> +-->
>> <mime-mapping>
>> <extension>smf</extension>
>> <mime-type>audio/x-midi</mime-type>
>> @@ -862,6 +982,10 @@
>> <mime-type>application/x-ustar</mime-type>
>> </mime-mapping>
>> <mime-mapping>
>> + <extension>vxml</extension>
>> + <mime-type>application/voicexml+xml</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> <extension>xbm</extension>
>> <mime-type>image/x-xbitmap</mime-type>
>> </mime-mapping>
>> @@ -875,7 +999,7 @@
>> </mime-mapping>
>> <mime-mapping>
>> <extension>xml</extension>
>> - <mime-type>text/xml</mime-type>
>> + <mime-type>application/xml</mime-type>
>> </mime-mapping>
>> <mime-mapping>
>> <extension>xpm</extension>
>> @@ -883,7 +1007,15 @@
>> </mime-mapping>
>> <mime-mapping>
>> <extension>xsl</extension>
>> - <mime-type>text/xml</mime-type>
>> + <mime-type>application/xml</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <extension>xslt</extension>
>> + <mime-type>application/xslt+xml</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <extension>xul</extension>
>> + <mime-type>application/vnd.mozilla.xul+xml</mime-type>
>> </mime-mapping>
>> <mime-mapping>
>> <extension>xwd</extension>
>> @@ -946,7 +1078,18 @@
>> <extension>zip</extension>
>> <mime-type>application/zip</mime-type>
>> </mime-mapping>
>> -
>> + <mime-mapping>
>> + <extension>xls</extension>
>> + <mime-type>application/vnd.ms-excel</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <extension>doc</extension>
>> + <mime-type>application/vnd.ms-word</mime-type>
>> + </mime-mapping>
>> + <mime-mapping>
>> + <extension>ppt</extension>
>> + <mime-type>application/vnd.ms-powerpoint</mime-type>
>> + </mime-mapping>
>>
>> <!-- ==================== Default Welcome File List
>> ===================== -->
>> <!-- When a request URI refers to a directory, the default
>> servlet looks -->
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat-builder/
>> src/test/java/org/apache/geronimo/tomcat/deployment/
>> TomcatModuleBuilderTest.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat-builder/src/test/java/org/apache/geronimo/tomcat/
>> deployment/TomcatModuleBuilderTest.java?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> java/org/apache/geronimo/tomcat/deployment/
>> TomcatModuleBuilderTest.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> java/org/apache/geronimo/tomcat/deployment/
>> TomcatModuleBuilderTest.java Wed Dec 6 11:52:09 2006
>> @@ -110,6 +110,10 @@
>> verifyStartable("war5");
>> }
>>
>> + public void testDeployWar6() throws Exception {
>> + verifyStartable("war6-jee5");
>> + }
>> +
>> public void testContextRootWithSpaces() throws Exception {
>> WebModuleInfo info = deployWar("war-spaces-in-context");
>> String contextRoot = (String) kernel.getAttribute
>> (info.moduleName, "contextPath");
>>
>> Added: geronimo/server/trunk/modules/geronimo-tomcat-builder/src/
>> test/resources/deployables/war6-jee5/WEB-INF/classes/org/apache/
>> geronimo/tomcat/app/Filter1.class
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat-builder/src/test/resources/deployables/war6-jee5/
>> WEB-INF/classes/org/apache/geronimo/tomcat/app/Filter1.class?
>> view=auto&rev=483201
>> =====================================================================
>> =========
>> Binary file - no diff available.
>>
>> Propchange: geronimo/server/trunk/modules/geronimo-tomcat-builder/
>> src/test/resources/deployables/war6-jee5/WEB-INF/classes/org/
>> apache/geronimo/tomcat/app/Filter1.class
>> ---------------------------------------------------------------------
>> ---------
>> svn:mime-type = application/octet-stream
>>
>> Added: geronimo/server/trunk/modules/geronimo-tomcat-builder/src/
>> test/resources/deployables/war6-jee5/WEB-INF/classes/org/apache/
>> geronimo/tomcat/app/Servlet1.class
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat-builder/src/test/resources/deployables/war6-jee5/
>> WEB-INF/classes/org/apache/geronimo/tomcat/app/Servlet1.class?
>> view=auto&rev=483201
>> =====================================================================
>> =========
>> Binary file - no diff available.
>>
>> Propchange: geronimo/server/trunk/modules/geronimo-tomcat-builder/
>> src/test/resources/deployables/war6-jee5/WEB-INF/classes/org/
>> apache/geronimo/tomcat/app/Servlet1.class
>> ---------------------------------------------------------------------
>> ---------
>> svn:mime-type = application/octet-stream
>>
>> Added: geronimo/server/trunk/modules/geronimo-tomcat-builder/src/
>> test/resources/deployables/war6-jee5/WEB-INF/geronimo-web.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat-builder/src/test/resources/deployables/war6-jee5/
>> WEB-INF/geronimo-web.xml?view=auto&rev=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/geronimo-web.xml (added)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/geronimo-web.xml Wed Dec
>> 6 11:52:09 2006
>> @@ -0,0 +1,35 @@
>> +<?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
>> +
>> + 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.
>> +-->
>> +
>> +<web-app
>> + xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
>> + xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
>> +
>> + <environment>
>> + <moduleId>
>> + <groupId>foo</groupId>
>> + <artifactId>bar</artifactId>
>> + <version>1</version>
>> + <type>car</type>
>> + </moduleId>
>> + </environment>
>> +
>> + <context-root>/war6-jee5</context-root>
>> +
>> +</web-app>
>>
>> Added: geronimo/server/trunk/modules/geronimo-tomcat-builder/src/
>> test/resources/deployables/war6-jee5/WEB-INF/web.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat-builder/src/test/resources/deployables/war6-jee5/
>> WEB-INF/web.xml?view=auto&rev=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/web.xml (added)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat-builder/src/test/
>> resources/deployables/war6-jee5/WEB-INF/web.xml Wed Dec 6
>> 11:52:09 2006
>> @@ -0,0 +1,56 @@
>> +<?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
>> +
>> + 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.
>> +-->
>> +
>> +<web-app xmlns="http://java.sun.com/xml/ns/javaee"
>> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://
>> java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
>> + version="2.5" >
>> +
>> + <display-name>war6-jee5</display-name>
>> + <filter>
>> + <filter-name>Filter1</filter-name>
>> + <filter-class>org.apache.geronimo.tomcat.app.Filter1</
>> filter-class>
>> + <init-param>
>> + <param-name>attribute1</param-name>
>> + <param-value>value1</param-value>
>> + </init-param>
>> + </filter>
>> + <filter-mapping>
>> + <filter-name>Filter1</filter-name>
>> + <servlet-name>Servlet*</servlet-name> <!-- servlet 2.5
>> allows wildcard -->
>> + </filter-mapping>
>> + <servlet>
>> + <servlet-name>Servlet1</servlet-name>
>> + <servlet-class>org.apache.geronimo.tomcat.app.Servlet1</
>> servlet-class>
>> + </servlet>
>> + <servlet-mapping>
>> + <servlet-name>Servlet1</servlet-name>
>> + <url-pattern>/path1</url-pattern>
>> + <url-pattern>/path2</url-pattern> <!-- servlet 2.5
>> allows multiple patterns -->
>> + </servlet-mapping>
>> + <jsp-config>
>> + <taglib>
>> + <taglib-uri>http://geronimo.apache.org/jsp/
>> tagliburi1</taglib-uri>
>> + <taglib-location>/WEB-INF/taglib1.tld</taglib-location>
>> + </taglib>
>> + <taglib>
>> + <taglib-uri>http://geronimo.apache.org/jsp/
>> tagliburi2</taglib-uri>
>> + <taglib-location>/WEB-INF/taglib2.tld</taglib-location>
>> + </taglib>
>> + </jsp-config>
>> +</web-app>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/pom.xml?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/pom.xml (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/pom.xml Wed Dec
>> 6 11:52:09 2006
>> @@ -33,28 +33,17 @@
>> <name>Geronimo :: Tomcat</name>
>>
>> <dependencies>
>> -
>> - <dependency>
>> - <groupId>org.apache.geronimo.specs</groupId>
>> - <artifactId>geronimo-jsp_2.0_spec</artifactId>
>> - <scope>provided</scope>
>> - </dependency>
>>
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> - <artifactId>geronimo-j2ee-connector_1.5_spec</
>> artifactId>
>> + <artifactId>geronimo-annotation_1.0_spec</artifactId>
>> <scope>provided</scope>
>> </dependency>
>>
>> <dependency>
>> <groupId>org.apache.geronimo.specs</groupId>
>> - <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
>> - <scope>provided</scope>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>org.apache.geronimo.specs</groupId>
>> - <artifactId>geronimo-j2ee-management_1.1_spec</
>> artifactId>
>> + <artifactId>geronimo-jsp_2.1_spec</artifactId>
>> + <version>1.0-SNAPSHOT</version>
>> <scope>provided</scope>
>> </dependency>
>>
>> @@ -101,120 +90,57 @@
>> </dependency>
>>
>> <dependency>
>> - <groupId>tomcat</groupId>
>> + <groupId>org.apache.tomcat</groupId>
>> <artifactId>catalina</artifactId>
>> + <version>6.0.2-beta</version>
>> </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>tomcat-ajp</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>catalina-cluster</artifactId>
>> - </dependency>
>> -
>> - <!--
>> - - Required until any realm is provided to Tomcat
>> - - See StandardEngine::getRealm()
>> - -->
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>catalina-optional</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>tomcat-coyote</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>tomcat-http</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-compiler</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-compiler-jdt</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>jasper-runtime</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>tomcat-util</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>naming-resources</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>servlets-default</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>tomcat</groupId>
>> - <artifactId>servlets-invoker</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>xerces</groupId>
>> - <artifactId>xercesImpl</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>xml-apis</groupId>
>> - <artifactId>xml-apis</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>commons-beanutils</groupId>
>> - <artifactId>commons-beanutils</artifactId>
>> - </dependency>
>> -
>> - <dependency>
>> - <groupId>commons-collections</groupId>
>> - <artifactId>commons-collections</artifactId>
>> - </dependency>
>> -
>> +
>> <dependency>
>> - <groupId>commons-digester</groupId>
>> - <artifactId>commons-digester</artifactId>
>> + <groupId>org.apache.tomcat</groupId>
>> + <artifactId>jasper</artifactId>
>> + <version>6.0.2-beta</version>
>> </dependency>
>> -
>> +
>> <dependency>
>> - <groupId>commons-el</groupId>
>> - <artifactId>commons-el</artifactId>
>> + <groupId>org.apache.tomcat</groupId>
>> + <artifactId>jasper-el</artifactId>
>> + <version>6.0.2-beta</version>
>> </dependency>
>>
>> <dependency>
>> - <groupId>commons-logging</groupId>
>> - <artifactId>commons-logging</artifactId>
>> + <groupId>org.apache.tomcat</groupId>
>> + <artifactId>jasper-jdt</artifactId>
>> + <version>6.0.2-beta</version>
>> </dependency>
>>
>> <dependency>
>> - <groupId>commons-modeler</groupId>
>> - <artifactId>commons-modeler</artifactId>
>> + <groupId>org.apache.tomcat</groupId>
>> + <artifactId>coyote</artifactId>
>> + <version>6.0.2-beta</version>
>> </dependency>
>> -
>> +
>> <dependency>
>> - <groupId>regexp</groupId>
>> - <artifactId>regexp</artifactId>
>> + <groupId>org.apache.tomcat</groupId>
>> + <artifactId>juli</artifactId>
>> + <version>6.0.2-beta</version>
>> </dependency>
>>
>> </dependencies>
>> +
>> + <repositories>
>> + <repository>
>> + <id>tomcat6-repo</id>
>> + <url>http://people.apache.org/~pmcmahan/maven2</url>
>> + <layout>default</layout>
>> + <snapshots>
>> + <enabled>false</enabled>
>> + </snapshots>
>> + <releases>
>> + <enabled>true</enabled>
>> + <checksumPolicy>ignore</checksumPolicy>
>> + </releases>
>> + </repository>
>> + </repositories>
>>
>> <build>
>> <plugins>
>> @@ -222,44 +148,9 @@
>> <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-surefire-plugin</artifactId>
>> <configuration>
>> - <systemProperties>
>> - <property>
>> - <name>java.endorsed.dirs</name>
>> - <value>${project.build.directory}/
>> endorsed</value>
>> - </property>
>> - </systemProperties>
>> -
>> <forkMode>pertest</forkMode>
>> </configuration>
>> </plugin>
>> -
>> - <plugin>
>> - <groupId>org.codehaus.mojo</groupId>
>> - <artifactId>dependency-maven-plugin</artifactId>
>> - <executions>
>> - <execution>
>> - <id>copy-endorsed-jars</id>
>> - <phase>process-test-resources</phase>
>> - <goals>
>> - <goal>copy</goal>
>> - </goals>
>> - <configuration>
>> - <artifactItems>
>> - <artifactItem>
>> - <groupId>xerces</groupId>
>> - <artifactId>xercesImpl</
>> artifactId>
>> - </artifactItem>
>> - <artifactItem>
>> - <groupId>xml-apis</groupId>
>> - <artifactId>xml-apis</
>> artifactId>
>> - </artifactItem>
>> - </artifactItems>
>> - <outputDirectory>$
>> {project.build.directory}/endorsed</outputDirectory>
>> - </configuration>
>> - </execution>
>> - </executions>
>> - </plugin>
>> -
>> <plugin>
>> <groupId>org.apache.maven.plugins</groupId>
>> <artifactId>maven-antrun-plugin</artifactId>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> java/org/apache/geronimo/tomcat/EngineGBean.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/
>> EngineGBean.java?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/EngineGBean.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/EngineGBean.java Wed Dec 6 11:52:09 2006
>> @@ -19,7 +19,6 @@
>> import java.util.Collection;
>> import java.util.Iterator;
>> import java.util.Map;
>> -import org.apache.catalina.Cluster;
>> import org.apache.catalina.Engine;
>> import org.apache.catalina.Host;
>> import org.apache.catalina.Manager;
>> @@ -35,7 +34,6 @@
>> import org.apache.geronimo.gbean.ReferenceCollectionEvent;
>> import org.apache.geronimo.gbean.ReferenceCollectionListener;
>> import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>> -import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
>>
>> /**
>> * @version $Rev$ $Date$
>> @@ -55,7 +53,7 @@
>> Collection hosts,
>> ObjectRetriever realmGBean,
>> ValveGBean tomcatValveChain,
>> - CatalinaClusterGBean clusterGBean,
>> +// CatalinaClusterGBean clusterGBean,
>> ManagerGBean manager) throws Exception {
>> super(); // TODO: make it an attribute
>>
>> @@ -144,9 +142,9 @@
>>
>>
>> //Add clustering
>> - if (clusterGBean != null){
>> - engine.setCluster((Cluster)
>> clusterGBean.getInternalObject());
>> - }
>> +// if (clusterGBean != null){
>> +// engine.setCluster((Cluster)
>> clusterGBean.getInternalObject());
>> +// }
>> }
>>
>> private void removeHost(ObjectRetriever objRetriever) {
>> @@ -190,7 +188,7 @@
>> infoFactory.addReference("Hosts", ObjectRetriever.class,
>> HostGBean.J2EE_TYPE);
>> infoFactory.addReference("RealmGBean",
>> ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
>> infoFactory.addReference("TomcatValveChain",
>> ValveGBean.class, ValveGBean.J2EE_TYPE);
>> - infoFactory.addReference("CatalinaCluster",
>> CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
>> +// infoFactory.addReference("CatalinaCluster",
>> CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
>> infoFactory.addReference("Manager", ManagerGBean.class,
>> ManagerGBean.J2EE_TYPE);
>> infoFactory.addOperation("getInternalObject");
>> infoFactory.setConstructor(new String[] {
>> @@ -200,7 +198,7 @@
>> "Hosts",
>> "RealmGBean",
>> "TomcatValveChain",
>> - "CatalinaCluster",
>> +// "CatalinaCluster",
>> "Manager"});
>> GBEAN_INFO = infoFactory.getBeanInfo();
>> }
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/
>> GeronimoStandardContext.java?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/GeronimoStandardContext.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/GeronimoStandardContext.java Wed Dec 6
>> 11:52:09 2006
>> @@ -34,7 +34,6 @@
>> import org.apache.catalina.Manager;
>> import org.apache.catalina.Valve;
>> import org.apache.catalina.Wrapper;
>> -import org.apache.catalina.cluster.CatalinaCluster;
>> import org.apache.catalina.connector.Request;
>> import org.apache.catalina.connector.Response;
>> import org.apache.catalina.core.StandardContext;
>> @@ -150,9 +149,9 @@
>> }
>> }
>>
>> - CatalinaCluster cluster = ctx.getCluster();
>> - if (cluster != null)
>> - this.setCluster(cluster);
>> +// CatalinaCluster cluster = ctx.getCluster();
>> +// if (cluster != null)
>> +// this.setCluster(cluster);
>>
>> Manager manager = ctx.getManager();
>> if (manager != null)
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> java/org/apache/geronimo/tomcat/HostGBean.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/
>> HostGBean.java?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/HostGBean.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/HostGBean.java Wed Dec 6 11:52:09 2006
>> @@ -19,7 +19,6 @@
>> import java.util.ArrayList;
>> import java.util.Iterator;
>> import java.util.Map;
>> -import org.apache.catalina.Cluster;
>> import org.apache.catalina.Host;
>> import org.apache.catalina.Manager;
>> import org.apache.catalina.Realm;
>> @@ -31,7 +30,6 @@
>> import org.apache.geronimo.gbean.GBeanInfoBuilder;
>> import org.apache.geronimo.gbean.GBeanLifecycle;
>> import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>> -import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
>>
>> /**
>> * @version $Rev$ $Date$
>> @@ -55,7 +53,7 @@
>> ArrayList aliases,
>> ObjectRetriever realmGBean,
>> ValveGBean tomcatValveChain,
>> - CatalinaClusterGBean clusterGBean,
>> +// CatalinaClusterGBean clusterGBean,
>> ManagerGBean manager) throws Exception {
>> super(); // TODO: make it an attribute
>>
>> @@ -107,9 +105,9 @@
>> }
>>
>> //Add clustering
>> - if (clusterGBean != null){
>> - host.setCluster((Cluster)
>> clusterGBean.getInternalObject());
>> - }
>> +// if (clusterGBean != null){
>> +// host.setCluster((Cluster)
>> clusterGBean.getInternalObject());
>> +// }
>>
>> //Add manager
>> if (manager != null)
>> @@ -141,7 +139,7 @@
>> infoFactory.addAttribute("aliases", ArrayList.class, true);
>> infoFactory.addReference("RealmGBean",
>> ObjectRetriever.class, NameFactory.GERONIMO_SERVICE);
>> infoFactory.addReference("TomcatValveChain",
>> ValveGBean.class, ValveGBean.J2EE_TYPE);
>> - infoFactory.addReference("CatalinaCluster",
>> CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
>> +// infoFactory.addReference("CatalinaCluster",
>> CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
>> infoFactory.addReference("Manager", ManagerGBean.class,
>> ManagerGBean.J2EE_TYPE);
>> infoFactory.addOperation("getInternalObject");
>> infoFactory.setConstructor(new String[] {
>> @@ -150,7 +148,7 @@
>> "aliases",
>> "RealmGBean",
>> "TomcatValveChain",
>> - "CatalinaCluster",
>> +// "CatalinaCluster",
>> "Manager"});
>> GBEAN_INFO = infoFactory.getBeanInfo();
>> }
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/
>> HttpsConnectorGBean.java?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/HttpsConnectorGBean.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/HttpsConnectorGBean.java Wed Dec 6
>> 11:52:09 2006
>> @@ -3,7 +3,6 @@
>> import java.util.Map;
>> import javax.net.ssl.KeyManagerFactory;
>>
>> -import org.apache.geronimo.management.geronimo.SecureConnector;
>> import org.apache.geronimo.management.geronimo.WebManager;
>> import org.apache.geronimo.system.serverinfo.ServerInfo;
>> import org.apache.geronimo.gbean.GBeanInfo;
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> java/org/apache/geronimo/tomcat/TomcatContainer.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/
>> TomcatContainer.java?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatContainer.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatContainer.java Wed Dec 6
>> 11:52:09 2006
>> @@ -22,8 +22,6 @@
>> import java.net.URLStreamHandlerFactory;
>> import java.net.URL;
>>
>> -import javax.management.ObjectName;
>> -
>> import org.apache.catalina.Container;
>> import org.apache.catalina.Context;
>> import org.apache.catalina.Engine;
>> @@ -36,7 +34,6 @@
>> import org.apache.geronimo.gbean.GBeanInfoBuilder;
>> import org.apache.geronimo.gbean.GBeanLifecycle;
>> import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
>> -import org.apache.geronimo.kernel.ObjectNameUtil;
>> import org.apache.geronimo.management.geronimo.NetworkConnector;
>> import org.apache.geronimo.management.geronimo.WebManager;
>> import org.apache.geronimo.system.serverinfo.ServerInfo;
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> java/org/apache/geronimo/tomcat/TomcatContext.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/
>> TomcatContext.java?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatContext.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatContext.java Wed Dec 6 11:52:09
>> 2006
>> @@ -25,7 +25,6 @@
>> import org.apache.catalina.Context;
>> import org.apache.catalina.Manager;
>> import org.apache.catalina.Realm;
>> -import org.apache.catalina.cluster.CatalinaCluster;
>> import org.apache.geronimo.kernel.Kernel;
>> import org.apache.geronimo.tomcat.util.SecurityHolder;
>> import
>> org.apache.geronimo.connector.outbound.connectiontracking.TrackedConn
>> ectionAssociator;
>> @@ -65,7 +64,7 @@
>>
>> public List getValveChain();
>>
>> - public CatalinaCluster getCluster();
>> +// public CatalinaCluster getCluster();
>>
>> public Manager getManager();
>>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> java/org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/
>> TomcatEJBWebServiceContext.java?
>> view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatEJBWebServiceContext.java Wed
>> Dec 6 11:52:09 2006
>> @@ -35,8 +35,6 @@
>> import org.apache.catalina.valves.ValveBase;
>> import org.apache.commons.logging.Log;
>> import org.apache.commons.logging.LogFactory;
>> -import org.apache.geronimo.tomcat.realm.TomcatJAASRealm;
>> -import org.apache.geronimo.tomcat.realm.TomcatGeronimoRealm;
>> import org.apache.geronimo.tomcat.realm.TomcatEJBWSGeronimoRealm;
>> import org.apache.geronimo.webservices.WebServiceContainer;
>>
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/
>> TomcatWebAppContext.java?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/TomcatWebAppContext.java Wed Dec 6
>> 11:52:09 2006
>> @@ -38,7 +38,6 @@
>> import org.apache.catalina.Manager;
>> import org.apache.catalina.Realm;
>> import org.apache.catalina.Valve;
>> -import org.apache.catalina.cluster.CatalinaCluster;
>> import org.apache.catalina.core.StandardContext;
>> import org.apache.commons.logging.Log;
>> import org.apache.commons.logging.LogFactory;
>> @@ -56,7 +55,6 @@
>> import org.apache.geronimo.management.geronimo.WebConnector;
>> import org.apache.geronimo.management.geronimo.WebContainer;
>> import org.apache.geronimo.management.geronimo.WebModule;
>> -import org.apache.geronimo.tomcat.cluster.CatalinaClusterGBean;
>> import org.apache.geronimo.tomcat.util.SecurityHolder;
>> import org.apache.geronimo.transaction.GeronimoUserTransaction;
>> import org.apache.geronimo.webservices.WebServiceContainer;
>> @@ -88,7 +86,7 @@
>>
>> private final List valveChain;
>>
>> - private final CatalinaCluster catalinaCluster;
>> +// private final CatalinaCluster catalinaCluster;
>>
>> private final Manager manager;
>>
>> @@ -141,7 +139,7 @@
>> TomcatContainer container,
>> ObjectRetriever tomcatRealm,
>> ValveGBean tomcatValveChain,
>> - CatalinaClusterGBean cluster,
>> +// CatalinaClusterGBean cluster,
>> ManagerGBean manager,
>> boolean crossContext,
>> boolean disableCookies,
>> @@ -207,11 +205,11 @@
>> }
>>
>> //Add the cluster
>> - if (cluster != null) {
>> - catalinaCluster = (CatalinaCluster)
>> cluster.getInternalObject();
>> - } else {
>> - catalinaCluster = null;
>> - }
>> +// if (cluster != null) {
>> +// catalinaCluster = (CatalinaCluster)
>> cluster.getInternalObject();
>> +// } else {
>> +// catalinaCluster = null;
>> +// }
>>
>> //Add the manager
>> if (manager != null) {
>> @@ -399,9 +397,9 @@
>> return valveChain;
>> }
>>
>> - public CatalinaCluster getCluster() {
>> - return catalinaCluster;
>> - }
>> +// public CatalinaCluster getCluster() {
>> +// return catalinaCluster;
>> +// }
>>
>> public Manager getManager() {
>> return manager;
>> @@ -523,7 +521,7 @@
>> infoBuilder.addReference("Container",
>> TomcatContainer.class, NameFactory.GERONIMO_SERVICE);
>> infoBuilder.addReference("TomcatRealm",
>> ObjectRetriever.class);
>> infoBuilder.addReference("TomcatValveChain",
>> ValveGBean.class);
>> - infoBuilder.addReference("Cluster",
>> CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
>> +// infoBuilder.addReference("Cluster",
>> CatalinaClusterGBean.class, CatalinaClusterGBean.J2EE_TYPE);
>> infoBuilder.addReference("Manager", ManagerGBean.class);
>> infoBuilder.addAttribute("crossContext", boolean.class,
>> true);
>> infoBuilder.addAttribute("disableCookies", boolean.class,
>> true);
>> @@ -549,7 +547,7 @@
>> "Container",
>> "TomcatRealm",
>> "TomcatValveChain",
>> - "Cluster",
>> +// "Cluster",
>> "Manager",
>> "crossContext",
>> "disableCookies",
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> java/org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/realm/
>> TomcatGeronimoRealm.java?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/realm/TomcatGeronimoRealm.java Wed Dec
>> 6 11:52:09 2006
>> @@ -18,7 +18,6 @@
>>
>> import org.apache.catalina.Context;
>> import org.apache.catalina.LifecycleException;
>> -import org.apache.catalina.Wrapper;
>> import org.apache.catalina.connector.Request;
>> import org.apache.catalina.connector.Response;
>> import org.apache.catalina.deploy.LoginConfig;
>> @@ -44,7 +43,6 @@
>> import javax.security.jacc.WebResourcePermission;
>> import javax.security.jacc.WebRoleRefPermission;
>> import javax.security.jacc.WebUserDataPermission;
>> -import javax.servlet.ServletRequest;
>>
>> import java.io.IOException;
>> import java.security.AccessControlContext;
>>
>> Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/
>> java/org/apache/geronimo/tomcat/realm/TomcatJAASRealm.java
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/
>> geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/realm/
>> TomcatJAASRealm.java?view=diff&rev=483201&r1=483200&r2=483201
>> =====================================================================
>> =========
>> --- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/realm/TomcatJAASRealm.java (original)
>> +++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/
>> org/apache/geronimo/tomcat/realm/TomcatJAASRealm.java Wed Dec 6
>> 11:52:09 2006
>> @@ -162,7 +162,7 @@
>>
>> protected Principal createPrincipal(String username, Subject
>> subject) {
>> // Prepare to scan the Principals for this Subject
>> - String password = null; // Will not be carried forward
>> + //String password = null; // Will not be carried forward
>>
>> List roles = new ArrayList();
>> Principal userPrincipal = null;
>>
>>
>
-sachin
|