[jboss-cvs] JBossAS SVN: r79489 - 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-14 15:05:10 -0400 (Tue, 14 Oct 2008)
New Revision: 79489

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ContextXMLObjectModelFactory.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerXMLObjectModelFactory.java
Log:
- Fix bugs parsing realms and connectors.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ContextXMLObjectModelFactory.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ContextXMLObjectModelFactory.java	2008-10-14 18:41:20 UTC (rev 79488)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ContextXMLObjectModelFactory.java	2008-10-14 19:05:10 UTC (rev 79489)
@@ -126,6 +126,9 @@
          // <Parameter/>
          else if("Parameter".equals(localName))
             child = new ParameterMetaData();
+         // <Realm/>
+         else if("Realm".equals(localName))
+            child = new RealmMetaData();
          // <SessionCookie/>
          else if("SessionCookie".equals(localName))
          {

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-14 18:41:20 UTC (rev 79488)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerXMLObjectModelFactory.java	2008-10-14 19:05:10 UTC (rev 79489)
@@ -167,7 +167,12 @@
       {
          // <Connector/>         
          if("Connector".equals(localName))
-            child = new ConnectorMetaData();
+         {
+            ConnectorMetaData connector = new ConnectorMetaData();
+            connector.setProtocol(getAttribute("protocol", excludeAttributes, attrs));
+            connector.setExecutor(getAttribute("executor", excludeAttributes, attrs));
+            child = connector;
+         }
          // <Engine/>
          else if("Engine".equals(localName))
          {
@@ -190,7 +195,7 @@
       
       if(parent instanceof EngineMetaData)
       {
-         // <Valve/>         
+         // <Valve/>
          if("Valve".equals(localName))
             child = new ValveMetaData();
          // <Host/>
@@ -206,6 +211,9 @@
          // <Listener/>
          else if("Listener".equals(localName))
             child = new ListenerMetaData();
+         // <Realm/>
+         else if("Realm".equals(localName))
+            child = new RealmMetaData();
       }
       
       if(parent instanceof HostMetaData)
@@ -216,6 +224,9 @@
          // <Listener/>
          else if("Listener".equals(localName))
             child = new ListenerMetaData();
+         // <Realm/>
+         else if("Realm".equals(localName))
+            child = new RealmMetaData();
       }
       
       // Handle attributes for AnyXmlMetaData