geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r570741 - in /geronimo/server/trunk: ./ assemblies/geronimo-jetty6-javaee5-gshell/ assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/ modules/geronimo-commands/ modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/
Date Wed, 29 Aug 2007 10:38:46 GMT
Author: jdillon
Date: Wed Aug 29 03:38:33 2007
New Revision: 570741

URL: http://svn.apache.org/viewvc?rev=570741&view=rev
Log:
Hook up the jcl over slf4j for supporting any kernel bits we use from the start command
Cleaned up other command support classes to use the proper slf4j api

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
    geronimo/server/trunk/modules/geronimo-commands/pom.xml
    geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AntBuilder.java
    geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ProcessLauncher.groovy
    geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ServerProxy.java
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/pom.xml?rev=570741&r1=570740&r2=570741&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/pom.xml Wed Aug 29 03:38:33
2007
@@ -57,6 +57,11 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl104-over-slf4j</artifactId>
+        </dependency>
             
         <!-- Command impl modules -->
         

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml?rev=570741&r1=570740&r2=570741&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5-gshell/src/main/assembly/bin.xml
Wed Aug 29 03:38:33 2007
@@ -158,6 +158,7 @@
             <includes>
                 <include>org.slf4j:slf4j-api</include>
                 <include>org.slf4j:slf4j-log4j12</include>
+                <include>org.slf4j:jcl104-over-slf4j</include>
                 <include>org.apache.geronimo.gshell:gshell-api</include>
                 <include>org.apache.geronimo.gshell:gshell-cli</include>
                 <include>org.apache.geronimo.gshell:gshell-core</include>

Modified: geronimo/server/trunk/modules/geronimo-commands/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/pom.xml?rev=570741&r1=570740&r2=570741&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-commands/pom.xml Wed Aug 29 03:38:33 2007
@@ -37,7 +37,20 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+        
+        <!--
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        -->
         
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>

Modified: geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AntBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AntBuilder.java?rev=570741&r1=570740&r2=570741&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AntBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/AntBuilder.java
Wed Aug 29 03:38:33 2007
@@ -25,7 +25,7 @@
 import org.apache.tools.ant.BuildLogger;
 import org.apache.tools.ant.DefaultLogger;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 import org.apache.geronimo.gshell.console.IO;
 
@@ -37,11 +37,11 @@
 public class AntBuilder
     extends groovy.util.AntBuilder
 {
-    public AntBuilder(final Log log, final IO io) {
+    public AntBuilder(final Logger log, final IO io) {
         super(createProject(log, io));
     }
 
-    protected static Project createProject(final Log log, final IO io) {
+    protected static Project createProject(final Logger log, final IO io) {
         Project project = new Project();
         project.addBuildListener(new OutputAdapter(log, io));
         project.init();
@@ -53,11 +53,11 @@
     private static class OutputAdapter
         extends DefaultLogger
     {
-        private Log log;
+        private Logger log;
         
         private IO io;
 
-        public OutputAdapter(final Log log, final IO io) {
+        public OutputAdapter(final Logger log, final IO io) {
             assert log != null;
             assert io != null;
             

Modified: geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ProcessLauncher.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ProcessLauncher.groovy?rev=570741&r1=570740&r2=570741&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ProcessLauncher.groovy
(original)
+++ geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ProcessLauncher.groovy
Wed Aug 29 03:38:33 2007
@@ -23,8 +23,8 @@
 
 import org.apache.commons.lang.time.StopWatch
 
-import org.apache.commons.logging.Log
-import org.apache.commons.logging.LogFactory
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import org.apache.geronimo.gshell.console.IO
 
@@ -35,7 +35,7 @@
  */
 class ProcessLauncher
 {
-    private Log log = LogFactory.getLog(this.class)
+    private Logger log = LoggerFactory.getLogger(this.class)
     
     IO io
     

Modified: geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ServerProxy.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ServerProxy.java?rev=570741&r1=570740&r2=570741&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ServerProxy.java
(original)
+++ geronimo/server/trunk/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/ServerProxy.java
Wed Aug 29 03:38:33 2007
@@ -41,8 +41,8 @@
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.PersistentConfigurationList;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Helper to communicate with a remote server via JMX.
@@ -51,7 +51,7 @@
  */
 public class ServerProxy
 {
-    private static final Log log = LogFactory.getLog(ServerProxy.class);
+    private static final Logger log = LoggerFactory.getLogger(ServerProxy.class);
 
     private JMXServiceURL url;
 

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=570741&r1=570740&r2=570741&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Aug 29 03:38:33 2007
@@ -306,7 +306,7 @@
             <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
-                <version>0.9.9</version>
+                <version>0.9.91</version>
             </dependency>
 
             <dependency>
@@ -470,7 +470,13 @@
                 <artifactId>slf4j-log4j12</artifactId>
                 <version>1.4.3</version>
             </dependency>
-
+            
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>jcl104-over-slf4j</artifactId>
+                <version>1.4.3</version>
+            </dependency>
+            
             <dependency>
                 <groupId>mockobjects</groupId>
                 <artifactId>mockobjects-jdk1.4-j2ee1.3</artifactId>



Mime
View raw message