Return-Path: Delivered-To: apmail-geronimo-dev-archive@www.apache.org Received: (qmail 95321 invoked from network); 7 Dec 2006 19:13:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Dec 2006 19:13:26 -0000 Received: (qmail 812 invoked by uid 500); 7 Dec 2006 19:13:29 -0000 Delivered-To: apmail-geronimo-dev-archive@geronimo.apache.org Received: (qmail 782 invoked by uid 500); 7 Dec 2006 19:13:29 -0000 Mailing-List: contact dev-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list dev@geronimo.apache.org Received: (qmail 771 invoked by uid 99); 7 Dec 2006 19:13:29 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Dec 2006 11:13:29 -0800 X-ASF-Spam-Status: No, hits=1.7 required=10.0 tests=DNS_FROM_RFC_ABUSE,RCVD_IN_SORBS_WEB X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: local policy) Received: from [209.86.89.62] (HELO elasmtp-dupuy.atl.sa.earthlink.net) (209.86.89.62) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Dec 2006 11:13:16 -0800 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=dk20050327; d=earthlink.net; b=byQ9li0S9Cipc54PjAIghQmDhZWvLmtvi7TOroQ9eSwso8kBb3D1E+pyPd63onCB; h=Received:Message-ID:Date:From:User-Agent:X-Accept-Language:MIME-Version:To:Subject:References:In-Reply-To:Content-Type:Content-Transfer-Encoding:X-ELNK-Trace:X-Originating-IP; Received: from [129.33.49.251] (helo=[9.37.214.130]) by elasmtp-dupuy.atl.sa.earthlink.net with asmtp (Exim 4.34) id 1GsOfu-0000zX-O8 for dev@geronimo.apache.org; Thu, 07 Dec 2006 14:12:55 -0500 Message-ID: <457867B8.3090609@earthlink.net> Date: Thu, 07 Dec 2006 14:12:56 -0500 From: Joe Bohn User-Agent: Mozilla Thunderbird 1.0.2 (Windows/20050317) X-Accept-Language: en-us, en MIME-Version: 1.0 To: dev@geronimo.apache.org Subject: Re: svn commit: r483201 [1/2] - in /geronimo/server/trunk: applications/console/geronimo-console-framework/ applications/console/geronimo-console-standard/ applications/demo/ applications/geronimo-ca-helper/ applications/geronimo-examples/geronimo-jsp-exam... References: <20061206195215.2C98D1A984A@eris.apache.org> <45785BA9.6070701@earthlink.net> In-Reply-To: <45785BA9.6070701@earthlink.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-ELNK-Trace: c408501814fc19611aa676d7e74259b7b3291a7d08dfec79eade99e77104c17aaf39442f00628c14350badd9bab72f9c350badd9bab72f9c350badd9bab72f9c X-Originating-IP: 129.33.49.251 X-Virus-Checked: Checked by ClamAV on apache.org One other thought/question. Will this make it more difficult for our users if they have dependencies on modules that we've bundled with Geronimo when the major version of those modules changes? I recall some alias function that David worked on ... does that help? Thanks, Joe Joe Bohn wrote: > It seems like this will make upgrading to newer versions of projects > more difficult. As the major version changes there will be changes that > percolate across the geronimo modules, configs, assemblies, etc... It's > not impossible to maintain by any means, but it is a little more > difficult and error prone. We've already seen a little of this with > jetty6 (initial jetty6 image including both jetty 5 & jetty 6 items, > testsuite changes, etc...). > > Can you please summarize the rationale for this again and the benefits > to be gained? > > Thanks, > Joe > > > 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 @@ >>> provided >>> >>> >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - provided >>> - >>> - >>> >>> org.apache.geronimo.applications.console>> groupId> >>> geronimo-console-core >>> >>> 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 @@ >>> provided >>> >>> >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - provided >>> - >>> - >>> >>> >>> >>> >>> 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 @@ >>> war >>> >>> >>> - >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - provided >>> - >>> - >>> >>> >>> >>> >>> 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 @@ >>> geronimo-jsp_2.0_spec >>> >>> >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - >>> - >>> >>> >>> >>> >>> 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 @@ >>> jstl >>> >>> >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - >>> - >>> >>> >>> >>> >>> 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 @@ >>> >>> >>> >>> - >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - >>> - >>> >>> >>> >>> >>> 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} >>> >>> >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - >>> - >>> >>> >>> >>> >>> 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 @@ >>> geronimo-jsp_2.0_spec >>> >>> >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - >>> - >>> >>> >>> >>> >>> 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 @@ >>> geronimo-jsp_2.0_spec >>> >>> >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - >>> - >>> >>> >>> >>> >>> 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} >>> >>> >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - >>> - >>> >>> >>> >>> >>> 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 @@ >>> ../pom.xml >>> >>> >>> - geronimo-tomcat-j2ee >>> - Geronimo Assemblies :: J2EE + Tomcat >>> + geronimo-tomcat-jee5 >>> + Geronimo Assemblies :: JEE5 + Tomcat >>> application-assembly >>> >>> >>> - 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. >>> >>> >>> >>> @@ -83,10 +83,23 @@ >>> >>> >>> org.apache.geronimo.configs >>> + transaction-jta11 >>> + ${version} >>> + car >>> + >>> + >>> + >>> + org.apache.geronimo.configs >>> axis >>> ${version} >>> car >>> >>> + >>> + org.apache.geronimo.configs >>> + cxf >>> + ${version} >>> + car >>> + >>> >>> >>> org.apache.geronimo.configs >>> @@ -213,10 +226,9 @@ >>> ${version} >>> car >>> >>> - >>> >>> org.apache.geronimo.configs >>> - hot-deployer >>> + cxf-deployer >>> ${version} >>> car >>> >>> @@ -230,6 +242,13 @@ >>> >>> >>> org.apache.geronimo.configs >>> + hot-deployer >>> + ${version} >>> + car >>> + >>> + >>> + >>> + org.apache.geronimo.configs >>> tomcat-deployer >>> ${version} >>> car >>> @@ -284,16 +303,16 @@ >>> car >>> >>> >>> - >>> + >>> org.apache.geronimo.configs >>> - openjpa >>> + online-deployer >>> ${version} >>> car >>> >>> >>> - >>> + >>> org.apache.geronimo.configs >>> - online-deployer >>> + openjpa >>> ${version} >>> car >>> >>> @@ -327,7 +346,7 @@ >>> >>> >>> >>> org.apache.geronimo.assemblies >>> - geronimo- >>> boilerplate-j2ee >>> + geronimo- >>> boilerplate-jee5 >>> ${version} >>> >>> >>> >>> 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 @@ >>> geronimo-jetty-j2ee >>> geronimo-jetty-minimal >>> geronimo-jetty6-jee5 >>> - geronimo-tomcat-j2ee >>> + geronimo-tomcat-jee5 >>> geronimo-tomcat-minimal >>> >>> >>> >>> 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 @@ >>> >>> >>> org.apache.geronimo.specs >>> + geronimo-annotation_1.0_spec >>> + 1.0-SNAPSHOT >>> + >>> + >>> + >>> + org.apache.geronimo.specs >>> geronimo-ejb_2.1_spec >>> >>> >>> >>> org.apache.geronimo.specs >>> + geronimo-el_1.0_spec >>> + 1.0-SNAPSHOT >>> + >>> + >>> + >>> + org.apache.geronimo.specs >>> geronimo-j2ee-connector_1.5_spec >>> >>> >>> @@ -83,7 +95,8 @@ >>> >>> >>> org.apache.geronimo.specs >>> - geronimo-jsp_2.0_spec >>> + geronimo-jsp_2.1_spec >>> + 1.0-SNAPSHOT >>> >>> >>> >>> @@ -104,7 +117,7 @@ >>> >>> >>> org.apache.geronimo.specs >>> - geronimo-servlet_2.4_spec >>> + geronimo-servlet_2.5_spec >>> >>> >>> >>> >>> 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 @@ >>> geronimo-tomcat-builder >>> ${version} >>> >>> + >>> + >>> + org.apache.geronimo.modules >>> + geronimo-web-2.5-builder >>> + ${version} >>> + >>> + >>> + >>> + org.apache.geronimo.schema >>> + geronimo-schema-jee_5 >>> + >>> >>> >>> >>> >>> 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 @@ >>> >>> >>> >>> + >>> + >>> + >>> + tomcat6-repo >>> + http://people.apache.org/~pmcmahan/maven2 >>> + default >>> + >>> + false >>> + >>> + >>> + true >>> + ignore >>> + >>> + >>> + >>> >>> >>> >>> >>> 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 @@ >>> >>> >>> >>> - tomcat >>> - jasper-runtime >>> - >>> - >>> - >>> commons-digester >>> commons-digester >>> >>> @@ -194,6 +189,11 @@ >>> >>> dwr >>> dwr >>> + >>> + >>> + >>> + xerces >>> + xercesImpl >>> >>> >>> >>> >>> 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 @@ >>> pluto-portal >>> jar >>> >>> - >>> - tomcat >>> - jasper-runtime >>> - jar >>> - >>> >>> >>> >>> @@ -103,11 +98,6 @@ >>> >>> taglibs >>> standard >>> - jar >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> jar >>> >>> >>> >>> 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 @@ >>> >>> >>> >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> >>> ${pom.groupId} >>> geronimo-naming-builder >>> @@ -84,7 +66,7 @@ >>> >>> >>> ${pom.groupId} >>> - geronimo-web-builder >>> + geronimo-web-2.5-builder >>> ${version} >>> >>> >>> @@ -98,23 +80,16 @@ >>> stax-api >>> >>> >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> - >>> >>> org.apache.geronimo.specs >>> - geronimo-jsp_2.0_spec >>> + geronimo-annotation_1.0_spec >>> + test >>> + >>> + >>> + >>> + org.apache.geronimo.specs >>> + geronimo-jsp_2.1_spec >>> + 1.0-SNAPSHOT >>> test >>> >>> >>> @@ -219,6 +194,7 @@ >>> >>> >>> >>> + >>> >>> >>> >>> >>> 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.GerTomcatDocumen >>> t; >>> -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 @@ >>> >>> >>> >>> ->> - 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"> >>> +>> + 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" > >>> >>> >>> >>> @@ -44,11 +45,17 @@ >>> >>> >>> >>> >>> + >>> + >>> + >>> >>> >>> >>> >>> >>> >>> - >>> + >>> + >>> + >>> + >>> >>> >>> >>> >>> @@ -60,6 +67,11 @@ >>> >>> >>> >>> >>> + >>> + >>> + >>> + >>> + >>> >>> >>> >>> >>> >>> @@ -76,16 +88,14 @@ >>> >>> >>> default >>> - >>> - org.apache.catalina.servlets.DefaultServlet >>> - >>> + >> class>org.apache.catalina.servlets.DefaultServlet >>> >>> debug >>> 0 >>> >>> >>> listings >>> - true >>> + false >>> >>> 1 >>> >>> @@ -125,10 +135,20 @@ >>> >>> >>> - >>> - >>> - >>> - >>> + >>> + >>> + >>> + >>> + >>> + >>> >>> + >>> + >>> + >>> + >>> + >>> + >>> + >>> + >>> >>> >>> >>> >>> @@ -141,8 +161,10 @@ >>> >>> >>> >>> >>> - >>> - >>> + >>> + >>> + >>> + >>> >>> >>> >>> >>> @@ -163,13 +185,11 @@ >>> >>> >>> >>> >>> - >>> + >>> >>> >>> >>> >>> >>> >>> - >>> - >>> >>> >>> >>> >>> >>> @@ -193,12 +213,19 @@ >>> >>> >>> >>> >>> + >>> + >>> + >>> + >>> + >>> >>> + >>> + >>> + >>> + >>> + >>> >>> >>> - >>> - >>> - >>> - >>> - >>> + >>> + >>> >>> >>> jsp >>> @@ -219,6 +246,9 @@ >>> >>> >>> >>> + >>> + >>> + >>> >>> >>> >>> >>> @@ -239,6 +269,13 @@ >>> >>> >>> >>> >>> + >>> + >>> + >>> + >>> >>> + >>> + >>> + >>> >>> >>> >>> >>> >>> @@ -279,23 +316,22 @@ >>> >>> >>> >>> >>> - >>> - >>> - >>> - >>> >>> - >>> - >>> - >>> - >>> >>> - >>> - >>> + >>> + >>> + >>> + >>> >>> + >>> + >>> + >>> >>> + >>> + >>> + >>> >>> + >>> + >>> + >>> >>> >>> - >>> - >>> - >>> >>> - >>> - >>> - >>> + >>> + >>> >>> >>> >>> >>> @@ -306,12 +342,8 @@ >>> cgi >>> org.apache.catalina.servlets.CGIServlet>> servlet-class> >>> >>> - clientInputTimeout >>> - 100 >>> - >>> - >>> debug >>> - 6 >>> + 0 >>> >>> >>> cgiPathPrefix >>> @@ -487,7 +519,7 @@ >>> >>> >>> dtd >>> - text/plain >>> + application/xml-dtd >>> >>> >>> dv >>> @@ -610,6 +642,10 @@ >>> application/x-troff-man >>> >>> >>> + mathml >>> + application/mathml+xml >>> + >>> + >>> me >>> application/x-troff-me >>> >>> @@ -682,6 +718,80 @@ >>> application/oda >>> >>> >>> + >>> + odb >>> + application/vnd.oasis.opendocument.database>> mime-type> >>> + >>> + >>> + >>> + odc >>> + application/vnd.oasis.opendocument.chart>> type> >>> + >>> + >>> + >>> + odf >>> + application/vnd.oasis.opendocument.formula>> mime-type> >>> + >>> + >>> + >>> + odg >>> + application/vnd.oasis.opendocument.graphics>> mime-type> >>> + >>> + >>> + >>> + odi >>> + application/vnd.oasis.opendocument.image>> type> >>> + >>> + >>> + >>> + odm >>> + application/vnd.oasis.opendocument.text-master>> mime-type> >>> + >>> + >>> + >>> + odp >>> + application/ >>> vnd.oasis.opendocument.presentation >>> + >>> + >>> + >>> + ods >>> + application/vnd.oasis.opendocument.spreadsheet>> mime-type> >>> + >>> + >>> + >>> + odt >>> + application/vnd.oasis.opendocument.text >>> + >>> + >>> + ogg >>> + application/ogg >>> + >>> + >>> + >>> + otg >>> + application/vnd.oasis.opendocument.graphics- >>> template >>> + >>> + >>> + >>> + oth >>> + application/vnd.oasis.opendocument.text-web>> mime-type> >>> + >>> + >>> + >>> + otp >>> + application/vnd.oasis.opendocument.presentation- >>> template >>> + >>> + >>> + >>> + ots >>> + application/vnd.oasis.opendocument.spreadsheet- >>> template >>> + >>> + >>> + >>> + ott >>> + application/vnd.oasis.opendocument.text- >>> template >>> + >>> + >>> pbm >>> image/x-portable-bitmap >>> >>> @@ -754,6 +864,10 @@ >>> image/x-cmu-raster >>> >>> >>> + rdf >>> + application/rdf+xml >>> + >>> + >>> rgb >>> image/x-rgb >>> >>> @@ -781,6 +895,12 @@ >>> shar >>> application/x-shar >>> >>> + >>> >>> smf >>> audio/x-midi >>> @@ -862,6 +982,10 @@ >>> application/x-ustar >>> >>> >>> + vxml >>> + application/voicexml+xml >>> + >>> + >>> xbm >>> image/x-xbitmap >>> >>> @@ -875,7 +999,7 @@ >>> >>> >>> xml >>> - text/xml >>> + application/xml >>> >>> >>> xpm >>> @@ -883,7 +1007,15 @@ >>> >>> >>> xsl >>> - text/xml >>> + application/xml >>> + >>> + >>> + xslt >>> + application/xslt+xml >>> + >>> + >>> + xul >>> + application/vnd.mozilla.xul+xml >>> >>> >>> xwd >>> @@ -946,7 +1078,18 @@ >>> zip >>> application/zip >>> >>> - >>> + >>> + xls >>> + application/vnd.ms-excel >>> + >>> + >>> + doc >>> + application/vnd.ms-word >>> + >>> + >>> + ppt >>> + application/vnd.ms-powerpoint >>> + >>> >>> >>> >>> >>> 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 @@ >>> + >>> + >>> + >>> +>> + xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" >>> + xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"> >>> + >>> + >>> + >>> + foo >>> + bar >>> + 1 >>> + car >>> + >>> + >>> + >>> + /war6-jee5 >>> + >>> + >>> >>> 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 @@ >>> + >>> + >>> + >>> +>> + 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" > >>> + >>> + war6-jee5 >>> + >>> + Filter1 >>> + org.apache.geronimo.tomcat.app.Filter1>> filter-class> >>> + >>> + attribute1 >>> + value1 >>> + >>> + >>> + >>> + Filter1 >>> + Servlet* >>> + >>> + >>> + Servlet1 >>> + org.apache.geronimo.tomcat.app.Servlet1>> servlet-class> >>> + >>> + >>> + Servlet1 >>> + /path1 >>> + /path2 >>> + >>> + >>> + >>> + http://geronimo.apache.org/jsp/tagliburi1>> taglib-uri> >>> + /WEB-INF/taglib1.tld >>> + >>> + >>> + http://geronimo.apache.org/jsp/tagliburi2>> taglib-uri> >>> + /WEB-INF/taglib2.tld >>> + >>> + >>> + >>> >>> 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 @@ >>> Geronimo :: Tomcat >>> >>> >>> - >>> - >>> - org.apache.geronimo.specs >>> - geronimo-jsp_2.0_spec >>> - provided >>> - >>> >>> >>> org.apache.geronimo.specs >>> - geronimo-j2ee-connector_1.5_spec >>> + geronimo-annotation_1.0_spec >>> provided >>> >>> >>> >>> org.apache.geronimo.specs >>> - geronimo-jta_1.0.1B_spec >>> - provided >>> - >>> - >>> - >>> - org.apache.geronimo.specs >>> - geronimo-j2ee-management_1.1_spec >>> + geronimo-jsp_2.1_spec >>> + 1.0-SNAPSHOT >>> provided >>> >>> >>> @@ -101,120 +90,57 @@ >>> >>> >>> >>> - tomcat >>> + org.apache.tomcat >>> catalina >>> + 6.0.2-beta >>> >>> - >>> - >>> - tomcat >>> - tomcat-ajp >>> - >>> - >>> - >>> - tomcat >>> - catalina-cluster >>> - >>> - >>> - >>> - >>> - tomcat >>> - catalina-optional >>> - >>> - >>> - >>> - tomcat >>> - tomcat-coyote >>> - >>> - >>> - >>> - tomcat >>> - tomcat-http >>> - >>> - >>> - >>> - tomcat >>> - jasper-compiler >>> - >>> - >>> - >>> - tomcat >>> - jasper-compiler-jdt >>> - >>> - >>> - >>> - tomcat >>> - jasper-runtime >>> - >>> - >>> - >>> - tomcat >>> - tomcat-util >>> - >>> - >>> - >>> - tomcat >>> - naming-resources >>> - >>> - >>> - >>> - tomcat >>> - servlets-default >>> - >>> - >>> - >>> - tomcat >>> - servlets-invoker >>> - >>> - >>> - >>> - xerces >>> - xercesImpl >>> - >>> - >>> - >>> - xml-apis >>> - xml-apis >>> - >>> - >>> - >>> - commons-beanutils >>> - commons-beanutils >>> - >>> - >>> - >>> - commons-collections >>> - commons-collections >>> - >>> - >>> + >>> >>> - commons-digester >>> - commons-digester >>> + org.apache.tomcat >>> + jasper >>> + 6.0.2-beta >>> >>> - >>> + >>> >>> - commons-el >>> - commons-el >>> + org.apache.tomcat >>> + jasper-el >>> + 6.0.2-beta >>> >>> >>> >>> - commons-logging >>> - commons-logging >>> + org.apache.tomcat >>> + jasper-jdt >>> + 6.0.2-beta >>> >>> >>> >>> - commons-modeler >>> - commons-modeler >>> + org.apache.tomcat >>> + coyote >>> + 6.0.2-beta >>> >>> - >>> + >>> >>> - regexp >>> - regexp >>> + org.apache.tomcat >>> + juli >>> + 6.0.2-beta >>> >>> >>> >>> + >>> + >>> + >>> + tomcat6-repo >>> + http://people.apache.org/~pmcmahan/maven2 >>> + default >>> + >>> + false >>> + >>> + >>> + true >>> + ignore >>> + >>> + >>> + >>> >>> >>> >>> @@ -222,44 +148,9 @@ >>> org.apache.maven.plugins >>> maven-surefire-plugin >>> >>> - >>> - >>> - java.endorsed.dirs >>> - ${project.build.directory}/ >>> endorsed >>> - >>> - >>> - >>> pertest >>> >>> >>> - >>> - >>> - org.codehaus.mojo >>> - dependency-maven-plugin >>> - >>> - >>> - copy-endorsed-jars >>> - process-test-resources >>> - >>> - copy >>> - >>> - >>> - >>> - >>> - xerces >>> - xercesImpl>> artifactId> >>> - >>> - >>> - xml-apis >>> - xml-apis >>> - >>> - >>> - $ >>> {project.build.directory}/endorsed >>> - >>> - >>> - >>> - >>> - >>> >>> org.apache.maven.plugins >>> maven-antrun-plugin >>> >>> 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.TrackedConne >>> ctionAssociator; >>> @@ -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; >>> >>> >> >> >> > >