You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/09/29 12:39:21 UTC
svn commit: r700048 - in /geronimo/gshell/trunk/gshell-model: pom.xml
src/main/java/org/apache/geronimo/gshell/model/marshal/MarshallerSupport.java
src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java
Author: jdillon
Date: Mon Sep 29 03:39:20 2008
New Revision: 700048
URL: http://svn.apache.org/viewvc?rev=700048&view=rev
Log:
Use the DomDriver always, no need for xpp3
Modified:
geronimo/gshell/trunk/gshell-model/pom.xml
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/MarshallerSupport.java
geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java
Modified: geronimo/gshell/trunk/gshell-model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/pom.xml?rev=700048&r1=700047&r2=700048&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-model/pom.xml Mon Sep 29 03:39:20 2008
@@ -62,13 +62,6 @@
<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/marshal/MarshallerSupport.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/MarshallerSupport.java?rev=700048&r1=700047&r2=700048&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/MarshallerSupport.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/marshal/MarshallerSupport.java Mon Sep 29 03:39:20 2008
@@ -21,7 +21,6 @@
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.thoughtworks.xstream.io.xml.XppDriver;
import org.apache.geronimo.gshell.model.Model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,15 +52,11 @@
}
protected XStream createXStream() {
- XStream xs;
+ XStream xs = new XStream(new DomDriver());
- try {
- Class.forName("org.xmlpull.mxp1.MXParser");
- xs = new XStream(new XppDriver());
- }
- catch (ClassNotFoundException ignore) {
- xs = new XStream(new DomDriver());
- }
+ //
+ // TODO: See how we can enable schema validation when the input document has them configured.
+ //
configure(xs);
Modified: geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java?rev=700048&r1=700047&r2=700048&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/test/java/org/apache/geronimo/gshell/model/application/ApplicationMarshallerTest.java Mon Sep 29 03:39:20 2008
@@ -20,12 +20,10 @@
package org.apache.geronimo.gshell.model.application;
import junit.framework.TestCase;
-import org.apache.geronimo.gshell.model.application.DependencyArtifact;
-import org.apache.geronimo.gshell.model.application.DependencyGroup;
import org.apache.geronimo.gshell.model.common.RemoteRepository;
-import java.net.URL;
import java.io.InputStream;
+import java.net.URL;
import java.util.Properties;
/**