geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r694299 - in /geronimo/gshell/trunk: gshell-support/gshell-artifact/pom.xml gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java gshell-support/pom.xml pom.xml
Date Thu, 11 Sep 2008 15:28:01 GMT
Author: jdillon
Date: Thu Sep 11 08:27:58 2008
New Revision: 694299

URL: http://svn.apache.org/viewvc?rev=694299&view=rev
Log:
Re-enable gshell-plexus, install logging adapter into plexus container used to load the ArtifactManager

Modified:
    geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml
    geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java
    geronimo/gshell/trunk/gshell-support/pom.xml
    geronimo/gshell/trunk/pom.xml

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml?rev=694299&r1=694298&r2=694299&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/pom.xml Thu Sep 11 08:27:58 2008
@@ -60,20 +60,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
+            <groupId>org.apache.geronimo.gshell.support</groupId>
+            <artifactId>gshell-plexus</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-component-annotations</artifactId>
-        </dependency>
-
+        
         <dependency>
             <groupId>org.apache.maven.artifact</groupId>
             <artifactId>maven-artifact</artifactId>

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java?rev=694299&r1=694298&r2=694299&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/ArtifactManagerFactory.java
Thu Sep 11 08:27:58 2008
@@ -27,6 +27,7 @@
 import org.codehaus.plexus.classworlds.ClassWorld;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.apache.geronimo.gshell.plexus.Slf4jLoggingManager;
 
 import javax.annotation.PostConstruct;
 
@@ -60,6 +61,8 @@
 
         container = new DefaultPlexusContainer(config);
 
+        container.setLoggerManager(new Slf4jLoggingManager());
+
         log.debug("Constructed Plexus container: {}", container);
     }
     

Modified: geronimo/gshell/trunk/gshell-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/pom.xml?rev=694299&r1=694298&r2=694299&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/pom.xml Thu Sep 11 08:27:58 2008
@@ -49,9 +49,7 @@
         <module>gshell-io</module>
         <module>gshell-prefs</module>
         <module>gshell-spring</module>
-        <!--
         <module>gshell-plexus</module>
-        -->
         <module>gshell-interpolation</module>
         <module>gshell-url</module>
         <module>gshell-console</module>

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=694299&r1=694298&r2=694299&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Thu Sep 11 08:27:58 2008
@@ -448,13 +448,11 @@
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>
 
-            <!--
             <dependency>
                 <groupId>org.apache.geronimo.gshell.support</groupId>
                 <artifactId>gshell-plexus</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>
-            -->
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell.support</groupId>



Mime
View raw message