geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r898668 - in /geronimo/external/trunk/tomcat-parent-7.0.0: ./ catalina-ha/ catalina/ jasper-el/ jasper/ juli/ shared/ shared/src/ shared/src/main/ shared/src/main/java/ shared/src/main/java/org/ shared/src/main/java/org/apache/ tribes/ util/
Date Wed, 13 Jan 2010 08:00:08 GMT
Author: xuhaihong
Date: Wed Jan 13 08:00:06 2010
New Revision: 898668

URL: http://svn.apache.org/viewvc?rev=898668&view=rev
Log:
new tomcat 7 snapshot based on tomcat rev 898667

Added:
    geronimo/external/trunk/tomcat-parent-7.0.0/
    geronimo/external/trunk/tomcat-parent-7.0.0/LICENSE
    geronimo/external/trunk/tomcat-parent-7.0.0/NOTICE
    geronimo/external/trunk/tomcat-parent-7.0.0/README.txt
    geronimo/external/trunk/tomcat-parent-7.0.0/build-archetype.sh
    geronimo/external/trunk/tomcat-parent-7.0.0/catalina/
    geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/
    geronimo/external/trunk/tomcat-parent-7.0.0/catalina-ha/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.0/catalina/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.0/fixup.sh   (with props)
    geronimo/external/trunk/tomcat-parent-7.0.0/jasper/
    geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/
    geronimo/external/trunk/tomcat-parent-7.0.0/jasper-el/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.0/jasper/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.0/juli/
    geronimo/external/trunk/tomcat-parent-7.0.0/juli/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.0/mv-resource.sh   (with props)
    geronimo/external/trunk/tomcat-parent-7.0.0/mydos2unix.sh   (with props)
    geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.0/rm-archetype-goo.sh
    geronimo/external/trunk/tomcat-parent-7.0.0/run.sh
    geronimo/external/trunk/tomcat-parent-7.0.0/shared/
    geronimo/external/trunk/tomcat-parent-7.0.0/shared/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/
    geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/main/
    geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/main/java/
    geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/main/java/org/
    geronimo/external/trunk/tomcat-parent-7.0.0/shared/src/main/java/org/apache/
    geronimo/external/trunk/tomcat-parent-7.0.0/svn-actions.sh   (with props)
    geronimo/external/trunk/tomcat-parent-7.0.0/tribes/
    geronimo/external/trunk/tomcat-parent-7.0.0/tribes/pom.xml
    geronimo/external/trunk/tomcat-parent-7.0.0/util/
    geronimo/external/trunk/tomcat-parent-7.0.0/util/pom.xml

Added: geronimo/external/trunk/tomcat-parent-7.0.0/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/LICENSE?rev=898668&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/LICENSE (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/LICENSE Wed Jan 13 08:00:06 2010
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

Added: geronimo/external/trunk/tomcat-parent-7.0.0/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/NOTICE?rev=898668&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/NOTICE (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/NOTICE Wed Jan 13 08:00:06 2010
@@ -0,0 +1,6 @@
+Apache Tomcat 
+Copyright 1999-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: geronimo/external/trunk/tomcat-parent-7.0.0/README.txt
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/README.txt?rev=898668&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/README.txt (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/README.txt Wed Jan 13 08:00:06 2010
@@ -0,0 +1,33 @@
+#
+#  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.
+
+Use tomcat-archetype to build a new level of Tomcat
+
+1. Update run.sh with the new Tomcat version number:
+
+   # Update TVER and TTAGVER with the Tomcat version number in appropriate format
+   TVER=6.0.20
+   TTAGVER=6_0_20
+
+2. From parent directory of tomcat-archetype, execute run.sh (assumes that subversion 1.5 or greater)
+
+   cd geronimo/external/trunk
+   ./parent-archetype/run.sh
+
+3. Run ./rm-archetype-goo.sh after you've run all the other scripts and are happy with the results.
+   This removes the archetype scripts that aren't needed in the maven project.  
+
+4. Apply patches to tomcat-parent-7.0.0-6.0.20/

Added: geronimo/external/trunk/tomcat-parent-7.0.0/build-archetype.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.0/build-archetype.sh?rev=898668&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/build-archetype.sh (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/build-archetype.sh Wed Jan 13 08:00:06 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.
+
+
+# build the archetype
+mvn clean archetype:create-from-project
+cd target/generated-sources/archetype/
+mvn install

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=898668&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 Jan 13 08:00:06 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: 890030 $ $Date: 2009-12-13 04:14:22 -0500 (Sun, 13 Dec 2009) $ --><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>

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=898668&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 Jan 13 08:00:06 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: 892152 $ $Date: 2009-12-18 01:25:25 -0500 (Fri, 18 Dec 2009) $ --><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.0_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.1_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,*</Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

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=898668&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/fixup.sh (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/fixup.sh Wed Jan 13 08:00:06 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:executable = *

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=898668&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 Wed Jan 13 08:00:06 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: 890030 $ $Date: 2009-12-13 04:14:22 -0500 (Sun, 13 Dec 2009) $ --><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>

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=898668&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 Wed Jan 13 08:00:06 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: 890030 $ $Date: 2009-12-13 04:14:22 -0500 (Sun, 13 Dec 2009) $ --><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>

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=898668&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 Wed Jan 13 08:00:06 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: 890030 $ $Date: 2009-12-13 04:14:22 -0500 (Sun, 13 Dec 2009) $ --><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>

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=898668&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 Wed Jan 13 08:00:06 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:executable = *

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=898668&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/mydos2unix.sh (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/mydos2unix.sh Wed Jan 13 08:00:06 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:executable = *

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=898668&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/pom.xml Wed Jan 13 08:00:06 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: 890235 $ $Date: 2009-12-14 03:59:36 -0500 (Mon, 14 Dec 2009) $ --><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.0_spec</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-ejb_3.1_spec</artifactId>
+                <version>1.0.0-EA1-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.1_spec</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_2.0_spec</artifactId>
+                <version>1.0-PFD2</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-EA-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

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=898668&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 Wed Jan 13 08:00:06 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

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=898668&view=auto
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.0/run.sh (added)
+++ geronimo/external/trunk/tomcat-parent-7.0.0/run.sh Wed Jan 13 08:00:06 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
+

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=898668&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 Wed Jan 13 08:00:06 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: 890030 $ $Date: 2009-12-13 04:14:22 -0500 (Sun, 13 Dec 2009) $ --><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>

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=898668&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 Wed Jan 13 08:00:06 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:executable = *

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=898668&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 Wed Jan 13 08:00:06 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: 816826 $ $Date: 2009-09-18 20:22:19 -0400 (Fri, 18 Sep 2009) $ --><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>

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=898668&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 Wed Jan 13 08:00:06 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>



Mime
View raw message