Issue Details (XML | Word | Printable)

Key: GERONIMO-4685
Type: Bug Bug
Status: Closed Closed
Resolution: Fixed
Priority: Major Major
Assignee: Kevan Miller
Reporter: David Jencks
Votes: 0
Watchers: 0
Operations

If you were logged in you would be able to see more operations.
Geronimo

Build our own tomcat.

Created: 12/Jun/09 07:28 AM   Updated: 24/Jul/09 07:38 AM
Return to search
Component/s: buildsystem, Tomcat
Affects Version/s: 2.2
Fix Version/s: 2.2
Security Level: public (Regular issues)

Time Tracking:
Not Specified

Resolution Date: 24/Jul/09 07:38 AM


 Description  « Hide
We don't have the patches used to build the tomcat version we distribute, at least I can't interpret diffs of diffs.

Build an archetype that sets up a maven multimodule project to build tomcat.
Use a bash script to svn copy tomcat source into this structure
commit
apply patches
commit
build under our own groupId.

Work started in sandbox djencks/tomcat-archetype.

Note that tomcat jars distributed by tomcat have circular dependencies. So, combine catalina and coyote jars. Split out util for now.

 All   Comments   Work Log   Change History   Subversion Commits      Sort Order: Ascending order - Click to sort in descending order
Repository Revision Date User Message
ASF #784012 Fri Jun 12 07:30:34 UTC 2009 djencks GERONIMO-4685 Include LICENSE and NOTICE files in archetype
Files Changed
ADD /geronimo/sandbox/djencks/tomcat-archetype/trunk/LICENSE
ADD /geronimo/sandbox/djencks/tomcat-archetype/trunk/NOTICE

Repository Revision Date User Message
ASF #784224 Fri Jun 12 18:23:20 UTC 2009 djencks GERONIMO-4685 make a place for builds of other projects
Files Changed
ADD /geronimo/external
ADD /geronimo/external/tags
ADD /geronimo/external/trunk
ADD /geronimo/external/branches

Repository Revision Date User Message
ASF #784225 Fri Jun 12 18:26:56 UTC 2009 djencks GERONIMO-4685 move tomcat-archetype from djencks sandbox
Files Changed
ADD /geronimo/external/trunk/tomcat-archetype (from /geronimo/sandbox/djencks/tomcat-archetype/trunk)
DEL /geronimo/sandbox/djencks/tomcat-archetype/trunk

Repository Revision Date User Message
ASF #784287 Fri Jun 12 21:56:40 UTC 2009 djencks GERONIMO-4685 get resources in right places, couple other tweaks
Files Changed
MODIFY /geronimo/external/trunk/tomcat-archetype/run.sh
MODIFY /geronimo/external/trunk/tomcat-archetype/svn-actions.sh
ADD /geronimo/external/trunk/tomcat-archetype/build-archetype.sh (from /geronimo/external/trunk/tomcat-archetype/build.sh)
ADD /geronimo/external/trunk/tomcat-archetype/mv-resource.sh
MODIFY /geronimo/external/trunk/tomcat-archetype/fixup.sh
DEL /geronimo/external/trunk/tomcat-archetype/build.sh
MODIFY /geronimo/external/trunk/tomcat-archetype/pom.xml

