geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r783164 - in /geronimo/sandbox/djencks/tomcat-archetype/trunk: catalina-ha/pom.xml catalina/pom.xml jasper/pom.xml pom.xml shared/ shared/pom.xml svn-actions.sh
Date Tue, 09 Jun 2009 23:51:49 GMT
Author: djencks
Date: Tue Jun  9 23:51:48 2009
New Revision: 783164

URL: http://svn.apache.org/viewvc?rev=783164&view=rev
Log:
Resulting tomcat project builds

Added:
    geronimo/sandbox/djencks/tomcat-archetype/trunk/shared/
      - copied from r783138, geronimo/sandbox/djencks/tomcat-archetype/trunk/juli/
    geronimo/sandbox/djencks/tomcat-archetype/trunk/shared/pom.xml
      - copied, changed from r783145, geronimo/sandbox/djencks/tomcat-archetype/trunk/juli/pom.xml
Modified:
    geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina-ha/pom.xml
    geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina/pom.xml
    geronimo/sandbox/djencks/tomcat-archetype/trunk/jasper/pom.xml
    geronimo/sandbox/djencks/tomcat-archetype/trunk/pom.xml
    geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh

Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina-ha/pom.xml?rev=783164&r1=783163&r2=783164&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina-ha/pom.xml (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina-ha/pom.xml Tue Jun  9 23:51:48
2009
@@ -38,10 +38,10 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>coyote</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>${groupId}</groupId>-->
+            <!--<artifactId>coyote</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>${groupId}</groupId>
             <artifactId>juli</artifactId>

Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina/pom.xml?rev=783164&r1=783163&r2=783164&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina/pom.xml (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina/pom.xml Tue Jun  9 23:51:48 2009
@@ -42,6 +42,18 @@
             <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.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>${groupId}</groupId>
@@ -49,12 +61,16 @@
         </dependency>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>util</artifactId>
+            <artifactId>shared</artifactId>
         </dependency>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>coyote</artifactId>
+            <artifactId>util</artifactId>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>${groupId}</groupId>-->
+            <!--<artifactId>coyote</artifactId>-->
+        <!--</dependency>-->
     </dependencies>
     <build>
         <plugins>

Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/jasper/pom.xml?rev=783164&r1=783163&r2=783164&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/jasper/pom.xml (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/jasper/pom.xml Tue Jun  9 23:51:48 2009
@@ -50,6 +50,18 @@
             <groupId>${groupId}</groupId>
             <artifactId>juli</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${groupId}</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>${groupId}</groupId>-->
             <!--<artifactId>catalina</artifactId>-->

Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/pom.xml?rev=783164&r1=783163&r2=783164&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/pom.xml (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/pom.xml Tue Jun  9 23:51:48 2009
@@ -54,17 +54,18 @@
     </scm>
 
     <modules>
+        <module>shared</module>
         <module>juli</module>
-        <module>juli-adapters</module>
-        <module>juli-extras</module>
+        <!--<module>juli-adapters</module>-->
+        <!--<module>juli-extras</module>-->
         <module>catalina</module>
         <module>tribes</module>
         <module>util</module>
         <module>catalina-ha</module>
-        <module>coyote</module>
+        <!--<module>coyote</module>-->
         <module>jasper</module>
         <module>jasper-el</module>
-        <module>jasper-jdt</module>
+        <!--<module>jasper-jdt</module>-->
     </modules>
 
     <dependencyManagement>
@@ -76,11 +77,26 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                <version>1.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-el_1.0_spec</artifactId>
                 <version>1.0.1</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-jpa_1.0_spec</artifactId>
+                <version>1.1.2-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jsp_2.1_spec</artifactId>
                 <version>1.0.1</version>
             </dependency>
@@ -90,6 +106,18 @@
                 <version>1.2</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.2.3.v_686_R32x</version>
+            </dependency>
+            
+
             <!-- internal -->
 
             <dependency>
@@ -139,6 +167,11 @@
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
+                <artifactId>shared</artifactId>
+                <version>${version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${groupId}</groupId>
                 <artifactId>tribes</artifactId>
                 <version>${version}</version>
             </dependency>

Copied: geronimo/sandbox/djencks/tomcat-archetype/trunk/shared/pom.xml (from r783145, geronimo/sandbox/djencks/tomcat-archetype/trunk/juli/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/shared/pom.xml?p2=geronimo/sandbox/djencks/tomcat-archetype/trunk/shared/pom.xml&p1=geronimo/sandbox/djencks/tomcat-archetype/trunk/juli/pom.xml&r1=783145&r2=783164&rev=783164&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/juli/pom.xml (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/shared/pom.xml Tue Jun  9 23:51:48 2009
@@ -28,10 +28,10 @@
         <artifactId>tomcat-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>juli</artifactId>
+    <artifactId>shared</artifactId>
     <packaging>bundle</packaging>
 
-    <name>juli</name>
+    <name>shared</name>
 
     <dependencies>
     </dependencies>

Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh?rev=783164&r1=783163&r2=783164&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh Tue Jun  9 23:51:48 2009
@@ -21,15 +21,19 @@
 $RM catalina/src/main/java/org/apache/catalina/launcher
 $RM catalina/src/main/java/org/apache/catalina/storeconfig
 $RM catalina/src/main/java/org/apache/naming/factory/webservices
+$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/util/net coyote/src/main/java/org/apache/util/net
+#$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
@@ -44,6 +48,9 @@
 
 
 
+#shared
+$SVN_CMD -N $TOMCAT/java/org/apache/ shared/src/main/java/org/apache/
+
 #tribes
 $SVN_CMD $TOMCAT/java/org/apache/catalina/tribes tribes/src/main/java/org/apache/catalina/tribes
 



Mime
View raw message