geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r417068 - in /geronimo/sandbox/gshell/trunk: gshell-assemblies/gshell-complete-assembly/pom.xml gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java gshell-core/pom.xml pom.xml
Date Sun, 25 Jun 2006 20:29:24 GMT
Author: jdillon
Date: Sun Jun 25 13:29:24 2006
New Revision: 417068

URL: http://svn.apache.org/viewvc?rev=417068&view=rev
Log:
Upgraded to Commons Logging 1.1, this fixes the bizzare logging failures
Exclude any other commons-logging version that gets pickued up by dependencies (1.0 and 1.0.4
were being included).
Drop picoontainer-gems dependency until/if it is ever needed

Modified:
    geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
    geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
    geronimo/sandbox/gshell/trunk/pom.xml

Modified: geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/pom.xml?rev=417068&r1=417067&r2=417068&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/pom.xml Sun Jun
25 13:29:24 2006
@@ -62,6 +62,13 @@
             <artifactId>gshell-vfs-commands</artifactId>
             <version>${pom.version}</version>
         </dependency>
+
+        <!-- Thridparty Dependencies -->
+        
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-adapters</artifactId>
+        </dependency>
     </dependencies>
     
     <build>

Modified: geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java?rev=417068&r1=417067&r2=417068&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-cli/src/main/java/org/apache/geronimo/gshell/cli/Main.java
Sun Jun 25 13:29:24 2006
@@ -69,9 +69,6 @@
         this.world = world;
 
         watch.start();
-
-        // Default is to be quiet
-        setConsoleLogLevel("WARN");
     }
 
     private void setConsoleLogLevel(final String level) {
@@ -187,11 +184,15 @@
         if (line.hasOption("quiet")) {
             setConsoleLogLevel("ERROR");
         }
-        if (line.hasOption("debug")) {
+        else if (line.hasOption("debug")) {
             setConsoleLogLevel("DEBUG");
         }
         else if (line.hasOption("verbose")) {
             setConsoleLogLevel("INFO");
+        }
+        else {
+            // Default is to be quiet
+            setConsoleLogLevel("WARN");
         }
 
         if (line.hasOption('i')) {

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=417068&r1=417067&r2=417068&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Sun Jun 25 13:29:24 2006
@@ -43,11 +43,6 @@
         </dependency>
 
         <dependency>
-            <groupId>picocontainer</groupId>
-            <artifactId>picocontainer-gems</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>commons-jexl</groupId>
             <artifactId>commons-jexl</artifactId>
             <version>1.0</version>

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=417068&r1=417067&r2=417068&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Sun Jun 25 13:29:24 2006
@@ -139,8 +139,16 @@
 
             <dependency>
                 <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.0.4</version>
+                <artifactId>commons-logging-api</artifactId>
+                <version>1.1</version>
+                <type>jar</type>
+                <scope>compile</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging-adapters</artifactId>
+                <version>1.1</version>
                 <type>jar</type>
                 <scope>compile</scope>
             </dependency>
@@ -159,6 +167,13 @@
                 <version>1.0</version>
                 <type>jar</type>
                 <scope>compile</scope>
+                <exclusions>
+                    <!-- Includes commons-logging-1.0 -->
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -236,8 +251,16 @@
                 <version>1.2</version>
                 <type>jar</type>
                 <scope>compile</scope>
+                <exclusions>
+                    <!-- Includes commons-logging-1.0.4 -->
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
+            <!--
             <dependency>
                 <groupId>picocontainer</groupId>
                 <artifactId>picocontainer-gems</artifactId>
@@ -251,13 +274,14 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            -->
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <artifactId>commons-logging</artifactId>
             <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
         </dependency>
 
         <dependency>



Mime
View raw message