geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r631900 - in /geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model: GroupNode.java Layout.java
Date Thu, 28 Feb 2008 09:29:54 GMT
Author: jdillon
Date: Thu Feb 28 01:29:41 2008
New Revision: 631900

URL: http://svn.apache.org/viewvc?rev=631900&view=rev
Log:
Update to use new XStream annotation processor thingy

Modified:
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/GroupNode.java
    geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/Layout.java

Modified: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/GroupNode.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/GroupNode.java?rev=631900&r1=631899&r2=631900&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/GroupNode.java
(original)
+++ geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/GroupNode.java
Thu Feb 28 01:29:41 2008
@@ -24,7 +24,6 @@
 import java.util.Set;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import org.apache.geronimo.gshell.layout.LayoutManager;
 
 /**
  * A group of nodes.

Modified: geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/Layout.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/Layout.java?rev=631900&r1=631899&r2=631900&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/Layout.java
(original)
+++ geronimo/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/Layout.java
Thu Feb 28 01:29:41 2008
@@ -22,9 +22,7 @@
 import java.io.InputStream;
 
 import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.annotations.Annotations;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.core.JVM;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.thoughtworks.xstream.io.xml.XppDriver;
 
@@ -51,11 +49,12 @@
         try {
             Class.forName("org.xmlpull.mxp1.MXParser");
             xs = new XStream(new XppDriver());
-        } catch (ClassNotFoundException e) {
+        }
+        catch (ClassNotFoundException ignore) {
             xs = new XStream(new DomDriver());
         }
 
-        Annotations.configureAliases(xs, Layout.class, GroupNode.class, CommandNode.class,
AliasNode.class);
+        xs.processAnnotations(new Class[] { Layout.class, GroupNode.class, CommandNode.class,
AliasNode.class });
 
         return xs;
     }



Mime
View raw message