geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r833380 - in /geronimo/server/trunk/plugins: clustering/ clustering/wadi-clustering/ clustering/wadi-clustering/src/main/history/ jasper/ jasper/jasper-deployer/src/main/history/ jasper/jasper/ jasper/jasper/src/main/history/ tomcat/ tomcat...
Date Fri, 06 Nov 2009 13:01:25 GMT
Author: rickmcguire
Date: Fri Nov  6 13:01:24 2009
New Revision: 833380

URL: http://svn.apache.org/viewvc?rev=833380&view=rev
Log:
clean up the tomcat juli logging dependencies to ensure we're getting the pax version

Modified:
    geronimo/server/trunk/plugins/clustering/pom.xml
    geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
    geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jasper/jasper/pom.xml
    geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jasper/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/plugins/tomcat/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml

Modified: geronimo/server/trunk/plugins/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/pom.xml?rev=833380&r1=833379&r2=833380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/pom.xml Fri Nov  6 13:01:24 2009
@@ -64,11 +64,6 @@
         <dependencies>
             <dependency>
                 <groupId>${tomcatGroupId}</groupId>
-                <artifactId>juli</artifactId>
-                <version>${tomcatVersion}</version>
-            </dependency>
-            <dependency>
-                <groupId>${tomcatGroupId}</groupId>
                 <artifactId>tribes</artifactId>
                 <version>${tomcatVersion}</version>
                 <exclusions>
@@ -148,12 +143,12 @@
                 <groupId>${tomcatGroupId}</groupId>
                 <artifactId>tribes</artifactId>
                 <version>${tomcatVersion}</version>
-                <!--<exclusions>-->
-                <!--<exclusion>-->
-                <!--<groupId>${tomcatGroupId}</groupId>-->
-                <!--<artifactId>juli</artifactId>-->
-                <!--</exclusion>-->
-                <!--</exclusions>-->
+                <exclusions>
+                    <exclusion>
+                    <groupId>${tomcatGroupId}</groupId>
+                    <artifactId>juli</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
         </dependencies>

Modified: geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml?rev=833380&r1=833379&r2=833380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/wadi-clustering/pom.xml Fri Nov  6 13:01:24 2009
@@ -60,11 +60,6 @@
 
         <dependency>
             <groupId>${tomcatGroupId}</groupId>
-            <artifactId>juli</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${tomcatGroupId}</groupId>
             <artifactId>tribes</artifactId>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml?rev=833380&r1=833379&r2=833380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/clustering/wadi-clustering/src/main/history/dependencies.xml
Fri Nov  6 13:01:24 2009
@@ -43,11 +43,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
-        <artifactId>juli</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.ext.tomcat</groupId>
         <artifactId>tribes</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/history/dependencies.xml?rev=833380&r1=833379&r2=833380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/jasper/jasper-deployer/src/main/history/dependencies.xml
Fri Nov  6 13:01:24 2009
@@ -18,22 +18,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee-builder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jasper</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-jasper-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-web-2.5-builder</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jasper/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/pom.xml?rev=833380&r1=833379&r2=833380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/pom.xml Fri Nov  6 13:01:24 2009
@@ -91,11 +91,6 @@
         <!--<groupId>${tomcatGroupId}</groupId>-->
         <!--<artifactId>juli-adapters</artifactId>-->
         <!--</dependency>-->
-
-        <dependency>
-            <groupId>${tomcatGroupId}</groupId>
-            <artifactId>juli</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml?rev=833380&r1=833379&r2=833380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jasper/jasper/src/main/history/dependencies.xml Fri Nov
 6 13:01:24 2009
@@ -38,31 +38,16 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.ext.tomcat</groupId>
-        <artifactId>juli</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.ext.tomcat</groupId>
         <artifactId>shared</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>server-security-config</artifactId>
         <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-jasper</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/pom.xml?rev=833380&r1=833379&r2=833380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/pom.xml Fri Nov  6 13:01:24 2009
@@ -54,10 +54,10 @@
                     <!--<groupId>${tomcatGroupId}</groupId>-->
                     <!--<artifactId>servlet-api</artifactId>-->
                     <!--</exclusion>-->
-                    <!--<exclusion>-->
-                    <!--<groupId>${tomcatGroupId}</groupId>-->
-                    <!--<artifactId>juli</artifactId>-->
-                    <!--</exclusion>-->
+                    <exclusion>
+                        <groupId>${tomcatGroupId}</groupId>
+                        <artifactId>juli</artifactId>
+                    </exclusion>
                     <!--<exclusion>-->
                     <!--<groupId>${tomcatGroupId}</groupId>-->
                     <!--<artifactId>jsp-api</artifactId>-->
@@ -95,11 +95,6 @@
                     <!--</exclusion>-->
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>${tomcatGroupId}</groupId>
-                <artifactId>juli</artifactId>
-                <version>${tomcatVersion}</version>
-            </dependency>
 
             <!--<dependency>-->
             <!--<groupId>${tomcatGroupId}</groupId>-->

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=833380&r1=833379&r2=833380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml Fri Nov  6 13:01:24 2009
@@ -103,19 +103,9 @@
         <!--</dependency>-->
 
         <dependency>
-            <groupId>${tomcatGroupId}</groupId>
-            <artifactId>juli</artifactId>
-        </dependency>
-
-        <!--<dependency>-->
-        <!--<groupId>${tomcatGroupId}/groupId>-->
-        <!--<artifactId>juli-adapters</artifactId>-->
-        <!--</dependency>-->
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <scope>test</scope>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>1.4</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/pom.xml?rev=833380&r1=833379&r2=833380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/pom.xml Fri Nov  6 13:01:24 2009
@@ -115,11 +115,13 @@
                 </exclusions>
             </dependency>
 
+<!-- should never be used, use pax logging version instead
             <dependency>
                 <groupId>${tomcatGroupId}</groupId>
                 <artifactId>juli</artifactId>
                 <version>${tomcatVersion}</version>
             </dependency>
+  -->
             <dependency>
                 <groupId>${tomcatGroupId}</groupId>
                 <artifactId>catalina</artifactId>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml?rev=833380&r1=833379&r2=833380&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml Fri Nov  6 13:01:24 2009
@@ -98,16 +98,6 @@
         <!--<groupId>${tomcatGroupId}</groupId>-->
         <!--<artifactId>coyote</artifactId>-->
         <!--</dependency>-->
-
-        <dependency>
-            <groupId>${tomcatGroupId}</groupId>
-            <artifactId>juli</artifactId>
-        </dependency>
-
-        <!--<dependency>-->
-        <!--<groupId>${tomcatGroupId}</groupId>-->
-        <!--<artifactId>juli-adapters</artifactId>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>



Mime
View raw message