geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r783161 - in /geronimo/sandbox/djencks/tomcat-archetype/trunk: ./ catalina-ha/ catalina/ catalina/src/main/java/org/apache/naming/ coyote/ coyote/src/main/java/org/apache/jk/ coyote/src/main/java/org/apache/tomcat/ coyote/src/main/java/org/...
Date Tue, 09 Jun 2009 23:01:19 GMT
Author: djencks
Date: Tue Jun  9 23:01:19 2009
New Revision: 783161

URL: http://svn.apache.org/viewvc?rev=783161&view=rev
Log:
Shows non-resolvable circular dependencies between jars set up as tomcat assembles them

Added:
    geronimo/sandbox/djencks/tomcat-archetype/trunk/build.sh   (with props)
    geronimo/sandbox/djencks/tomcat-archetype/trunk/catalina/src/main/java/org/apache/naming/
    geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/src/main/java/org/apache/jk/
    geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/src/main/java/org/apache/tomcat/
    geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/src/main/java/org/apache/tomcat/jni/
    geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh   (with props)
    geronimo/sandbox/djencks/tomcat-archetype/trunk/util/
      - copied from r783138, geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/
    geronimo/sandbox/djencks/tomcat-archetype/trunk/util/pom.xml
      - copied, changed from r783145, geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/pom.xml
    geronimo/sandbox/djencks/tomcat-archetype/trunk/util/src/main/java/org/apache/tomcat/
    geronimo/sandbox/djencks/tomcat-archetype/trunk/util/src/main/java/org/apache/tomcat/util/
Removed:
    geronimo/sandbox/djencks/tomcat-archetype/trunk/util/src/main/java/org/apache/coyote/
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/coyote/pom.xml
    geronimo/sandbox/djencks/tomcat-archetype/trunk/jasper/pom.xml
    geronimo/sandbox/djencks/tomcat-archetype/trunk/juli-adapters/pom.xml
    geronimo/sandbox/djencks/tomcat-archetype/trunk/pom.xml
    geronimo/sandbox/djencks/tomcat-archetype/trunk/tribes/pom.xml

Added: geronimo/sandbox/djencks/tomcat-archetype/trunk/build.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/build.sh?rev=783161&view=auto
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/build.sh (added)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/build.sh Tue Jun  9 23:01:19 2009
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# build the archetype
+mvn clean archetype:create-from-project
+cd target/generated-sources/archetype/
+mvn install

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/build.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/build.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/build.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision

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=783161&r1=783160&r2=783161&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:01:19
2009
@@ -39,19 +39,19 @@
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <groupId>${groupId}</groupId>
             <artifactId>coyote</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <groupId>${groupId}</groupId>
             <artifactId>juli</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <groupId>${groupId}</groupId>
             <artifactId>tribes</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <groupId>${groupId}</groupId>
             <artifactId>catalina</artifactId>
         </dependency>
     </dependencies>

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=783161&r1=783160&r2=783161&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:01:19 2009
@@ -34,25 +34,26 @@
     <name>catalina</name>
     
     <dependencies>
-        <!--
         <dependency>
