geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r571549 - in /geronimo/sandbox/gshell/trunk: ./ gshell-assembly/ gshell-builtins/ gshell-builtins/src/main/grammar/ gshell-builtins/src/main/java/org/apache/geronimo/gshell/ gshell-builtins/src/main/java/org/apache/geronimo/gshell/command/ ...
Date Fri, 31 Aug 2007 19:18:43 GMT
Author: jdillon
Date: Fri Aug 31 12:18:38 2007
New Revision: 571549

URL: http://svn.apache.org/viewvc?rev=571549&view=rev
Log:
Refactored the builtin commands to separate module

Removed:
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/grammar/
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/java/org/apache/geronimo/gshell/CompletionHandlerImpl.java
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/java/org/apache/geronimo/gshell/ErrorNotification.java
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/java/org/apache/geronimo/gshell/ExitNotification.java
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/java/org/apache/geronimo/gshell/InteractiveShell.java
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/java/org/apache/geronimo/gshell/Shell.java
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/java/org/apache/geronimo/gshell/command/
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/java/org/apache/geronimo/gshell/commandline/
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/java/org/apache/geronimo/gshell/console/
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/java/org/apache/geronimo/gshell/package-info.java
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/resources/META-INF/org.apache.geronimo.gshell.console.ConsoleFactory/
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/test/java/org/apache/geronimo/gshell/MockShell.java
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/test/java/org/apache/geronimo/gshell/ShellTest.java
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/test/java/org/apache/geronimo/gshell/command/
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/test/java/org/apache/geronimo/gshell/commandline/
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/test/java/org/apache/geronimo/gshell/console/
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/test/resources/log4j.properties
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/test/resources/org/apache/geronimo/gshell/command/
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/
Modified:
    geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-builtins/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/resources/META-INF/plexus/components.xml
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml
    geronimo/sandbox/gshell/trunk/pom.xml

Modified: geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml?rev=571549&r1=571548&r2=571549&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml Fri Aug 31 12:18:38 2007
@@ -55,6 +55,12 @@
 
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
+            <artifactId>gshell-builtins</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.gshell</groupId>
             <artifactId>gshell-standard-commands</artifactId>
             <version>${pom.version}</version>
         </dependency>

Modified: geronimo/sandbox/gshell/trunk/gshell-builtins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-builtins/pom.xml?rev=571549&r1=571548&r2=571549&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-builtins/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-builtins/pom.xml Fri Aug 31 12:18:38 2007
@@ -30,85 +30,15 @@
         <version>1.0-alpha-1-SNAPSHOT</version>
     </parent>
     
-    <artifactId>gshell-core</artifactId>
-    <name>GShell Core</name>
+    <artifactId>gshell-builtins</artifactId>
+    <name>GShell Built-in Commands</name>
     
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-api</artifactId>
+            <artifactId>gshell-core</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-diet-plexus-utils</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-container-default</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-expression-evaluator</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.gshell</groupId>
-                <artifactId>javacc-maven-plugin</artifactId>
-                <version>${pom.version}</version>
-                <executions>
-                    <execution>
-                        <id>jjtree</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>jjtree</goal>
-                        </goals>
-                        <configuration>
-                            <grammars>
-                                <directory>${project.basedir}/src/main/grammar</directory>
-                                <includes>
-                                    <include>*.jjt</include>
-                                </includes>
-                            </grammars>
-                        </configuration>
-                    </execution>
-                    
-                    <execution>
-                        <id>javacc</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>javacc</goal>
-                        </goals>
-                        <configuration>
-                            <grammars>
-                                <directory>${project.build.directory}/generated-sources/jjtree</directory>
-                                <includes>
-                                    <include>*.jj</include>
-                                </includes>
-                            </grammars>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
     
 </project>

Modified: geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/resources/META-INF/plexus/components.xml?rev=571549&r1=571548&r2=571549&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-builtins/src/main/resources/META-INF/plexus/components.xml
Fri Aug 31 12:18:38 2007
@@ -23,108 +23,6 @@
 <component-set>
     <components>
         <component>
