geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r890030 - in /geronimo/external/trunk/tomcat-archetype: catalina-ha/pom.xml catalina/pom.xml coyote/ fixup.sh jasper-el/pom.xml jasper-jdt/ jasper/pom.xml juli-adapters/ juli-extras/ juli/pom.xml pom.xml run.sh shared/pom.xml svn-actions.sh
Date Sun, 13 Dec 2009 09:14:22 GMT
Author: djencks
Date: Sun Dec 13 09:14:22 2009
New Revision: 890030

URL: http://svn.apache.org/viewvc?rev=890030&view=rev
Log:
GERONIMO-4980 update tomcat archetype to work with tomcat svn trunk (7.0.0)

Removed:
    geronimo/external/trunk/tomcat-archetype/coyote/
    geronimo/external/trunk/tomcat-archetype/jasper-jdt/
    geronimo/external/trunk/tomcat-archetype/juli-adapters/
    geronimo/external/trunk/tomcat-archetype/juli-extras/
Modified:
    geronimo/external/trunk/tomcat-archetype/catalina-ha/pom.xml
    geronimo/external/trunk/tomcat-archetype/catalina/pom.xml
    geronimo/external/trunk/tomcat-archetype/fixup.sh
    geronimo/external/trunk/tomcat-archetype/jasper-el/pom.xml
    geronimo/external/trunk/tomcat-archetype/jasper/pom.xml
    geronimo/external/trunk/tomcat-archetype/juli/pom.xml
    geronimo/external/trunk/tomcat-archetype/pom.xml
    geronimo/external/trunk/tomcat-archetype/run.sh
    geronimo/external/trunk/tomcat-archetype/shared/pom.xml
    geronimo/external/trunk/tomcat-archetype/svn-actions.sh

Modified: geronimo/external/trunk/tomcat-archetype/catalina-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/catalina-ha/pom.xml?rev=890030&r1=890029&r2=890030&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/catalina-ha/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/catalina-ha/pom.xml Sun Dec 13 09:14:22 2009
@@ -28,20 +28,16 @@
         <artifactId>tomcat-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>Apache Geronimo Tomcat fork: Catalina-ha</artifactId>
+    <artifactId>catalina-ha</artifactId>
     <packaging>bundle</packaging>
 
-    <name>catalina-ha</name>
+    <name>Apache Geronimo Tomcat fork: Catalina-ha</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>${groupId}</groupId>-->
-            <!--<artifactId>coyote</artifactId>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>${groupId}</groupId>
             <artifactId>juli</artifactId>

Modified: geronimo/external/trunk/tomcat-archetype/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/catalina/pom.xml?rev=890030&r1=890029&r2=890030&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/catalina/pom.xml Sun Dec 13 09:14:22 2009
@@ -28,15 +28,15 @@
         <artifactId>tomcat-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>Apache Geronimo Tomcat fork: Catalina</artifactId>
+    <artifactId>catalina</artifactId>
     <packaging>bundle</packaging>
 
-    <name>catalina</name>
-    
+    <name>Apache Geronimo Tomcat fork: Catalina</name>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -66,14 +66,6 @@
             <groupId>${groupId}</groupId>
             <artifactId>shared</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>util</artifactId>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>${groupId}</groupId>-->
-            <!--<artifactId>coyote</artifactId>-->
-        <!--</dependency>-->
     </dependencies>
     <build>
         <plugins>

Modified: geronimo/external/trunk/tomcat-archetype/fixup.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/fixup.sh?rev=890030&r1=890029&r2=890030&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/fixup.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/fixup.sh Sun Dec 13 09:14:22 2009
@@ -19,6 +19,7 @@
 
 chmod u+x mydos2unix.sh
 chmod u+x svn-actions.sh
+chmod u+x mv-resource.sh
 
 # fix line endings and add empty directories
 

Modified: geronimo/external/trunk/tomcat-archetype/jasper-el/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/jasper-el/pom.xml?rev=890030&r1=890029&r2=890030&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/jasper-el/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/jasper-el/pom.xml Sun Dec 13 09:14:22 2009
@@ -28,10 +28,10 @@
         <artifactId>tomcat-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>Apache Geronimo Tomcat fork: Jasper-el</artifactId>
+    <artifactId>jasper-el</artifactId>
     <packaging>bundle</packaging>
 
-    <name>jasper-el</name>
+    <name>Apache Geronimo Tomcat fork: Jasper-el</name>
 
     <dependencies>
         <dependency>

Modified: geronimo/external/trunk/tomcat-archetype/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/jasper/pom.xml?rev=890030&r1=890029&r2=890030&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/jasper/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/jasper/pom.xml Sun Dec 13 09:14:22 2009
@@ -28,10 +28,10 @@
         <artifactId>tomcat-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>Apache Geronimo Tomcat fork: Jasper</artifactId>
+    <artifactId>jasper</artifactId>
     <packaging>bundle</packaging>
 
-    <name>jasper</name>
+    <name>Apache Geronimo Tomcat fork: Jasper</name>
 
     <dependencies>
         <dependency>
