geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r705563 - in /geronimo/gshell/trunk: ./ gshell-assembly/src/main/underlay/etc/ gshell-model/src/main/java/org/apache/geronimo/gshell/model/ gshell-support/ gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/ gs...
Date Fri, 17 Oct 2008 11:31:43 GMT
Author: jdillon
Date: Fri Oct 17 04:31:41 2008
New Revision: 705563

URL: http://svn.apache.org/viewvc?rev=705563&view=rev
Log:
Drop gshell-plexus, move the sole class to gshell-artifact

Added:
    geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Slf4jLoggingManager.java
  (contents, props changed)
      - copied, changed from r705561, geronimo/gshell/trunk/gshell-support/gshell-plexus/src/main/java/org/apache/geronimo/gshell/plexus/Slf4jLoggingManager.java
Removed:
    geronimo/gshell/trunk/gshell-support/gshell-plexus/
Modified:
    geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java
    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-assembly/src/main/underlay/etc/application.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml?rev=705563&r1=705562&r2=705563&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml (original)
+++ geronimo/gshell/trunk/gshell-assembly/src/main/underlay/etc/application.xml Fri Oct 17
04:31:41 2008
@@ -90,4 +90,5 @@
             </list>
         </property>
     </bean>
+
 </beans>
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java?rev=705563&r1=705562&r2=705563&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/Model.java
Fri Oct 17 04:31:41 2008
@@ -26,37 +26,6 @@
  */
 public abstract class Model
     extends Element
-    // implements MarshallerAware
 {
-    // private transient Marshaller marshaller;
-
-    /*
-    @XStreamAlias("version")
-    @XStreamAsAttribute
-    private String modelVersion;
-    */
-
-    /*
-    public Marshaller getMarshaller() {
-    	if (marshaller == null) {
-    		throw new IllegalStateException("Marshaller is not bound");
-    	}
-    	
-        return marshaller;
-    }
-
-    public void setMarshaller(final Marshaller marshaller) {
-        this.marshaller = marshaller;
-    }
-    */
-
-    /*
-    public String getModelVersion() {
-        return modelVersion;
-    }
-
-    public void setModelVersion(final String modelVersion) {
-        this.modelVersion = modelVersion;
-    }
-    */
+    // ???
 }
\ No newline at end of file

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=705563&r1=705562&r2=705563&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
Fri Oct 17 04:31:41 2008
@@ -19,7 +19,7 @@
 
 package org.apache.geronimo.gshell.artifact;
 
-import org.apache.geronimo.gshell.plexus.Slf4jLoggingManager;
+import org.apache.geronimo.gshell.artifact.Slf4jLoggingManager;
 import org.codehaus.plexus.DefaultContainerConfiguration;
 import org.codehaus.plexus.DefaultPlexusContainer;
 import org.codehaus.plexus.PlexusContainer;

Copied: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Slf4jLoggingManager.java
(from r705561, geronimo/gshell/trunk/gshell-support/gshell-plexus/src/main/java/org/apache/geronimo/gshell/plexus/Slf4jLoggingManager.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Slf4jLoggingManager.java?p2=geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Slf4jLoggingManager.java&p1=geronimo/gshell/trunk/gshell-support/gshell-plexus/src/main/java/org/apache/geronimo/gshell/plexus/Slf4jLoggingManager.java&r1=705561&r2=705563&rev=705563&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-plexus/src/main/java/org/apache/geronimo/gshell/plexus/Slf4jLoggingManager.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Slf4jLoggingManager.java
Fri Oct 17 04:31:41 2008
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.plexus;
+package org.apache.geronimo.gshell.artifact;
 
 import org.codehaus.plexus.logging.AbstractLogger;
 import org.codehaus.plexus.logging.BaseLoggerManager;

Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Slf4jLoggingManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Slf4jLoggingManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-support/gshell-artifact/src/main/java/org/apache/geronimo/gshell/artifact/Slf4jLoggingManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gshell/trunk/gshell-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/pom.xml?rev=705563&r1=705562&r2=705563&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-support/pom.xml Fri Oct 17 04:31:41 2008
@@ -51,7 +51,6 @@
         <module>gshell-event</module>
         <module>gshell-prefs</module>
         <module>gshell-spring</module>
-        <module>gshell-plexus</module>
         <module>gshell-interpolation</module>
         <module>gshell-console</module>
         <module>gshell-vfs</module>

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=705563&r1=705562&r2=705563&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Fri Oct 17 04:31:41 2008
@@ -173,12 +173,6 @@
 
             <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>
                 <artifactId>gshell-spring</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>



Mime
View raw message