-          <groupId>org.apache.geronimo.ext.tomcat</groupId>
-          <artifactId>coyote</artifactId>
-          <version>@MAVEN.DEPLOY.VERSION@</version>
-          <scope>compile</scope>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
-        -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <groupId>${groupId}</groupId>
             <artifactId>juli</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <groupId>${groupId}</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>coyote</artifactId>
         </dependency>
     </dependencies>
     <build>

Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/pom.xml?rev=783161&r1=783160&r2=783161&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/pom.xml (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/pom.xml Tue Jun  9 23:01:19 2009
@@ -35,17 +35,21 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
-            <artifactId>catalina</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <groupId>${groupId}</groupId>
             <artifactId>juli</artifactId>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>${groupId}</groupId>-->
+            <!--<artifactId>catalina</artifactId>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>util</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=783161&r1=783160&r2=783161&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:01:19 2009
@@ -47,19 +47,19 @@
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <groupId>${groupId}</groupId>
             <artifactId>juli</artifactId>
         </dependency>
+        <!--<dependency>-->
+            <!--<groupId>${groupId}</groupId>-->
+            <!--<artifactId>catalina</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>${groupId}</groupId>-->
+            <!--<artifactId>jasper-jdt</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>
+            <groupId>${groupId}</groupId>
             <artifactId>jasper-el</artifactId>
         </dependency>
     </dependencies>

Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/juli-adapters/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/juli-adapters/pom.xml?rev=783161&r1=783160&r2=783161&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/juli-adapters/pom.xml (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/juli-adapters/pom.xml Tue Jun  9 23:01:19
2009
@@ -35,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <groupId>${groupId}</groupId>
             <artifactId>juli</artifactId>
         </dependency>
         <dependency>

Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/pom.xml?rev=783161&r1=783160&r2=783161&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/pom.xml (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/pom.xml Tue Jun  9 23:01:19 2009
@@ -59,6 +59,7 @@
         <module>juli-extras</module>
         <module>catalina</module>
         <module>tribes</module>
+        <module>util</module>
         <module>catalina-ha</module>
         <module>coyote</module>
         <module>jasper</module>
@@ -92,55 +93,60 @@
             <!-- internal -->
 
             <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <groupId>${groupId}</groupId>
                 <artifactId>catalina</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <groupId>${groupId}</groupId>
                 <artifactId>catalina-ha</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <groupId>${groupId}</groupId>
                 <artifactId>coyote</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <groupId>${groupId}</groupId>
                 <artifactId>jasper</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <groupId>${groupId}</groupId>
                 <artifactId>jasper-el</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <groupId>${groupId}</groupId>
                 <artifactId>jasper-jdt</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <groupId>${groupId}</groupId>
                 <artifactId>juli</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <groupId>${groupId}</groupId>
                 <artifactId>juli-adapters</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <groupId>${groupId}</groupId>
                 <artifactId>juli-extras</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.ext.tomcat</groupId>
+                <groupId>${groupId}</groupId>
                 <artifactId>tribes</artifactId>
                 <version>${version}</version>
             </dependency>
+            <dependency>
+                <groupId>${groupId}</groupId>
+                <artifactId>util</artifactId>
+                <version>${version}</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>

Added: 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=783161&view=auto
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh (added)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh Tue Jun  9 23:01:19 2009
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# Script to copy the tomcat source to the appropriate places in the mavenized project
+
+SVN_CMD="svn export"
+RM="rm -rf"
+
+TOMCAT_VERSION=TOMCAT_6_0_18
+
+TOMCAT_BASE="https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags"
+
+TOMCAT=$TOMCAT_BASE/$TOMCAT_VERSION
+
+#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
+$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
+
+#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
+
+#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
+
+
+
+#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

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/sandbox/djencks/tomcat-archetype/trunk/svn-actions.sh
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Modified: geronimo/sandbox/djencks/tomcat-archetype/trunk/tribes/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/tribes/pom.xml?rev=783161&r1=783160&r2=783161&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/tribes/pom.xml (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/tribes/pom.xml Tue Jun  9 23:01:19 2009
@@ -35,7 +35,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <groupId>${groupId}</groupId>
             <artifactId>juli</artifactId>
         </dependency>
     </dependencies>

Copied: geronimo/sandbox/djencks/tomcat-archetype/trunk/util/pom.xml (from r783145, geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/tomcat-archetype/trunk/util/pom.xml?p2=geronimo/sandbox/djencks/tomcat-archetype/trunk/util/pom.xml&p1=geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/pom.xml&r1=783145&r2=783161&rev=783161&view=diff
==============================================================================
--- geronimo/sandbox/djencks/tomcat-archetype/trunk/coyote/pom.xml (original)
+++ geronimo/sandbox/djencks/tomcat-archetype/trunk/util/pom.xml Tue Jun  9 23:01:19 2009
@@ -28,22 +28,18 @@
         <artifactId>tomcat-parent</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>coyote</artifactId>
+    <artifactId>util</artifactId>
     <packaging>bundle</packaging>
 
-    <name>coyote</name>
+    <name>util</name>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
-            <artifactId>catalina</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
+            <groupId>${groupId}</groupId>
             <artifactId>juli</artifactId>
         </dependency>
     </dependencies>



Mime
View raw message