geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r659613 - in /geronimo/gshell/trunk: gshell-core/pom.xml gshell-model/pom.xml gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ModelRoot.java
Date Fri, 23 May 2008 18:11:36 GMT
Author: jdillon
Date: Fri May 23 11:11:35 2008
New Revision: 659613

URL: http://svn.apache.org/viewvc?rev=659613&view=rev
Log:
gshell-core now has no direct dep on xstream, all handled in gshell-model
Changed the model root version to modelVersion to prevent clashes

Modified:
    geronimo/gshell/trunk/gshell-core/pom.xml
    geronimo/gshell/trunk/gshell-model/pom.xml
    geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ModelRoot.java

Modified: geronimo/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/pom.xml?rev=659613&r1=659612&r2=659613&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-core/pom.xml Fri May 23 11:11:35 2008
@@ -72,20 +72,7 @@
             <groupId>commons-jexl</groupId>
             <artifactId>commons-jexl</artifactId>
         </dependency>
-        
-        <!-- Required for layout bits that have not yet migrated to gshell-model -->
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-        </dependency>
-        
-        <!-- Not really sure this is needed, but GSHELL-113 thinks it is -->
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3</artifactId>
-            <scope>test</scope>
-        </dependency>
-        
+
         <!-- Required for commons-jexl usage -->
         <dependency>
             <groupId>org.slf4j</groupId>

Modified: geronimo/gshell/trunk/gshell-model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/pom.xml?rev=659613&r1=659612&r2=659613&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-model/pom.xml Fri May 23 11:11:35 2008
@@ -47,6 +47,13 @@
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
         </dependency>
+
+        <!-- Not really sure this is needed, but GSHELL-113 thinks it is -->
+        <dependency>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ModelRoot.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ModelRoot.java?rev=659613&r1=659612&r2=659613&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ModelRoot.java
(original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/common/ModelRoot.java
Fri May 23 11:11:35 2008
@@ -30,13 +30,13 @@
     extends ModelElement
 {
     @XStreamAsAttribute
-    private String version;
+    private String modelVersion;
 
-    public String getVersion() {
-        return version;
+    public String getModelVersion() {
+        return modelVersion;
     }
 
-    public void setVersion(final String version) {
-        this.version = version;
+    public void setModelVersion(final String modelVersion) {
+        this.modelVersion = modelVersion;
     }
 }
\ No newline at end of file



Mime
View raw message