You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/04/23 04:55:03 UTC
svn commit: r937142 [3/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...
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/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/valves/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_fr.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/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/valves/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/LocalStrings_ja.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/mbeans-descriptors.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/catalina/valves/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/valves/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/ajp/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/ajp/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/ajp/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/ajp/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/ajp/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/ajp/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_fr.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/coyote/http11/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/LocalStrings_ja.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings_fr.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/naming/LocalStrings_ja.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings_fr.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/naming/resources/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/LocalStrings_ja.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_fr.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings_ja.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_fr.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/catalina/src/main/resources/org/apache/tomcat/util/net/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/res/LocalStrings_ja.properties:742915
Added: geronimo/external/trunk/tomcat-parent-7.0.0/fixup.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/fixup.sh?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/fixup.sh (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/fixup.sh Fri Apr 23 02:54:54 2010
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# 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.
+
+
+
+chmod u+x mydos2unix.sh
+chmod u+x svn-actions.sh
+chmod u+x mv-resource.sh
+
+# fix line endings and add empty directories
+
+find . -name pom.xml |xargs -n1 ./mydos2unix.sh
+#sed -i bak 's/\\r//g'
+
+mkdir -p shared/src/main/java/org/apache/
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/fixup.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/fixup.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/fixup.sh
------------------------------------------------------------------------------
svn:keywords = Date Revision
Added: geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/pom.xml?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/pom.xml (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/pom.xml Fri Apr 23 02:54:54 2010
@@ -0,0 +1,49 @@
+<?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>jasper-el</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Geronimo Tomcat fork: Jasper-el</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</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/jasper-el/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/src/main/java/org/apache/el/
------------------------------------------------------------------------------
svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/el:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/src/main/resources/org/apache/el/Messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/src/main/resources/org/apache/el/Messages.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/src/main/resources/org/apache/el/Messages.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/el/Messages.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/src/main/resources/org/apache/el/Messages_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/src/main/resources/org/apache/el/Messages_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/src/main/resources/org/apache/el/Messages_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/el/Messages_es.properties:742915
Added: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml Fri Apr 23 02:54:54 2010
@@ -0,0 +1,89 @@
+<?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>jasper</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Geronimo Tomcat fork: Jasper</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
+ </dependency>
+ <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>shared</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.ext.tomcat</groupId>-->
+ <!--<artifactId>catalina</artifactId>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.ext.tomcat</groupId>-->
+ <!--<artifactId>jasper-jdt</artifactId>-->
+ <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>jasper-el</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></instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/java/org/apache/jasper/
------------------------------------------------------------------------------
svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/jasper:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/resources/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/servlet/mbeans-descriptors.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/servlet/mbeans-descriptors.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/jasper/src/main/resources/org/apache/jasper/servlet/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/jasper/servlet/mbeans-descriptors.xml:742915
Added: geronimo/external/trunk/tomcat-parent-7.0.0/juli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/juli/pom.xml?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/juli/pom.xml (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/juli/pom.xml Fri Apr 23 02:54:54 2010
@@ -0,0 +1,42 @@
+<?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>juli</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Geronimo Tomcat fork: Juli</name>
+ <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/juli/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/juli/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/juli/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/juli/src/main/java/org/apache/juli/
------------------------------------------------------------------------------
svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/juli:742915
Added: geronimo/external/trunk/tomcat-parent-7.0.0/mv-resource.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/mv-resource.sh?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/mv-resource.sh (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/mv-resource.sh Fri Apr 23 02:54:54 2010
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# 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.
+
+
+# script to svn mv properties files from src/main/java to src/main/resources
+
+SRC=$1
+TARGET=`echo $SRC | sed s/java/resources/`
+
+svn mv --parents $SRC $TARGET
+
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/mv-resource.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/mv-resource.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/mv-resource.sh
------------------------------------------------------------------------------
svn:keywords = Date Revision
Added: geronimo/external/trunk/tomcat-parent-7.0.0/mydos2unix.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/mydos2unix.sh?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/mydos2unix.sh (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/mydos2unix.sh Fri Apr 23 02:54:54 2010
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# 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.
+
+
+echo processing $1
+tr -d \\r <$1 > $1bak
+mv $1bak $1
+echo processed $1
\ No newline at end of file
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/mydos2unix.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/mydos2unix.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/mydos2unix.sh
------------------------------------------------------------------------------
svn:keywords = Date Revision
Added: geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml Fri Apr 23 02:54:54 2010
@@ -0,0 +1,192 @@
+<?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.genesis</groupId>
+ <artifactId>genesis-java5-flava</artifactId>
+ <version>2.0</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>tomcat-parent-7.0.0</artifactId>
+ <version>7.0.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Apache Geronimo Tomcat fork</name>
+ <description>Mavenized tomcat build</description>
+
+ <!-- instructions:
+ ./build-archetype.sh
+
+ To use archetype, if installed only locally,
+mvn archetype:generate -DarchetypeCatalog=local
+
+ -->
+
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-archetype/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-archetype/</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/geronimo/external/trunk/tomcat-archetype/</url>
+ </scm>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.2_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ <version>3.3.0-v_771</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>resources</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>filesystem</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.team</groupId>
+ <artifactId>core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+ <!-- internal -->
+
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>7.0.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>catalina-ha</artifactId>
+ <version>7.0.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ <version>7.0.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>jasper-el</artifactId>
+ <version>7.0.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>7.0.0.0-SNAPSHOT</version>
+ </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.ext.tomcat</groupId>-->
+ <!--<artifactId>juli-adapters</artifactId>-->
+ <!--<version>7.0.0.0-SNAPSHOT</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>org.apache.geronimo.ext.tomcat</groupId>-->
+ <!--<artifactId>juli-extras</artifactId>-->
+ <!--<version>7.0.0.0-SNAPSHOT</version>-->
+ <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>shared</artifactId>
+ <version>7.0.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>tribes</artifactId>
+ <version>7.0.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>util</artifactId>
+ <version>7.0.0.0-SNAPSHOT</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+ <modules>
+ <module>shared</module>
+ <module>juli</module>
+ <module>catalina</module>
+ <module>tribes</module>
+ <module>util</module>
+ <module>catalina-ha</module>
+ <module>jasper</module>
+ <module>jasper-el</module>
+ </modules>
+</project>
\ No newline at end of file
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/external/trunk/tomcat-parent-7.0.0/rm-archetype-goo.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/rm-archetype-goo.sh?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/rm-archetype-goo.sh (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/rm-archetype-goo.sh Fri Apr 23 02:54:54 2010
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# 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.
+
+# run after you have got all the other steps to work, to remove the scripts that did the work.
+# please don't run this in the archetype project itself
+
+svn rm build-archetype.sh fixup.sh mv-resource.sh mydos2unix.sh README.txt run.sh svn-actions.sh rm-archetype-goo.sh
\ No newline at end of file
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/rm-archetype-goo.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/rm-archetype-goo.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/rm-archetype-goo.sh
------------------------------------------------------------------------------
svn:keywords = Date Revision
Added: geronimo/external/trunk/tomcat-parent-7.0.0/run.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/run.sh?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/run.sh (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/run.sh Fri Apr 23 02:54:54 2010
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# 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.
+
+
+# Included as an example of how to set up a project. Works in *nix environments
+# Update TVER and TTAGVER with the Tomcat version number in appropriate format
+TVER=7.0.0
+#export TTAGVER=6_0_20
+
+GVER=${TVER}.0-SNAPSHOT
+
+svn rm --force tomcat-parent-${TVER}
+rm -rf tomcat-parent-${TVER}/
+mvn archetype:generate\
+ -DarchetypeCatalog=local\
+ -DinteractiveMode=false\
+ -DarchetypeGroupId=org.apache.geronimo.ext.tomcat\
+ -DarchetypeArtifactId=tomcat-parent-archetype\
+ -DarchetypeVersion=1.0-SNAPSHOT\
+ -DgroupId=org.apache.geronimo.ext.tomcat\
+ -DartifactId=tomcat-parent-${TVER}\
+ -Dversion=${GVER}\
+ -Dpackage=org.apache
+
+cd tomcat-parent-${TVER}
+chmod u+x fixup.sh
+./fixup.sh
+cd ..
+svn add tomcat-parent-${TVER}
+cd tomcat-parent-${TVER}
+
+svn status
+
+./svn-actions.sh
+
+mvn clean install
+
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/run.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/run.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/run.sh
------------------------------------------------------------------------------
svn:keywords = Date Revision
Added: geronimo/external/trunk/tomcat-parent-7.0.0/shared/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/shared/pom.xml?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/shared/pom.xml (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/shared/pom.xml Fri Apr 23 02:54:54 2010
@@ -0,0 +1,49 @@
+<?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>shared</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Geronimo Tomcat fork: Shared</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</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/shared/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/shared/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/shared/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/main/java/org/apache/tomcat/JarScanner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/main/java/org/apache/tomcat/JarScanner.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/main/java/org/apache/tomcat/JarScanner.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/JarScanner.java:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/main/java/org/apache/tomcat/JarScannerCallback.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/main/java/org/apache/tomcat/JarScannerCallback.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/main/java/org/apache/tomcat/JarScannerCallback.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java:742915
Added: geronimo/external/trunk/tomcat-parent-7.0.0/svn-actions.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/svn-actions.sh?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/svn-actions.sh (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/svn-actions.sh Fri Apr 23 02:54:54 2010
@@ -0,0 +1,101 @@
+#!/bin/sh
+#
+# 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.
+
+
+# Script to copy the tomcat source to the appropriate places in the mavenized project
+# Run after running the tomcat archetype.
+# Typically run from run.sh
+
+# Figure out if the framework is already in svn
+if [ -d .svn ]
+then
+ #yes, use svn copy to preserve history
+ SVN_CMD="svn cp --parents"
+ RM="svn rm"
+else
+ #no, use svn export to avoid polluting with svn crud
+ SVN_CMD="svn export"
+ RM="rm -rf"
+fi
+
+TOMCAT_BASE="https://svn.apache.org/repos/asf/tomcat/trunk"
+
+TOMCAT=$TOMCAT_BASE
+
+#catalina
+$SVN_CMD $TOMCAT/java/org/apache/catalina/ catalina/src/main/java/org/apache/catalina
+$SVN_CMD $TOMCAT/java/org/apache/naming/ catalina/src/main/java/org/apache/naming
+$RM catalina/src/main/java/org/apache/catalina/ant
+$RM catalina/src/main/java/org/apache/catalina/cluster
+$RM catalina/src/main/java/org/apache/catalina/ha
+$RM catalina/src/main/java/org/apache/catalina/tribes
+# does not exist?
+$RM catalina/src/main/java/org/apache/catalina/launcher
+# does not exist?
+$RM catalina/src/main/java/org/apache/catalina/storeconfig
+$RM catalina/src/main/java/org/apache/naming/factory/webservices
+#formerly coyote jar
+$SVN_CMD $TOMCAT/java/org/apache/coyote/ catalina/src/main/java/org/apache/coyote
+$SVN_CMD $TOMCAT/java/org/apache/tomcat/jni/ catalina/src/main/java/org/apache/tomcat/jni
+$SVN_CMD $TOMCAT/java/org/apache/jk/ catalina/src/main/java/org/apache/jk
+$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/net/ catalina/src/main/java/org/apache/tomcat/util/net
+
+#catalina-ha
+$SVN_CMD $TOMCAT/java/org/apache/catalina/ha/ catalina-ha/src/main/java/org/apache/catalina/ha
+
+#coyote
+#$SVN_CMD $TOMCAT/java/org/apache/coyote/ coyote/src/main/java/org/apache/coyote
+#$SVN_CMD $TOMCAT/java/org/apache/tomcat/jni/ coyote/src/main/java/org/apache/tomcat/jni
+#$SVN_CMD $TOMCAT/java/org/apache/jk/ coyote/src/main/java/org/apache/jk
+#$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/net/ coyote/src/main/java/org/apache/tomcat/util/net
+
+#jasper
+$SVN_CMD $TOMCAT/java/org/apache/jasper/ jasper/src/main/java/org/apache/jasper
+
+#jasper-el
+$SVN_CMD $TOMCAT/java/org/apache/el/ jasper-el/src/main/java/org/apache/el
+
+#jasper-jdt appears to be a shade
+
+#juli
+$SVN_CMD $TOMCAT/java/org/apache/juli/ juli/src/main/java/org/apache/juli
+
+
+
+#shared
+if [ -d .svn ]
+then
+ $SVN_CMD $TOMCAT/java/org/apache/tomcat/InstanceManager.java shared/src/main/java/org/apache/tomcat/InstanceManager.java
+ $SVN_CMD $TOMCAT/java/org/apache/tomcat/JarScanner.java shared/src/main/java/org/apache/tomcat
+ $SVN_CMD $TOMCAT/java/org/apache/tomcat/JarScannerCallback.java shared/src/main/java/org/apache/tomcat
+ $SVN_CMD $TOMCAT/java/org/apache/tomcat/PeriodicEventListener.java shared/src/main/java/org/apache/tomcat
+else
+ $SVN_CMD -N $TOMCAT/java/org/apache/ shared/src/main/java/org/apache
+fi
+
+#tribes
+$SVN_CMD $TOMCAT/java/org/apache/catalina/tribes/ tribes/src/main/java/org/apache/catalina/tribes
+
+#util
+$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/ util/src/main/java/org/apache/tomcat/util
+$RM util/src/main/java/org/apache/tomcat/util/net
+
+# move the properties files to src/main/resourcs
+find . -name *.properties |xargs -n1 ./mv-resource.sh
+
+# move the mbean descriptor xml files to src/main/resourcs
+find . -name mbeans-descriptors.??? |xargs -n1 ./mv-resource.sh
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/svn-actions.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/svn-actions.sh
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/svn-actions.sh
------------------------------------------------------------------------------
svn:keywords = Date Revision
Added: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml Fri Apr 23 02:54:54 2010
@@ -0,0 +1,49 @@
+<?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>tribes</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Geronimo Tomcat fork: Tribes</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.ext.tomcat</groupId>
+ <artifactId>juli</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/tribes/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/java/org/apache/catalina/tribes/
------------------------------------------------------------------------------
svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/LocalStrings_fr.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/mbeans-descriptors.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/mbeans-descriptors.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/mbeans-descriptors.xml:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/membership/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/membership/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/membership/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/membership/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/membership/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/membership/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/membership/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/membership/mbeans-descriptors.xml:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/transport/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/transport/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/transport/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/transport/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/transport/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/transport/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/transport/mbeans-descriptors.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/transport/mbeans-descriptors.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/tribes/src/main/resources/org/apache/catalina/tribes/transport/mbeans-descriptors.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/mbeans-descriptors.xml:742915
Added: geronimo/external/trunk/tomcat-parent-7.0.0/util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/util/pom.xml?rev=937142&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/util/pom.xml (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/util/pom.xml Fri Apr 23 02:54:54 2010
@@ -0,0 +1,58 @@
+<?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.
+--><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>util</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Geronimo Tomcat fork: Util</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>shared</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/util/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/java/org/apache/tomcat/util/
------------------------------------------------------------------------------
svn:mergeinfo = /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/res/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_es.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_es.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/res/LocalStrings_es.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/res/LocalStrings_fr.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/buf/res/LocalStrings_ja.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/res/LocalStrings_ja.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/http/mapper/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/http/mapper/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/mapper/LocalStrings.properties:742915
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/http/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/http/res/LocalStrings.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: geronimo/external/trunk/tomcat-parent-7.0.0/util/src/main/resources/org/apache/tomcat/util/http/res/LocalStrings.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr 23 02:54:54 2010
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/http/res/LocalStrings.properties:742915