You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/05/30 15:26:49 UTC

svn commit: r661709 - in /geronimo/gshell/trunk: ./ gshell-api/gshell-command-annotation/ gshell-api/gshell-command-annotation/src/ gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/ gshell-api/gshell-command-annotation/src/...

Author: jdillon
Date: Fri May 30 06:26:48 2008
New Revision: 661709

URL: http://svn.apache.org/viewvc?rev=661709&view=rev
Log:
More moving shit around

Added:
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/pom.xml
      - copied, changed from r661701, geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/
      - copied from r661701, geronimo/gshell/trunk/gshell-api/gshell-command/src/
    geronimo/gshell/trunk/gshell-api/gshell-shell/pom.xml
      - copied, changed from r661701, geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml
    geronimo/gshell/trunk/gshell-api/gshell-shell/src/
      - copied from r661701, geronimo/gshell/trunk/gshell-api/gshell-command/src/
Removed:
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/ErrorNotification.java
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/ExitNotification.java
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/Command.java
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/CommandContext.java
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/CommandException.java
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/CommandExecutor.java
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/CommandInfo.java
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/CommandSupport.java
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/command/Variables.java
    geronimo/gshell/trunk/gshell-api/gshell-command-annotation/src/main/java/org/apache/geronimo/gshell/shell/
    geronimo/gshell/trunk/gshell-api/gshell-command/src/main/java/org/apache/geronimo/gshell/command/annotation/
    geronimo/gshell/trunk/gshell-api/gshell-command/src/main/java/org/apache/geronimo/gshell/shell/
    geronimo/gshell/trunk/gshell-api/gshell-shell/src/main/java/org/apache/geronimo/gshell/ErrorNotification.java
    geronimo/gshell/trunk/gshell-api/gshell-shell/src/main/java/org/apache/geronimo/gshell/ExitNotification.java
    geronimo/gshell/trunk/gshell-api/gshell-shell/src/main/java/org/apache/geronimo/gshell/command/
Modified:
    geronimo/gshell/trunk/gshell-core/pom.xml
    geronimo/gshell/trunk/gshell-plugin/pom.xml
    geronimo/gshell/trunk/pom.xml

Copied: geronimo/gshell/trunk/gshell-api/gshell-command-annotation/pom.xml (from r661701, geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/gshell-command-annotation/pom.xml?p2=geronimo/gshell/trunk/gshell-api/gshell-command-annotation/pom.xml&p1=geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml&r1=661701&r2=661709&rev=661709&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-api/gshell-command-annotation/pom.xml Fri May 30 06:26:48 2008
@@ -30,28 +30,18 @@
         <version>1.0-alpha-2-SNAPSHOT</version>
     </parent>
     
-    <artifactId>gshell-command</artifactId>
-    <name>GShell API :: Command</name>
+    <artifactId>gshell-command-annotation</artifactId>
+    <name>GShell API :: Command Annotation</name>
 
     <description>
-        Profides the basic interface for GShell commands.
+        Provides annotations to facilitate descriptor generation for GShell.
     </description>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.gshell.support</groupId>
-            <artifactId>gshell-clp</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.support</groupId>
-            <artifactId>gshell-io</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>org.apache.geronimo.gshell.api</groupId>
+            <artifactId>gshell-command</artifactId>
         </dependency>
     </dependencies>
-    
+
 </project>
\ No newline at end of file

Copied: geronimo/gshell/trunk/gshell-api/gshell-shell/pom.xml (from r661701, geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-api/gshell-shell/pom.xml?p2=geronimo/gshell/trunk/gshell-api/gshell-shell/pom.xml&p1=geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml&r1=661701&r2=661709&rev=661709&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-api/gshell-command/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-api/gshell-shell/pom.xml Fri May 30 06:26:48 2008
@@ -30,28 +30,18 @@
         <version>1.0-alpha-2-SNAPSHOT</version>
     </parent>
     
-    <artifactId>gshell-command</artifactId>
-    <name>GShell API :: Command</name>
+    <artifactId>gshell-shell</artifactId>
+    <name>GShell API :: Shell</name>
 
     <description>
-        Profides the basic interface for GShell commands.
+        Profides the inteface for shells.
     </description>
-
+    
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.gshell.support</groupId>
-            <artifactId>gshell-clp</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.gshell.support</groupId>
-            <artifactId>gshell-io</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <groupId>org.apache.geronimo.gshell.api</groupId>
+            <artifactId>gshell-command</artifactId>
         </dependency>
     </dependencies>
-    
+
 </project>
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/pom.xml?rev=661709&r1=661708&r2=661709&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-core/pom.xml Fri May 30 06:26:48 2008
@@ -49,10 +49,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-command-api</artifactId>
+            <groupId>org.apache.geronimo.gshell.api</groupId>
+            <artifactId>gshell-command</artifactId>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.gshell.api</groupId>
+            <artifactId>gshell-shell</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-parser</artifactId>

Modified: geronimo/gshell/trunk/gshell-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-plugin/pom.xml?rev=661709&r1=661708&r2=661709&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-plugin/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-plugin/pom.xml Fri May 30 06:26:48 2008
@@ -49,13 +49,13 @@
         </dependency>
 		
         <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-model</artifactId>
+            <groupId>org.apache.geronimo.gshell.api</groupId>
+            <artifactId>gshell-command</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-command-api</artifactId>
+            <artifactId>gshell-model</artifactId>
         </dependency>
     </dependencies>
 

Modified: geronimo/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/pom.xml?rev=661709&r1=661708&r2=661709&view=diff
==============================================================================
--- geronimo/gshell/trunk/pom.xml (original)
+++ geronimo/gshell/trunk/pom.xml Fri May 30 06:26:48 2008
@@ -332,8 +332,20 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.gshell</groupId>
-                <artifactId>gshell-command-api</artifactId>
+                <groupId>org.apache.geronimo.gshell.api</groupId>
+                <artifactId>gshell-command</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.geronimo.gshell.api</groupId>
+                <artifactId>gshell-command-annotation</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.geronimo.gshell.api</groupId>
+                <artifactId>gshell-shell</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>
             
@@ -438,6 +450,13 @@
                 <artifactId>gshell-diet-log4j</artifactId>
                 <version>1.0-alpha-2-SNAPSHOT</version>
             </dependency>
+            
+            <!-- FIXME: Remove me!!!! -->
+            <dependency>
+                <groupId>org.apache.geronimo.gshell</groupId>
+                <artifactId>gshell-command-api</artifactId>
+                <version>1.0-alpha-2-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -461,7 +480,7 @@
         <module>gshell-support</module>
         <module>gshell-bootstrap</module>
         <module>gshell-model</module>
-        <module>gshell-command-api</module>
+        <module>gshell-api</module>
         <module>gshell-plugin</module>
         <module>gshell-parser</module>
         <module>gshell-core</module>