Return-Path: 
 <scm-return-41094-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 87846 invoked from network); 31 Mar 2010 02:03:30 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 31 Mar 2010 02:03:30 -0000
Received: (qmail 8247 invoked by uid 500); 31 Mar 2010 02:03:30 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 8211 invoked by uid 500); 31 Mar 2010 02:03:30 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 8204 invoked by uid 99); 31 Mar 2010 02:03:30 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 02:03:30 +0000
X-ASF-Spam-Status: No, hits=-1136.3 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 02:03:24 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A6AB72388A6B; Wed, 31 Mar 2010 02:03:04 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r929363 [2/4] - in
 /geronimo/external/trunk/tomcat-parent-7.0.0:
 ./ catalina-ha/ catalina-ha/src/ catalina-ha/src/main/
 catalina-ha/src/main/java/ catalina-ha/src/main/java/org/
 catalina-ha/src/main/java/org/apache/ catalina-ha/src/main/jav...
Date: Wed, 31 Mar 2010 02:03:02 -0000
To: scm@geronimo.apache.org
From: xuhaihong@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100331020304.A6AB72388A6B@eris.apache.org>

Added: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/pom.xml?rev=929363&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/pom.xml (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/pom.xml Wed Mar 31 02:02:53 2010
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+--><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.ext.tomcat</groupId>
+        <artifactId>tomcat-parent-7.0.0</artifactId>
+        <version>7.0.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>catalina-ha</artifactId>
+    <packaging>bundle</packaging>
+
+    <name>Apache Geronimo Tomcat fork: Catalina-ha</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>juli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>tribes</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>catalina</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions></instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/java/org/apache/catalina/ha/
------------------------------------------------------------------------------
    svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/deploy/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/deploy/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/session/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/session/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/session/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/session/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/session/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/session/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/session/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/session/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/session/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/src/main/resources/org/apache/catalina/ha/tcp/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/mbeans-descriptors.xml:742915

Added: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml?rev=929363&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml Wed Mar 31 02:02:53 2010
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+--><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.geronimo.ext.tomcat</groupId>
+        <artifactId>tomcat-parent-7.0.0</artifactId>
+        <version>7.0.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>catalina</artifactId>
+    <packaging>bundle</packaging>
+
+    <name>Apache Geronimo Tomcat fork: Catalina</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>juli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>shared</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>                        
+                        <Import-Package>javax.servlet.resources,javax.servlet.jsp.resources,*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/
------------------------------------------------------------------------------
    svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/catalina:742915

Modified: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/loader/WebappClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/loader/WebappClassLoader.java?rev=929363&r1=929356&r2=929363&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/loader/WebappClassLoader.java (original)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/catalina/loader/WebappClassLoader.java Wed Mar 31 02:02:53 2010
@@ -70,7 +70,6 @@ import org.apache.catalina.LifecycleExce
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.LifecycleState;
 import org.apache.tomcat.util.res.StringManager;
-import org.apache.jasper.servlet.JasperLoader;
 import org.apache.naming.JndiPermission;
 import org.apache.naming.resources.ProxyDirContext;
 import org.apache.naming.resources.Resource;

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/coyote/
------------------------------------------------------------------------------
    svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/coyote:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/naming/
------------------------------------------------------------------------------
    svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/naming:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/tomcat/jni/
------------------------------------------------------------------------------
    svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/java/org/apache/tomcat/util/net/
------------------------------------------------------------------------------
    svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/authenticator/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/authenticator/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/connector/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/RestrictedFilters.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/RestrictedFilters.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/RestrictedFilters.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/RestrictedFilters.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/RestrictedListeners.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/RestrictedListeners.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/RestrictedListeners.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/RestrictedListeners.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/RestrictedServlets.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/RestrictedServlets.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/RestrictedServlets.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/RestrictedServlets.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/core/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/deploy/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/deploy/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/deploy/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/deploy/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/deploy/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/deploy/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/deploy/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/filters/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/filters/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/filters/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/filters/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/filters/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/filters/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/filters/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/filters/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/filters/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/filters/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/filters/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/filters/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/loader/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_de.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_de.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/host/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/host/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/host/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/host/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/host/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/manager/host/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/host/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/mbeans/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/mbeans/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/realm/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/security/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/security/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/servlets/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/session/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/Authenticators.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/Authenticators.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/Authenticators.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Authenticators.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/catalina.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/catalina.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/catalina.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/catalina.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/startup/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/mbeans-descriptors.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/users/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/users/mbeans-descriptors.xml:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/CharsetMapperDefault.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/CharsetMapperDefault.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/CharsetMapperDefault.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/CharsetMapperDefault.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/LocalStrings_es.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_fr.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/LocalStrings_fr.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_ja.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/LocalStrings_ja.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/ServerInfo.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings.properties:742915

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Mar 31 02:02:53 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_es.properties:742915