geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r411410 - in /geronimo/sandbox/gshell/trunk: gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/ gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshel...
Date Sat, 03 Jun 2006 09:05:41 GMT
Author: jdillon
Date: Sat Jun  3 02:05:40 2006
New Revision: 411410

URL: http://svn.apache.org/viewvc?rev=411410&view=rev
Log:
Move generated parser sources to package dir for eclipse support
Move help and set to builtins

Added:
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java
      - copied, changed from r411395, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/HelpCommand.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SetCommand.java
      - copied, changed from r411406, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/SetCommand.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/help.properties
      - copied, changed from r411395, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/help.properties
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/set.properties
      - copied, changed from r411395, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/set.properties
Removed:
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/HelpCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/SetCommand.java
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/help.properties
    geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/set.properties
Modified:
    geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/exit.properties

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=411410&r1=411409&r2=411410&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Sat Jun  3 02:05:40 2006
@@ -102,6 +102,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>remove-overrides</id>
                         <phase>generate-sources</phase>
                         <configuration>
                             <tasks>
@@ -114,6 +115,33 @@
                                 </delete>
                             </tasks>
                         </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    
+                    <!-- Need to put these into a package so that Eclipse does not freak
out -->
+                    <execution>
+                        <id>move-to-package</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="${pom.basedir}/target/generated-sources/jjtree/org/apache/geronimo/gshell/commandline/parser"/>
+                                <move todir="${pom.basedir}/target/generated-sources/jjtree/org/apache/geronimo/gshell/commandline/parser">
+                                    <fileset dir="${pom.basedir}/target/generated-sources/jjtree">
+                                        <include name="*.java"/>
+                                    </fileset>
+                                </move>
+                                
+                                <mkdir dir="${pom.basedir}/target/generated-sources/javacc/org/apache/geronimo/gshell/commandline/parser"/>
+                                <move todir="${pom.basedir}/target/generated-sources/javacc/org/apache/geronimo/gshell/commandline/parser">
+                                    <fileset dir="${pom.basedir}/target/generated-sources/javacc">
+                                        <include name="*.java"/>
+                                    </fileset>
+                                </move>
+                            </tasks>
+                        </configuration>
+                        
                         <goals>
                             <goal>run</goal>
                         </goals>

Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java
(from r411395, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/HelpCommand.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java&p1=geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/HelpCommand.java&r1=411395&r2=411410&rev=411410&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/HelpCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/HelpCommand.java
Sat Jun  3 02:05:40 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.geronimo.gshell.commands.standard;
+package org.apache.geronimo.gshell.builtins;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;

Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SetCommand.java
(from r411406, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/SetCommand.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SetCommand.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SetCommand.java&p1=geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/SetCommand.java&r1=411406&r2=411410&rev=411410&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/java/org/apache/geronimo/gshell/commands/standard/SetCommand.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/builtins/SetCommand.java
Sat Jun  3 02:05:40 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.geronimo.gshell.commands.standard;
+package org.apache.geronimo.gshell.builtins;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/exit.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/exit.properties?rev=411410&r1=411409&r2=411410&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/exit.properties
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/exit.properties
Sat Jun  3 02:05:40 2006
@@ -8,4 +8,4 @@
 
 aliases=quit,bye
 
-category=standard
+category=builtins

Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/help.properties
(from r411395, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/help.properties)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/help.properties?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/help.properties&p1=geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/help.properties&r1=411395&r2=411410&rev=411410&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/help.properties
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/help.properties
Sat Jun  3 02:05:40 2006
@@ -2,10 +2,10 @@
 ## $Id$
 ##
 
-class=org.apache.geronimo.gshell.commands.standard.HelpCommand
+class=org.apache.geronimo.gshell.builtins.HelpCommand
 
 name=help
 
 #aliases=
 
-category=standard
+category=builtins

Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/set.properties
(from r411395, geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/set.properties)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/set.properties?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/set.properties&p1=geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/set.properties&r1=411395&r2=411410&rev=411410&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-commands/gshell-standard-commands/src/main/resources/META-INF/org.apache.geronimo.gshell.command/set.properties
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/resources/META-INF/org.apache.geronimo.gshell.command/set.properties
Sat Jun  3 02:05:40 2006
@@ -2,10 +2,10 @@
 ## $Id$
 ##
 
-class=org.apache.geronimo.gshell.commands.standard.SetCommand
+class=org.apache.geronimo.gshell.builtins.SetCommand
 
 name=set
 
 #aliases=
 
-category=standard
+category=builtins



Mime
View raw message