Repository Revision Date User Message
ASF #784288 Fri Jun 12 21:59:44 UTC 2009 djencks GERONIMO-4685 Mavenized tomcat 6.0.18 based on tomcat archetype rev 784287
Files Changed
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/servlets/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources/org/apache/jasper/resources
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/core/RestrictedServlets.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/core/RestrictedServlets.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/http/res
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli-adapters
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/naming/resources/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli/src/main
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/resources/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/session
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/threads/res/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/ha/tcp/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/startup/catalina.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/startup/catalina.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/realm/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-jdt/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/valves/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/authenticator/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/http/res/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/jsse
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/java/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/threads/res/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/threads/res/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/security/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/servlets/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/manager/LocalStrings_de.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/realm/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/startup/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/startup/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache/catalina/tribes/membership
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/resources/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/http/res/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/resources/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/valves/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/core
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/LICENSE
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/ha/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/shared/src/main/java/org/apache/PeriodicEventListener.java (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/PeriodicEventListener.java)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/coyote/http11/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/ha
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/manager/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/util/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/security/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/pom.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/realm/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/jasper/resources/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/connector/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/threads
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/util/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/util/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/startup/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/shared/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/connector/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/shared
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli-extras
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/connector/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/tribes/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/buf/res/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/valves/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/coyote
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/http/res/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/http/res/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli/src/main/java/org/apache/juli (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/juli)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/util/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/java/org/apache
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/security/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/session/LocalStrings_ja.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/util/LocalStrings_ja.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/realm/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/coyote/ajp
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/connector/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/users/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/svn-actions.sh
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/loader/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/shared/src/main
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/connector/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/tribes)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/users/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/coyote/http11
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming/resources/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/core/LocalStrings_ja.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/net
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/net/res/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/coyote (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/coyote)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/util/ServerInfo.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/startup/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/run.sh
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/servlets/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/util
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes/transport/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/session/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache/catalina
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/util/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/naming)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/realm/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/resources/org/apache/el/Messages.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/el/Messages.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/startup/Authenticators.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/startup/Authenticators.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/resources/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/core/RestrictedFilters.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/core/RestrictedFilters.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes/membership/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/loader
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/loader/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/buf/res/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/shared/src/main/java/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming/resources/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/RestrictedServlets.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/shared/src
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/core/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/naming/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/naming/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/jasper/resources/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/startup/catalina.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/resources/org/apache/el
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/startup/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/authenticator/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache/catalina/tribes/transport
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/naming/resources/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/naming/resources/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/valves/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli-extras/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/authenticator
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/tribes
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/res
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/NOTICE
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli/src/main/java/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/realm/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/util/ServerInfo.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/pom.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/startup/LocalStrings_ja.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/coyote/http11/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/loader/LocaStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/util/CharsetMapperDefault.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/resources/LocalStrings_ja.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/ant
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/naming/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/naming/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/valves/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/buf/res/LocalStrings_ja.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming/resources/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/core/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/servlets/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/util/CharsetMapperDefault.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/util/CharsetMapperDefault.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/manager/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/mydos2unix.sh
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/java/org/apache/el/Messages.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/manager/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/valves/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/realm/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/jasper/resources/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/manager
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/security/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/startup/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/naming/resources
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/mv-resource.sh
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/users/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/manager/host/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/coyote/http11/LocalStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/resources/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli/src
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/buf/res/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/users/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/users/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/manager/host/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/manager/host/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/coyote
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/coyote/ajp/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/servlets/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/naming/resources/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/manager/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/jasper/resources/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/resources
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/coyote/ajp/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/coyote/ajp/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/naming
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/authenticator/LocalStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/users/LocalStrings_ja.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/coyote/http11/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util/net/res/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/security/LocalStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/servlets/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/util/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/http/res/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/fixup.sh
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/connector/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/session/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/build-archetype.sh
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/buf/res/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources/org/apache
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/shared/src/main/java/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/users/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/users
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/manager/host
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/threads/res
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/servlets
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/loader/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli-adapters/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/naming/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/naming/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/http
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/shared/src/main/java/org/apache/AnnotationProcessor.java (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/AnnotationProcessor.java)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_de.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/manager/LocalStrings_de.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util/net (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/net)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/loader/LocaStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/loader/LocaStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/authenticator/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/startup/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/valves
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache/catalina/tribes/transport/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/tribes/transport/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/buf/res/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/authenticator/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/util/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/security/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/security/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/security/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/startup/Authenticators.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/java/org/apache/el (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/el)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/loader/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/ha)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/RestrictedFilters.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/naming/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/naming/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/realm/LocalStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/loader/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/coyote/http11/LocalStrings_ja.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/connector/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/buf
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/authenticator/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/jasper)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/connector
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-jdt
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache/catalina/tribes
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/connector/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/servlets/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/session/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/session/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/buf/res
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/manager/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat/util
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/valves/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/http/res/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/http/res/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/session/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/util/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/loader/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming/factory/webservices
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/manager/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/users/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/session/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/ha/session/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/coyote/http11/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/coyote/http11/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/shared/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/servlets/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/juli/src/main/java/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/coyote/pom.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming/resources/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/core/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/startup
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/session/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/naming/resources/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/security
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/session/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/manager/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/jk (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/jk)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/valves/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming/LocalStrings_ja.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources/org/apache/jasper
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/realm
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache/catalina/tribes/membership/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/tribes/membership/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/catalina/users/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/manager/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/session
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/coyote/http11/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/tomcat
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/jni (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_18/java/org/apache/tomcat/jni)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/authenticator/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/security/LocalStrings_ja.properties

