geronimo-scm mailing list archives

Author: jdillon
Date: Fri Sep  7 13:34:06 2007
New Revision: 573692

URL: http://svn.apache.org/viewvc?rev=573692&view=rev
Log:
Fix up xml handling of layout

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

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java?rev=573692&r1=573691&r2=573692&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/LayoutManagerImpl.java
Fri Sep  7 13:34:06 2007
@@ -62,10 +62,11 @@
         // TODO: Move to a layout loader to abstract how this is loaded and allow for better
configuration
         //
         
-        URL url = null;
+        URL url;
         try {
             url = new File(info.getHomeDir(), "etc/layout.xml").toURI().toURL();
-        } catch (MalformedURLException e) {
+        }
+        catch (MalformedURLException e) {
             throw new InitializationException("Invalid URL for layout configuration", e);
         }
 
@@ -87,8 +88,6 @@
         Layout layout;
         try {
             layout = Layout.fromXML(input);
-            
-            assert layout != null;
         }
         finally {
            input.close();

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/Layout.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/Layout.java?rev=573692&r1=573691&r2=573692&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/Layout.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/layout/model/Layout.java
Fri Sep  7 13:34:06 2007
@@ -60,7 +60,8 @@
     
     private static XStream createXStream() {
         XStream xs = new XStream(new DomDriver());
-        Annotations.configureAliases(xs, Layout.class, CommandNode.class, AliasNode.class);
+        
+        Annotations.configureAliases(xs, Layout.class, GroupNode.class, CommandNode.class,
AliasNode.class);
 
         return xs;
     }