geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r495281 - in /geronimo/server/trunk: ./ modules/geronimo-jetty6/ modules/geronimo-jetty6/src/main/resources/META-INF/ modules/geronimo-tomcat6/ modules/geronimo-tomcat6/src/main/resources/META-INF/
Date Thu, 11 Jan 2007 16:20:42 GMT
Author: pmcmahan
Date: Thu Jan 11 08:20:41 2007
New Revision: 495281

URL: http://svn.apache.org/viewvc?view=rev&rev=495281
Log:
GERONIMO-2722 enable log4j in geronimo-tomcat.  This requires using a different version of
juli and juli-adapters.


Modified:
    geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml
    geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-dependency.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/pom.xml?view=diff&rev=495281&r1=495280&r2=495281
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/pom.xml Thu Jan 11 08:20:41 2007
@@ -109,8 +109,13 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.tomcat.extras</groupId>
             <artifactId>juli</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.extras</groupId>
+            <artifactId>juli-adapters</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml?view=diff&rev=495281&r1=495280&r2=495281
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/resources/META-INF/geronimo-dependency.xml
Thu Jan 11 08:20:41 2007
@@ -37,7 +37,11 @@
         <dep:artifactId>jasper-el</dep:artifactId>
     </dep:dependency>
     <dep:dependency>
-        <dep:groupId>org.apache.tomcat</dep:groupId>
+        <dep:groupId>org.apache.tomcat.extras</dep:groupId>
         <dep:artifactId>juli</dep:artifactId>
+    </dep:dependency>
+    <dep:dependency>
+        <dep:groupId>org.apache.tomcat.extras</dep:groupId>
+        <dep:artifactId>juli-adapters</dep:artifactId>
     </dep:dependency>
 </dep:service>

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml?view=diff&rev=495281&r1=495280&r2=495281
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml Thu Jan 11 08:20:41 2007
@@ -115,8 +115,13 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.tomcat</groupId>
+            <groupId>org.apache.tomcat.extras</groupId>
             <artifactId>juli</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.extras</groupId>
+            <artifactId>juli-adapters</artifactId>
         </dependency>
 
     </dependencies>

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-dependency.xml?view=diff&rev=495281&r1=495280&r2=495281
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-dependency.xml
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/resources/META-INF/geronimo-dependency.xml
Thu Jan 11 08:20:41 2007
@@ -44,8 +44,13 @@
         </dep:dependency>
         
         <dep:dependency>
-            <dep:groupId>org.apache.tomcat</dep:groupId>
+            <dep:groupId>org.apache.tomcat.extras</dep:groupId>
             <dep:artifactId>juli</dep:artifactId>
+        </dep:dependency>
+
+        <dep:dependency>
+            <dep:groupId>org.apache.tomcat.extras</dep:groupId>
+            <dep:artifactId>juli-adapters</dep:artifactId>
         </dep:dependency>
         
 </dep:service>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=495281&r1=495280&r2=495281
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Jan 11 08:20:41 2007
@@ -875,8 +875,14 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.tomcat</groupId>
+                <groupId>org.apache.tomcat.extras</groupId>
                 <artifactId>juli</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat.extras</groupId>
+                <artifactId>juli-adapters</artifactId>
                 <version>${tomcatVersion}</version>
             </dependency>
 



Mime
View raw message