-            <role>org.apache.geronimo.gshell.Shell</role>
-            <role-hint>default</role-hint>
-            <implementation>org.apache.geronimo.gshell.Shell</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-            <requirements>
-                <requirement>
-                    <role>org.codehaus.plexus.PlexusContainer</role>
-                    <field-name>container</field-name>
-                </requirement>
-                <requirement>
-                    <role>org.apache.geronimo.gshell.command.CommandManager</role>
-                    <field-name>commandManager</field-name>
-                </requirement>
-                <requirement>
-                    <role>org.apache.geronimo.gshell.console.IO</role>
-                    <field-name>io</field-name>
-                </requirement>
-                <requirement>
-                    <role>org.apache.geronimo.gshell.commandline.CommandLineBuilder</role>
-                    <field-name>commandLineBuilder</field-name>
-                </requirement>
-            </requirements>
-        </component>
-        
-        <component>
-            <role>org.apache.geronimo.gshell.command.CommandManager</role>
-            <role-hint>default</role-hint>
-            <implementation>org.apache.geronimo.gshell.command.CommandManagerImpl</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-            <requirements>
-                <requirement>
-                    <role>org.codehaus.plexus.PlexusContainer</role>
-                    <field-name>container</field-name>
-                </requirement>
-            </requirements>
-        </component>
-
-        <component>
-            <role>org.apache.geronimo.gshell.commandline.parser.CommandLineParser</role>
-            <role-hint>default</role-hint>
-            <implementation>org.apache.geronimo.gshell.commandline.parser.CommandLineParser</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-        </component>
-
-        <component>
-            <role>org.apache.geronimo.gshell.commandline.CommandLineBuilder</role>
-            <role-hint>default</role-hint>
-            <implementation>org.apache.geronimo.gshell.commandline.CommandLineBuilder</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-            <requirements>
-                <requirement>
-                    <role>org.codehaus.plexus.PlexusContainer</role>
-                    <field-name>container</field-name>
-                </requirement>
-                <requirement>
-                    <role>org.apache.geronimo.gshell.commandline.parser.CommandLineParser</role>
-                    <field-name>parser</field-name>
-                </requirement>
-            </requirements>
-        </component>
-
-        <!--
-        HACK: Just make it work for now...
-        -->
-        <component>
-            <role>org.apache.geronimo.gshell.commandline.ExecutingVisitor</role>
-            <role-hint>default</role-hint>
-            <implementation>org.apache.geronimo.gshell.commandline.ExecutingVisitor</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-            <requirements>
-                <requirement>
-                    <role>org.apache.geronimo.gshell.Shell</role>
-                    <field-name>shell</field-name>
-                </requirement>
-                <requirement>
-                    <role>org.codehaus.plexus.evaluator.ExpressionEvaluator</role>
-                    <field-name>evaluator</field-name>
-                </requirement>
-            </requirements>
-        </component>
-
-        <!--
-        HACK: This is defs not right...
-        -->
-        <component>
-            <role>org.apache.geronimo.gshell.console.IO</role>
-            <role-hint>default</role-hint>
-            <implementation>org.apache.geronimo.gshell.console.IO</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-        </component>
-
-        <!--
-        Builtin Commands
-        -->
-
-        <component>
             <role>org.apache.geronimo.gshell.command.Command</role>
             <role-hint>exit</role-hint>
             <implementation>org.apache.geronimo.gshell.builtins.ExitCommand</implementation>

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml?rev=571549&r1=571548&r2=571549&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/plexus/components.xml
Fri Aug 31 12:18:38 2007
@@ -119,55 +119,5 @@
             <instantiation-strategy>singleton</instantiation-strategy>
             <lifecycle-handler>plexus</lifecycle-handler>
         </component>
-
-        <!--
-        Builtin Commands
-        -->
-
-        <component>
-            <role>org.apache.geronimo.gshell.command.Command</role>
-            <role-hint>exit</role-hint>
-            <implementation>org.apache.geronimo.gshell.builtins.ExitCommand</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-        </component>
-
-        <component>
-            <role>org.apache.geronimo.gshell.command.Command</role>
-            <role-hint>help</role-hint>
-            <implementation>org.apache.geronimo.gshell.builtins.HelpCommand</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-            <requirements>
-                <requirement>
-                    <role>org.apache.geronimo.gshell.command.CommandManager</role>
-                    <field-name>commandManager</field-name>
-                </requirement>
-            </requirements>
-        </component>
-
-        <component>
-            <role>org.apache.geronimo.gshell.command.Command</role>
-            <role-hint>set</role-hint>
-            <implementation>org.apache.geronimo.gshell.builtins.SetCommand</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-        </component>
-        
-        <component>
-            <role>org.apache.geronimo.gshell.command.Command</role>
-            <role-hint>source</role-hint>
-            <implementation>org.apache.geronimo.gshell.builtins.SourceCommand</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-        </component>
-
-        <component>
-            <role>org.apache.geronimo.gshell.command.Command</role>
-            <role-hint>unset</role-hint>
-            <implementation>org.apache.geronimo.gshell.builtins.UnsetCommand</implementation>
-            <instantiation-strategy>singleton</instantiation-strategy>
-            <lifecycle-handler>plexus</lifecycle-handler>
-        </component>
     </components>
 </component-set>

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=571549&r1=571548&r2=571549&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Fri Aug 31 12:18:38 2007
@@ -330,6 +330,7 @@
         <module>gshell-parser</module>
         <module>gshell-api</module>
         <module>gshell-core</module>
+        <module>gshell-builtins</module>
         <module>gshell-layout</module>
         <module>gshell-cli</module>
         <module>gshell-commands</module>



Mime
View raw message