Repository Revision Date User Message
ASF #784303 Fri Jun 12 22:47:32 UTC 2009 djencks GERONIMO-4685 Apply last good patch, TOMCAT_6_0_16-G652117.patch, r660592 Merged from my sandbox copy r783555
Files Changed
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/runtime/InstanceManagerFactory.java (from /geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/runtime/InstanceManagerFactory.java)
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/JspCompilationContext.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/compiler/Generator.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/runtime/TagHandlerPool.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/shared/src/main/java/org/apache/PeriodicEventListener.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/Constants.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/deploy/Injectable.java (from /geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/deploy/Injectable.java)
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/coyote
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/util/DefaultAnnotationProcessor.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/StandardWrapper.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/deploy/MessageDestinationRef.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/startup/WebRuleSet.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/DefaultInstanceManager.java (from /geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/DefaultInstanceManager.java)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/deploy/InjectionTarget.java (from /geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/deploy/InjectionTarget.java)
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/jasper-el/src/main/java/org/apache/el
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/servlets/WebdavServlet.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/jk
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/shared/src/main/java/org/apache/InstanceManager.java (from /geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/shared/src/main/java/org/apache/InstanceManager.java)
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/ApplicationFilterConfig.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/naming
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/servlet/JspServletWrapper.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/startup/ConnectorCreateRule.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/runtime/AnnotationHelper.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/juli/src/main/java/org/apache/juli
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/deploy/ContextEnvironment.java
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/shared/src/main/java/org/apache/AnnotationProcessor.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/util/net
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/tomcat/jni
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/StandardContext.java
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/deploy/ResourceBase.java

Repository Revision Date User Message
ASF #784304 Fri Jun 12 22:52:29 UTC 2009 djencks GERONIMO-4685 Apply usable portion of TOMCAT_6_0_18-G678601.patch
Files Changed
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/DefaultInstanceManager.java

