[jboss-cvs] JBossAS SVN: r79397 - trunk/tomcat/src/main/org/jboss/web/tomcat/metadata.

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2008-10-13 10:40:36 -0400 (Mon, 13 Oct 2008)
New Revision: 79397

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerXMLObjectModelFactory.java
Log:
- Add support for most missing elements.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerXMLObjectModelFactory.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerXMLObjectModelFactory.java	2008-10-13 14:39:07 UTC (rev 79396)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerXMLObjectModelFactory.java	2008-10-13 14:40:36 UTC (rev 79397)
@@ -94,6 +94,55 @@
          }
       }
       
+      if(parent instanceof EngineMetaData)
+      {
+         EngineMetaData metaData = (EngineMetaData) parent;
+         if(child instanceof HostMetaData)
+         {
+            if(metaData.getHosts() == null)
+               metaData.setHosts(new ArrayList<HostMetaData>());
+            metaData.getHosts().add((HostMetaData) child);
+         }
+         else if(child instanceof ListenerMetaData)
+         {
+            if(metaData.getListeners() == null)
+               metaData.setListeners(new ArrayList<ListenerMetaData>());
+            metaData.getListeners().add((ListenerMetaData) child);
+         }
+         else if(child instanceof ValveMetaData)
+         {
+            if(metaData.getValves() == null)
+               metaData.setValves(new ArrayList<ValveMetaData>());
+            metaData.getValves().add((ValveMetaData) child);
+         }
+         else if(child instanceof RealmMetaData)
+         {
+            metaData.setRealm((RealmMetaData) child);
+         }
+      }
+      
+      if(parent instanceof HostMetaData)
+      {
+         HostMetaData metaData = (HostMetaData) parent;
+         if(child instanceof ListenerMetaData)
+         {
+            if(metaData.getListeners() == null)
+               metaData.setListeners(new ArrayList<ListenerMetaData>());
+            metaData.getListeners().add((ListenerMetaData) child);
+         }
+         else if(child instanceof ValveMetaData)
+         {
+            if(metaData.getValves() == null)
+               metaData.setValves(new ArrayList<ValveMetaData>());
+            metaData.getValves().add((ValveMetaData) child);
+         }
+         else if(child instanceof RealmMetaData)
+         {
+            metaData.setRealm((RealmMetaData) child);
+         }
+         // FIXME: Alias !
+      }
+      
       // ... 
    }
 
@@ -144,12 +193,36 @@
       
       if(parent instanceof EngineMetaData)
       {
-         // TODO
+         // <Valve/>         
+         if("Valve".equals(localName))
+            child = new ValveMetaData();
+         // <Host/>
+         else if("Host".equals(localName))
+         {
+            HostMetaData host = new HostMetaData();
+            
+            host.setName(getAttribute("name", excludeAttributes, attrs));
+            host.setAppBase(getAttribute("appBase", excludeAttributes, attrs));
+            // FIXME: xmlValidation and xmlNamespaceAware
+            
+            child = host;
+            
+         }
+         // <Listener/>
+         else if("Listener".equals(localName))
+            child = new ListenerMetaData();
       }
       
       if(parent instanceof HostMetaData)
       {
-         // TODO
+         // <Valve/>         
+         if("Valve".equals(localName))
+            child = new ValveMetaData();
+         // <Listener/>
+         else if("Listener".equals(localName))
+            child = new ListenerMetaData();
+         // <Alias/>
+         // FIXME !
       }
       
       // Handle attributes for AnyXmlMetaData