geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r535408 - in /geronimo/sandbox/gshell/trunk: gshell-assemblies/gshell-complete-assembly/ gshell-assemblies/gshell-retro-assembly/ gshell-assemblies/gshell-squeezed-assembly/ gshell-assembly/ gshell-assembly/pom.xml gshell-core/pom.xml
Date Fri, 04 May 2007 23:02:57 GMT
Author: jdillon
Date: Fri May  4 16:02:56 2007
New Revision: 535408

URL: http://svn.apache.org/viewvc?view=rev&rev=535408
Log:
Drop old assemblies

Added:
    geronimo/sandbox/gshell/trunk/gshell-assembly/
      - copied from r535406, geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/
Removed:
    geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-complete-assembly/
    geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-retro-assembly/
    geronimo/sandbox/gshell/trunk/gshell-assemblies/gshell-squeezed-assembly/
Modified:
    geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-core/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?view=diff&rev=535408&r1=535406&r2=535408
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-assembly/pom.xml Fri May  4 16:02:56 2007
@@ -26,13 +26,13 @@
     
     <parent>
         <groupId>org.apache.geronimo.gshell</groupId>
-        <artifactId>gshell-assemblies</artifactId>
+        <artifactId>gshell</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <artifactId>gshell-complete-assembly</artifactId>
-    <name>GShell Assemblies :: Complete</name>
+    <artifactId>gshell-assembly</artifactId>
+    <name>GShell Assembly</name>
     <packaging>application-assembly</packaging>
     
     <dependencies>

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?view=diff&rev=535408&r1=535407&r2=535408
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Fri May  4 16:02:56 2007
@@ -72,9 +72,11 @@
                     <execution>
                         <id>jtb</id>
                         <phase>generate-sources</phase>
+                        <!--
                         <goals>
                             <goal>jtb</goal>
                         </goals>
+                        -->
                         <configuration>
                             <sourceDirectory>${pom.basedir}/src/main/grammar</sourceDirectory>
                             <outputDirectory>${pom.basedir}/target/generated-sources/jtb</outputDirectory>
@@ -98,6 +100,7 @@
                         </configuration>
                     </execution>
                     
+                    <!--
                     <execution>
                         <id>jtb-javacc</id>
                         <phase>generate-sources</phase>
@@ -109,6 +112,7 @@
                             <outputDirectory>${pom.basedir}/target/generated-sources/jtb</outputDirectory>
                         </configuration>
                     </execution>
+                    -->
                     
                     <execution>
                         <id>jjtree</id>
@@ -148,9 +152,14 @@
                             <tasks>
                                 <delete>
                                     <fileset dir="${pom.basedir}/target/generated-sources/jjtree">
-                                        <include name="ASTPlainString.java"/>
-                                        <include name="ASTQuotedString.java"/>
-                                        <include name="ASTOpaqueString.java"/>
+                                        <include name="**/ASTPlainString.java"/>
+                                        <include name="**/ASTQuotedString.java"/>
+                                        <include name="**/ASTOpaqueString.java"/>
+                                    </fileset>
+                                    <fileset dir="${pom.basedir}/target/generated-sources/javacc">
+                                        <include name="**/ASTPlainString.java"/>
+                                        <include name="**/ASTQuotedString.java"/>
+                                        <include name="**/ASTOpaqueString.java"/>
                                     </fileset>
                                 </delete>
                             </tasks>
@@ -161,6 +170,7 @@
                     </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>
@@ -193,6 +203,7 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
+                    -->
                 </executions>
             </plugin>
         </plugins>



Mime
View raw message