Repository Revision Date User Message
ASF #784518 Sun Jun 14 07:40:05 UTC 2009 djencks GERONIMO-4684, GERONIMO-4685 Use our tomcat build, configure tomcat using server.xml. Also includes some spec jar updates including using our jaxb spec jar
Files Changed
MODIFY /geronimo/server/trunk/framework/configs/online-deployer/pom.xml
MODIFY /geronimo/server/trunk/plugins/client/client/pom.xml
MODIFY /geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/plugins/clustering/clustering/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ExecutorType.java
MODIFY /geronimo/server/trunk/plugins/cxf/pom.xml
MODIFY /geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/framework/configs/jee-specs/pom.xml
MODIFY /geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
MODIFY /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/pom.xml
MODIFY /geronimo/server/trunk/repository/pom.xml
MODIFY /geronimo/server/trunk/plugins/jetty/jetty6-deployer/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
MODIFY /geronimo/server/trunk/plugins/tomcat/tomcat6-deployer/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/plugins/jasper/pom.xml
MODIFY /geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-builder-wadi/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/RealmType.java
MODIFY /geronimo/server/trunk/plugins/jetty/jetty6/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java
MODIFY /geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-2/pom.xml
MODIFY /geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml
MODIFY /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/GeronimoStandardContext.java
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceEnvRefType.java
MODIFY /geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/plugins/axis2/pom.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ResourceType.java
MODIFY /geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/NamingResourcesType.java
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatServerGBean.java
MODIFY /geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model
MODIFY /geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/EngineType.java
MODIFY /geronimo/server/trunk/plugins/clustering/farming/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
MODIFY /geronimo/server/trunk/plugins/clustering/pom.xml
MODIFY /geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ValveType.java
MODIFY /geronimo/server/trunk/plugins/clustering/geronimo-clustering-wadi/pom.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ContextType.java
MODIFY /geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system/pom.xml
MODIFY /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
MODIFY /geronimo/server/trunk/framework/modules/geronimo-security/pom.xml
MODIFY /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatContainer.java
MODIFY /geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/TomcatServerGBeanTest.java
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ListenerType.java
MODIFY /geronimo/server/trunk/plugins/jasper/jasper/pom.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/LocalEjbType.java
MODIFY /geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/EjbType.java
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd
MODIFY /geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/server-1.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/HostType.java
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ClusterType.java
MODIFY /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
MODIFY /geronimo/server/trunk/framework/configs/jsr88-cli/pom.xml
MODIFY /geronimo/server/trunk/plugins/jetty/jetty6-clustering-builder-wadi/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/xsd/server.xsd
MODIFY /geronimo/server/trunk/plugins/tomcat/pom.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServerType.java
MODIFY /geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/EnvironmentType.java
MODIFY /geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceRefType.java
MODIFY /geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/plugins/monitoring/agent-jar/pom.xml
MODIFY /geronimo/server/trunk/plugins/jetty/jetty6-clustering-wadi/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml
MODIFY /geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
MODIFY /geronimo/server/trunk/framework/configs/client-system/pom.xml
MODIFY /geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/TransactionType.java
MODIFY /geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
DEL /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatGeronimoEmbedded.java
MODIFY /geronimo/server/trunk/pom.xml
MODIFY /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ServiceType.java
MODIFY /geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml
MODIFY /geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
ADD /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ObjectFactory.java

Repository Revision Date User Message
ASF #784659 Mon Jun 15 05:59:17 UTC 2009 djencks GERONIMO-4685 fix (I hope) some dependencies issues Ivan found
Files Changed
MODIFY /geronimo/external/trunk/tomcat-parent-6.0.18/pom.xml
MODIFY /geronimo/external/trunk/tomcat-archetype/pom.xml

Repository Revision Date User Message
ASF #784660 Mon Jun 15 06:02:44 UTC 2009 djencks GERONIMO-4685 fix another dependencies issue Ivan found
Files Changed
MODIFY /geronimo/external/trunk/tomcat-archetype/pom.xml

[ Permlink | « Hide ]
Donald Woods added a comment - 17/Jun/09 01:35 PM
We also need to upgrade to Tomcat 6.0.20, which includes 5 new security fixes.

