geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r573349 - in /geronimo/sandbox/gshell/trunk: ./ gshell-core/ gshell-core/src/main/java/org/apache/geronimo/gshell/layout/ gshell-core/src/main/mdo/ gshell-core/src/test/java/org/apache/geronimo/gshell/layout/ gshell-core/src/test/resources/...
Date Thu, 06 Sep 2007 19:52:54 GMT
Author: jdillon
Date: Thu Sep  6 12:52:54 2007
New Revision: 573349

URL: http://svn.apache.org/viewvc?rev=573349&view=rev
Log:
For now pull back the layout stuff into the core module

Added:
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/
      - copied from r573345, geronimo/sandbox/gshell/trunk/gshell-layout/src/main/java/org/apache/geronimo/gshell/layout/
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/mdo/
      - copied from r573345, geronimo/sandbox/gshell/trunk/gshell-layout/src/main/mdo/
    geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/layout/
      - copied from r573345, geronimo/sandbox/gshell/trunk/gshell-layout/src/test/java/org/apache/geronimo/gshell/layout/
    geronimo/sandbox/gshell/trunk/gshell-core/src/test/resources/org/apache/geronimo/gshell/layout/
      - copied from r573345, geronimo/sandbox/gshell/trunk/gshell-layout/src/test/resources/org/apache/geronimo/gshell/layout/
Removed:
    geronimo/sandbox/gshell/trunk/gshell-layout/
Modified:
    geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
    geronimo/sandbox/gshell/trunk/pom.xml

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=573349&r1=573348&r2=573349&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Thu Sep  6 12:52:54 2007
@@ -57,12 +57,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.gshell</groupId>
-            <artifactId>gshell-layout</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-container-default</artifactId>
         </dependency>
@@ -71,6 +65,11 @@
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-expression-evaluator</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
         
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -95,5 +94,46 @@
             </plugin>
         </plugins>
     </build>
+
+    <!--
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.modello</groupId>
+                <artifactId>modello-maven-plugin</artifactId>
+                <configuration>
+                    <version>1.0.0</version>
+                    <packageWithVersion>false</packageWithVersion>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>layout</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>xpp3-reader</goal>
+                            <goal>xpp3-writer</goal>
+                            <goal>java</goal>
+                            <goal>xsd</goal>
+                        </goals>
+                        <configuration>
+                            <model>src/main/mdo/layout.mdo</model>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>layout-site</id>
+                        <phase>pre-site</phase>
+                        <goals>
+                            <goal>xdoc</goal>
+                            <goal>xsd</goal>
+                        </goals>
+                        <configuration>
+                            <model>src/main/mdo/layout.mdo</model>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    -->
     
 </project>

Modified: geronimo/sandbox/gshell/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/pom.xml?rev=573349&r1=573348&r2=573349&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/pom.xml Thu Sep  6 12:52:54 2007
@@ -342,10 +342,6 @@
         <module>gshell-api</module>
         <module>javacc-maven-plugin</module>
         <module>gshell-parser</module>
-        <module>gshell-layout</module>
-        <!--
-        <module>gshell-plugin</module>
-        -->
         <module>gshell-core</module>
         <module>gshell-cli</module>
         <!--



Mime
View raw message