@@ -40,11 +40,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.1_spec</artifactId>
+            <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>${groupId}</groupId>

Modified: geronimo/external/trunk/tomcat-archetype/juli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/juli/pom.xml?rev=890030&r1=890029&r2=890030&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/juli/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/juli/pom.xml Sun Dec 13 09:14:22 2009
@@ -28,10 +28,10 @@
         <artifactId>tomcat-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>Apache Geronimo Tomcat fork: Juli</artifactId>
+    <artifactId>juli</artifactId>
     <packaging>bundle</packaging>
 
-    <name>juli</name>
+    <name>Apache Geronimo Tomcat fork: Juli</name>
 
     <dependencies>
     </dependencies>

Modified: geronimo/external/trunk/tomcat-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/pom.xml?rev=890030&r1=890029&r2=890030&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/pom.xml Sun Dec 13 09:14:22 2009
@@ -58,7 +58,7 @@
         <!--<module>juli-extras</module>-->
         <module>catalina</module>
         <module>tribes</module>
-        <module>util</module>
+        <!--<module>util</module>-->
         <module>catalina-ha</module>
         <!--<module>coyote</module>-->
         <module>jasper</module>
@@ -75,8 +75,8 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                <version>1.0.1</version>
+                <artifactId>geronimo-ejb_3.1_spec</artifactId>
+                <version>1.0.0-EA1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -100,13 +100,13 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jsp_2.1_spec</artifactId>
-                <version>1.0.1</version>
+                <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
+                <version>1.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.2</version>
+                <artifactId>geronimo-servlet_3.0_spec</artifactId>
+                <version>1.0-EA-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -190,11 +190,11 @@
                 <artifactId>tribes</artifactId>
                 <version>${version}</version>
             </dependency>
-            <dependency>
-                <groupId>${groupId}</groupId>
-                <artifactId>util</artifactId>
-                <version>${version}</version>
-            </dependency>
+            <!--<dependency>-->
+                <!--<groupId>${groupId}</groupId>-->
+                <!--<artifactId>util</artifactId>-->
+                <!--<version>${version}</version>-->
+            <!--</dependency>-->
 
         </dependencies>
     </dependencyManagement>

Modified: geronimo/external/trunk/tomcat-archetype/run.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/run.sh?rev=890030&r1=890029&r2=890030&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/run.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/run.sh Sun Dec 13 09:14:22 2009
@@ -18,10 +18,10 @@
 
 # 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=6.0.20
-export TTAGVER=6_0_20
+TVER=7.0.0
+#export TTAGVER=6_0_20
 
-GVER=${TVER}-SNAPSHOT
+GVER=${TVER}.0-SNAPSHOT
 
 svn rm --force tomcat-parent-${TVER}
 rm -rf tomcat-parent-${TVER}/
@@ -36,8 +36,6 @@
  -Dversion=${GVER}\
  -Dpackage=org.apache
 
-#mv tomcat-parent tomcat-parent-${TVER}
-
 cd tomcat-parent-${TVER}
 chmod u+x fixup.sh
 ./fixup.sh
@@ -48,7 +46,6 @@
 svn status
 
 ./svn-actions.sh
-chmod u+x mv-resource.sh
 
 mvn clean install
 

Modified: geronimo/external/trunk/tomcat-archetype/shared/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/shared/pom.xml?rev=890030&r1=890029&r2=890030&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/shared/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/shared/pom.xml Sun Dec 13 09:14:22 2009
@@ -34,6 +34,10 @@
     <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>

Modified: geronimo/external/trunk/tomcat-archetype/svn-actions.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/svn-actions.sh?rev=890030&r1=890029&r2=890030&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/svn-actions.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/svn-actions.sh Sun Dec 13 09:14:22 2009
@@ -32,11 +32,9 @@
   RM="rm -rf"
 fi
 
-TOMCAT_TAG=TOMCAT_${TTAGVER}
+TOMCAT_BASE="https://svn.apache.org/repos/asf/tomcat/trunk"
 
-TOMCAT_BASE="https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags"
-
-TOMCAT=$TOMCAT_BASE/$TOMCAT_TAG
+TOMCAT=$TOMCAT_BASE
 
 #catalina
 $SVN_CMD $TOMCAT/java/org/apache/catalina/ catalina/src/main/java/org/apache/catalina
@@ -54,7 +52,7 @@
 $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
+$SVN_CMD $TOMCAT/java/org/apache/tomcat/util/ catalina/src/main/java/org/apache/tomcat/util
 
 #catalina-ha
 $SVN_CMD $TOMCAT/java/org/apache/catalina/ha/ catalina-ha/src/main/java/org/apache/catalina/ha
@@ -81,8 +79,10 @@
 #shared
 if [ -d .svn ]
 then
-  $SVN_CMD $TOMCAT/java/org/apache/AnnotationProcessor.java shared/src/main/java/org/apache
-  $SVN_CMD $TOMCAT/java/org/apache/PeriodicEventListener.java shared/src/main/java/org/apache
+  $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
@@ -90,10 +90,6 @@
 #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
 



Mime
View raw message