Repository Revision Date User Message
ASF #786691 Fri Jun 19 22:11:07 UTC 2009 djencks GERONIMO-4685 move the mbean descriptor files to resources by hand -- archetype script changed in a separate commit
Files Changed
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/valves/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/valves/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/jk/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/modeler
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/servlet/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/deploy
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/realm/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/connector/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/mbeans/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/mbeans/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/jk/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/jk/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/loader/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/loader/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/realm/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/realm/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/mbeans
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache/catalina/tribes/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/deploy/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/session/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/session/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/connector/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/connector/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/startup/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources/org/apache/jasper/servlet/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/java/org/apache/jasper/servlet/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/session/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/jasper/src/main/resources/org/apache/jasper/servlet
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/startup/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/startup/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/authenticator
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/deploy/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache/catalina/tribes/membership/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/deploy
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/session/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/session/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/valves/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/users/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/authenticator/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/authenticator/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/core/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/jk
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd (from /geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/resources/org/apache/catalina/tribes/transport/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes/transport/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/mbeans/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/users/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/users/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/tribes/src/main/java/org/apache/catalina/tribes/transport/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/resources/org/apache/catalina/ha/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina-ha/src/main/java/org/apache/catalina/ha/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/resources/org/apache/catalina/deploy/mbeans-descriptors.xml (from /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/deploy/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.18/catalina/src/main/java/org/apache/catalina/loader/mbeans-descriptors.xml

Repository Revision Date User Message
ASF #786692 Fri Jun 19 22:12:19 UTC 2009 djencks GERONIMO-4685 Have scripts move the mbean descriptor files to resources. Comment out a couple jars we aren't building in dependencyManagement
Files Changed
MODIFY /geronimo/external/trunk/tomcat-archetype/svn-actions.sh
MODIFY /geronimo/external/trunk/tomcat-archetype/pom.xml

Kevan Miller made changes - 23/Jun/09 12:03 PM
Field Original Value New Value
Assignee David Jencks [ djencks ] Kevan Miller [ kevan ]
Repository Revision Date User Message
ASF #789215 Mon Jun 29 05:36:43 UTC 2009 kevan GERONIMO-4685 Initial commit for 6.0.20 -- does not include patches
Files Changed
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/resources/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_de.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/manager/LocalStrings_de.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/servlets/LocalStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/manager/LocalStrings_de.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/startup/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/startup/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/buf/res/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/http
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/http/res/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/deploy/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/deploy/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/realm/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/ha/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/mv-resource.sh
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/core/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/loader/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/users/LocalStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/realm/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/realm/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/session/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/ha/session/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/connector/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/connector/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/ha
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/manager
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/naming/resources
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/src/main
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/jk (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/jk)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/naming/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/buf
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/startup/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/startup/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/servlets/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/security/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/users
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/buf/res/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/core/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/shared/src
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/juli-adapters/pom.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/core/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org/apache/catalina/tribes/membership
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/src/main/resources/org/apache/el
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/startup/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/session/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/valves/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/net
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/modeler
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/session/LocalStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/security/LocalStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/coyote/http11/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/users/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/src/main/java/org/apache/el/Messages.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/coyote (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/coyote)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/net/res
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/threads
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/security/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/security/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/authenticator/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/manager/host/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/util/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/ha)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/naming/resources/LocalStrings_ja.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/naming/resources/LocalStrings_ja.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/buf/res/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/net
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/ha/tcp/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/util/ServerInfo.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/shared
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/valves/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/core/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/naming (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/naming)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/src/main/java/org/apache/el (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/el)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/loader/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/session/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org/apache/catalina
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/coyote
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/naming/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/src/main/resources
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/realm/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/shared/src/main/java/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/naming/resources/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/coyote/ajp/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/users/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/users/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes/transport/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/authenticator/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/naming/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/naming/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/resources/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/util/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core/RestrictedServlets.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/core/RestrictedServlets.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/coyote/ajp/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/coyote/ajp/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/naming/resources/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/juli
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/core/RestrictedServlets.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/authenticator/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/users/LocalStrings_ja.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/naming/resources/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/jasper/resources/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/valves/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/valves/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/servlets/LocalStrings_ja.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/connector/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/session/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/ha/session/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-jdt/pom.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/coyote/http11/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/run.sh
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/shared/src/main
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/security/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/tribes)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/naming/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/core/LocalStrings_ja.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/authenticator
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org/apache/catalina/tribes/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/tribes/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/shared/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/connector/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/startup/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/threads/res/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/threads/res/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/authenticator/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/startup/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/manager/host
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java/org/apache/jasper/resources/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/juli/src/main/java/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org/apache/catalina/tribes/membership/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/servlets/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/users/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/loader
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/resources/org/apache/jasper/servlet
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/startup/LocalStrings_ja.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/startup/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/connector/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/servlets/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/authenticator/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/realm
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/loader/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/startup/catalina.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res
MODIFY /geronimo/external/trunk/tomcat-archetype/run.sh
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/core/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/users/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/src/main/resources/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/coyote/ajp
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/connector/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/shared/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/manager/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/jk/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/jk/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/manager/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/coyote/http11
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/mydos2unix.sh
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/resources/org/apache/jasper/resources
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/realm/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/NOTICE
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/servlets/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/naming/resources/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/naming/resources/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/coyote/pom.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/startup/Authenticators.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/startup/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/threads/res/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/src/main/java
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/startup/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/juli/src
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/core/RestrictedFilters.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/security/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/deploy/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/http/res/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/startup
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/threads/res
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/realm/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/session/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/loader/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/users/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/users/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes/transport/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/users/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/http/res/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/http/res/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/coyote
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/src
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/juli/src/main/java/org/apache/juli (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/juli)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-el/src/main/java/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/coyote/http11/LocalStrings_fr.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/valves/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/connector
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/core/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/session/LocalStrings_ja.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/mbeans/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/session/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/startup/Authenticators.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/startup/Authenticators.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/security/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/core/RestrictedFilters.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/core/RestrictedFilters.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org/apache/catalina/tribes/membership/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/tribes/membership/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/CharsetMapperDefault.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/session
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/naming/factory/webservices
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/security/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/modeler/mbeans-descriptors.dtd)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/naming
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/jk/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/net/res/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/net/res/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/fixup.sh
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/loader/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/mbeans
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/http/res
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/jasper/resources/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/valves/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/session/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/valves/LocalStrings_es.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/session/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/tribes
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/manager/host/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/security/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/resources/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/servlets
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/realm/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper-jdt
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/README.txt
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes/membership/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/core/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/ha/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/naming/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/naming/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_fr.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/loader/LocalStrings_fr.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/shared/src/main/java/org/apache/AnnotationProcessor.java (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/AnnotationProcessor.java)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/jni (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/jni)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/valves/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/users/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/authenticator/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org/apache/catalina/tribes/transport/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util/CharsetMapperDefault.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/util/CharsetMapperDefault.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/jk
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/valves/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/session/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/ha/session/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/LICENSE
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/coyote/http11/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes/mbeans-descriptors.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/java/org/apache/catalina/tribes/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/tribes/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/juli-extras/pom.xml
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/session/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/naming/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/naming/LocalStrings_es.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/loader/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/loader/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/resources/org/apache/jasper/servlet/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/jasper/servlet/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/util/ServerInfo.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/manager/host/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/manager/host/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_es.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/authenticator/LocalStrings_es.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/coyote/ajp/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/deploy/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/pom.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/buf/res/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/shared/src/main/java/org/apache
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/manager/LocalStrings.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/coyote/http11/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/authenticator
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper/src/main/resources/org/apache/jasper
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/resources/org/apache/catalina/ha/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/ha/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/jasper
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/valves
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_ja.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/manager/LocalStrings_ja.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org/apache/catalina/tribes/transport/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/tribes/transport/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/manager/LocalStrings_ja.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/deploy
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/juli/src/main/java
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/svn-actions.sh
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/tribes/src/main/resources/org/apache/catalina/tribes/transport/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/tribes/transport/mbeans-descriptors.xml)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/catalina/core/LocalStrings_fr.properties
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache/catalina/ha/LocalStrings_es.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/coyote/http11/LocalStrings.properties)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/mbeans/mbeans-descriptors.xml (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/mbeans/mbeans-descriptors.xml)
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/util/LocalStrings.properties (from /tomcat/tc6.0.x/tags/TOMCAT_6_0_20/java/org/apache/catalina/util/LocalStrings.properties)
DEL /geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/http/res/LocalStrings.properties
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/catalina/security
ADD /geronimo/external/trunk/tomcat-parent-6.0.20/catalina-ha/src/main/java/org/apache