geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r829124 - in /geronimo/server/trunk/framework: ./ buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/ configs/client-system/ configs/client-system/src/main/history/ configs/client-system/src/main/plan/ configs/...
Date Fri, 23 Oct 2009 16:57:05 GMT
Author: gawor
Date: Fri Oct 23 16:57:03 2009
New Revision: 829124

URL: http://svn.apache.org/viewvc?rev=829124&view=rev
Log:
bunch of logging improvements

Removed:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/jul/
Modified:
    geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml
    geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/upgrade-cli/src/main/plan/plan.xml
    geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
    geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
    geronimo/server/trunk/framework/modules/pom.xml
    geronimo/server/trunk/framework/pom.xml

Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/AbstractCarMojo.java
Fri Oct 23 16:57:03 2009
@@ -629,7 +629,15 @@
         }
     }
 
+    private void setLoggingLevel() {
+        if (System.getProperty("org.ops4j.pax.logging.DefaultServiceLog.level") == null)
{
+            System.setProperty("org.ops4j.pax.logging.DefaultServiceLog.level", "ERROR");
+        }
+    }
+    
     protected Framework getFramework() throws BundleException {
+        setLoggingLevel();
+        
         Map<String, String> properties = new HashMap<String, String>();
 //        properties.put(FelixConstants.EMBEDDED_EXECUTION_PROP, "true");
         properties.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA,

Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Fri Oct 23 16:57:03 2009
@@ -100,21 +100,27 @@
             <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>org.slf4j</groupId>-->
-        <!--<artifactId>jul-to-slf4j</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.slf4j</groupId>-->
-            <!--<artifactId>slf4j-api</artifactId>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
         </dependency>
 
         <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.configadmin</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-reflect</artifactId>
         </dependency>

Modified: geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/client-system/src/main/history/dependencies.xml
Fri Oct 23 16:57:03 2009
@@ -13,6 +13,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.configadmin</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
         <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
@@ -116,4 +121,14 @@
         <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-service</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/src/main/plan/plan.xml Fri Oct 23
16:57:03 2009
@@ -86,6 +86,7 @@
     </gbean>
 
     <!-- Logging service -->
+    <!--
     <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
         <attribute name="configFileName">var/log/client-log4j.properties</attribute>
         <attribute name="refreshPeriodSeconds">60</attribute>
@@ -93,8 +94,6 @@
             <name>ServerInfo</name>
         </reference>
     </gbean>
-
-    <!-- JUL-to-SLF4j bridge -->
-    <gbean name="JULBridge" class="org.apache.geronimo.system.logging.jul.JULBridgeGBean"/>
+    -->
 
 </module>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
Fri Oct 23 16:57:03 2009
@@ -136,4 +136,9 @@
         <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
Fri Oct 23 16:57:03 2009
@@ -201,4 +201,9 @@
         <artifactId>groovy-all-minimal</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Fri Oct 23 16:57:03 2009
@@ -152,29 +152,27 @@
             <artifactId>sxc-runtime</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.slf4j</groupId>-->
-            <!--<artifactId>slf4j-api</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.slf4j</groupId>-->
-            <!--<artifactId>slf4j-log4j12</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.slf4j</groupId>-->
-            <!--<artifactId>jcl-over-slf4j</artifactId>-->
-        <!--</dependency>-->
-
-        <!--<dependency>-->
-            <!--<groupId>org.slf4j</groupId>-->
-            <!--<artifactId>jul-to-slf4j</artifactId>-->
-        <!--</dependency>-->
-        
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
         </dependency>
+
+
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.configadmin</artifactId>
+        </dependency>
+
         
         <!-- build order hint -->
         <dependency>
@@ -260,22 +258,6 @@
                             <groupId>cglib</groupId>
                             <artifactId>cglib-nodep</artifactId>
                         </element>
-                        <!--<element>-->
-                            <!--<groupId>org.slf4j</groupId>-->
-                            <!--<artifactId>slf4j-api</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.slf4j</groupId>-->
-                            <!--<artifactId>slf4j-log4j12</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.slf4j</groupId>-->
-                            <!--<artifactId>jcl-over-slf4j</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>log4j</groupId>-->
-                            <!--<artifactId>log4j</artifactId>-->
-                        <!--</element>-->
                         <element>
                             <groupId>xpp3</groupId>
                             <artifactId>xpp3_min</artifactId>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/history/dependencies.xml
Fri Oct 23 16:57:03 2009
@@ -13,6 +13,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.configadmin</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.felix</groupId>
         <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
@@ -141,4 +146,14 @@
         <artifactId>groovy-all-minimal</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-service</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/src/main/plan/plan.xml Fri Oct 23
16:57:03 2009
@@ -115,15 +115,14 @@
     </gbean>
 
     <!-- Logging service -->
-    <!--<gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">-->
-        <!--<attribute name="configFileName">var/log/server-log4j.properties</attribute>-->
-        <!--<attribute name="refreshPeriodSeconds">60</attribute>-->
-        <!--<reference name="ServerInfo">-->
-            <!--<name>ServerInfo</name>-->
-        <!--</reference>-->
-    <!--</gbean>-->
-
-    <!-- JUL-to-SLF4j bridge -->
-    <!--<gbean name="JULBridge" class="org.apache.geronimo.system.logging.jul.JULBridgeGBean"/>-->
+    <!--
+    <gbean name="Logger" class="org.apache.geronimo.osgi.logging.log4j.Log4jService">
+        <attribute name="configFileName">var/log/server-log4j.properties</attribute>
+        <attribute name="refreshPeriodSeconds">60</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+    </gbean>
+    -->
 
 </module>

Modified: geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-cli/src/main/history/dependencies.xml Fri
Oct 23 16:57:03 2009
@@ -166,4 +166,9 @@
         <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/history/dependencies.xml
Fri Oct 23 16:57:03 2009
@@ -136,4 +136,9 @@
         <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
(original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/src/main/plan/plan.xml
Fri Oct 23 16:57:03 2009
@@ -85,6 +85,7 @@
     </gbean>
 
     <!-- Logging service -->
+    <!--
     <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
         <attribute name="configFileName">var/log/deployer-log4j.properties</attribute>
         <attribute name="refreshPeriodSeconds">60</attribute>
@@ -92,5 +93,6 @@
             <name>ServerInfo</name>
         </reference>
     </gbean>
+    -->
 
 </module>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri Oct 23 16:57:03 2009
@@ -341,26 +341,6 @@
             <groupId>org.apache.geronimo.blueprint</groupId>
             <artifactId>geronimo-blueprint</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <!--<resources>-->

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Fri Oct 23 16:57:03 2009
@@ -31,12 +31,6 @@
 org/apache/felix/org.apache.felix.prefs/${felix.prefs.version}/org.apache.felix.prefs-${felix.prefs.version}.jar=10
 org/apache/felix/org.apache.felix.fileinstall/${felix.fileinstall.version}/org.apache.felix.fileinstall-${felix.fileinstall.version}.jar=10
 
-org/apache/geronimo/bundles/log4j/1.2.15_1-SNAPSHOT/log4j-1.2.15_1-SNAPSHOT.jar=10  
-org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar=10
-org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar=10
-#org/slf4j/jul-to-slf4j/1.5.6/jul-to-slf4j-1.5.6.jar=10  not a bundle!
-org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar=10
-
 
 #
 # The rest of the services..

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
Fri Oct 23 16:57:03 2009
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>net.sf.kxml</groupId>
         <artifactId>kxml2</artifactId>
         <type>jar</type>
@@ -182,11 +177,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>log4j</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-servlet_3.0_spec</artifactId>
         <type>jar</type>
@@ -253,25 +243,10 @@
     </dependency>
     <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jul-to-slf4j</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.springframework.osgi</groupId>
         <artifactId>spring-osgi-core</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/history/dependencies.xml
Fri Oct 23 16:57:03 2009
@@ -126,4 +126,9 @@
         <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/src/main/plan/plan.xml Fri Oct
23 16:57:03 2009
@@ -104,6 +104,7 @@
     </gbean>
 
     <!-- Logging service -->
+    <!--
     <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
         <attribute name="configFileName">var/log/deployer-log4j.properties</attribute>
         <attribute name="refreshPeriodSeconds">60</attribute>
@@ -111,5 +112,6 @@
             <name>ServerInfo</name>
         </reference>
     </gbean>
+    -->
 
 </module>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/pom.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/pom.xml Fri Oct 23 16:57:03 2009
@@ -93,14 +93,6 @@
             <artifactId>xbean-naming</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml Fri
Oct 23 16:57:03 2009
@@ -56,14 +56,4 @@
         <artifactId>xbean-naming</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/src/main/history/dependencies.xml Fri
Oct 23 16:57:03 2009
@@ -166,4 +166,9 @@
         <artifactId>xbean-reflect</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.logging</groupId>
+        <artifactId>pax-logging-api</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/upgrade-cli/pom.xml Fri Oct 23 16:57:03 2009
@@ -46,11 +46,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
         </dependency>

Modified: geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/upgrade-cli/src/main/history/dependencies.xml
Fri Oct 23 16:57:03 2009
@@ -12,11 +12,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>log4j</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-gbean-deployer</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/framework/configs/upgrade-cli/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/upgrade-cli/src/main/plan/plan.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/upgrade-cli/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/upgrade-cli/src/main/plan/plan.xml Fri Oct 23
16:57:03 2009
@@ -63,6 +63,7 @@
     </gbean>
 
     <!-- Logging service -->
+    <!--
     <gbean name="Logger" class="org.apache.geronimo.system.logging.log4j.Log4jService">
         <attribute name="configFileName">var/log/server-log4j.properties</attribute>
         <attribute name="refreshPeriodSeconds">60</attribute>
@@ -70,5 +71,6 @@
             <name>ServerInfo</name>
         </reference>
     </gbean>
+    -->
 
 </module>

Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/pom.xml Fri Oct 23 16:57:03 2009
@@ -34,6 +34,10 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
             <artifactId>testsupport-common</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml Fri Oct 23 16:57:03 2009
@@ -44,10 +44,10 @@
             <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
+
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.framework</groupId>-->
             <!--<artifactId>geronimo-logging</artifactId>-->

Modified: geronimo/server/trunk/framework/modules/geronimo-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/pom.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/pom.xml Fri Oct 23 16:57:03 2009
@@ -34,6 +34,12 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-cli</artifactId>
             <version>${version}</version>
@@ -73,39 +79,7 @@
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.bundles</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.ops4j.pax.logging</groupId>-->
-            <!--<artifactId>pax-logging-service</artifactId>-->
-        <!--</dependency>-->
-
-        <!-- todo move jul logging install gbean to where it's needed such as tomcat and/or
jasper plugins -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!-- for jexl -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-        </dependency>
-
-        <!--<dependency>-->
-            <!--<groupId>org.slf4j</groupId>-->
-            <!--<artifactId>slf4j-api</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.slf4j</groupId>-->
-            <!--<artifactId>slf4j-log4j12</artifactId>-->
-            <!--<scope>provided</scope>-->
-        <!--</dependency>-->
-
+        
         <!-- plugin management -->
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
@@ -131,14 +105,6 @@
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
         </dependency>
-        <!--
-        Some dependencies require JCL, so use this adapter to force them into SLF4J.
-        -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
@@ -204,7 +170,7 @@
                 <configuration>
                     <instructions>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
-                        <Import-Package>org.slf4j.bridge;resolution:=optional,org.apache.log4j.helpers;resolution:=optional,*</Import-Package>
+                        <Import-Package>org.apache.log4j.helpers;resolution:=optional,*</Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Fri Oct 23 16:57:03 2009
@@ -29,22 +29,6 @@
     <packaging>pom</packaging>
     
     <dependencies>
-        
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.slf4j</groupId>-->
-            <!--<artifactId>slf4j-log4j12</artifactId>-->
-            <!--<scope>provided</scope>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
@@ -155,4 +139,4 @@
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=829124&r1=829123&r2=829124&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Fri Oct 23 16:57:03 2009
@@ -48,6 +48,16 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.configadmin</artifactId>
                 <version>1.0.10</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.compendium</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>



Mime
View raw message