[jboss-cvs] JBossAS SVN: r79383 - in trunk/tomcat: src/main/org/jboss/web/tomcat/metadata and 1 other directory.

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

Author: remy.maucherat at jboss.com
Date: 2008-10-13 04:57:24 -0400 (Mon, 13 Oct 2008)
New Revision: 79383

Modified:
   trunk/tomcat/build.xml
   trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ConnectorMetaData.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/HostMetaData.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerMetaData.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerXMLObjectModelFactory.java
Log:
- Metadata updates.

Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml	2008-10-13 08:56:11 UTC (rev 79382)
+++ trunk/tomcat/build.xml	2008-10-13 08:57:24 UTC (rev 79383)
@@ -309,6 +309,7 @@
         <exclude name="org/jboss/web/tomcat/service/session/InstanceOfAopMarker*"/>
         <include name="org/jboss/net/**"/>
         <include name="org/jboss/web/tomcat/filters/**"/>
+        <include name="org/jboss/web/tomcat/metadata/**"/>
         <include name="org/jboss/web/tomcat/servlets/**"/>
         <include name="org/jboss/web/tomcat/service/**"/>
         <include name="org/jboss/web/tomcat/security/**"/>

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ConnectorMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ConnectorMetaData.java	2008-10-13 08:56:11 UTC (rev 79382)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ConnectorMetaData.java	2008-10-13 08:57:24 UTC (rev 79383)
@@ -21,11 +21,36 @@
  */
 package org.jboss.web.tomcat.metadata;
 
+import javax.xml.bind.annotation.XmlAttribute;
 
+
 /**
  * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
  * @version $Revision$
  */
 public class ConnectorMetaData extends AnyXmlMetaData
 {
+   private String executor;
+   private String protocol;
+   
+   @XmlAttribute(name = "executor")
+   public String getExecutor()
+   {
+      return executor;
+   }
+   public void setExecutor(String executor)
+   {
+      this.executor = executor;
+   }
+   
+   @XmlAttribute(name = "protocol")
+   public String getProtocol()
+   {
+      return protocol;
+   }
+   public void setProtocol(String protocol)
+   {
+      this.protocol = protocol;
+   }
+   
 }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/HostMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/HostMetaData.java	2008-10-13 08:56:11 UTC (rev 79382)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/HostMetaData.java	2008-10-13 08:57:24 UTC (rev 79383)
@@ -34,14 +34,12 @@
 {
    private String name;
    private String appBase;
-   private String unpackWars;
-   private boolean autoDeploy;
-   private boolean liveDeploy;
    private boolean xmlValidation;
    private boolean xmlNamespaceAware;
    private List<ListenerMetaData> listeners;
    private List<ValveMetaData> valves;
-   private List<ContextMetaData> contexts;
+   // In AS 5+, hardcoding contexts should be forbidden
+   //private List<ContextMetaData> contexts;
    private RealmMetaData realm;
    private List<String> aliases;
    
@@ -65,36 +63,6 @@
       this.appBase = appBase;
    }
    
-   @XmlAttribute(name = "unpackWARs")
-   public String getUnpackWars()
-   {
-      return unpackWars;
-   }
-   public void setUnpackWars(String unpackWars)
-   {
-      this.unpackWars = unpackWars;
-   }
-   
-   @XmlAttribute(name = "autoDeploy")
-   public boolean isAutoDeploy()
-   {
-      return autoDeploy;
-   }
-   public void setAutoDeploy(boolean autoDeploy)
-   {
-      this.autoDeploy = autoDeploy;
-   }
-   
-   @XmlAttribute(name = "liveDeploy")
-   public boolean isLiveDeploy()
-   {
-      return liveDeploy;
-   }
-   public void setLiveDeploy(boolean liveDeploy)
-   {
-      this.liveDeploy = liveDeploy;
-   }
-   
    @XmlAttribute(name = "xmlValidation")
    public boolean isXmlValidation()
    {
@@ -125,6 +93,7 @@
       this.aliases = aliases;
    }
 
+   /*
    @XmlElement(name = "Context")
    public List<ContextMetaData> getContexts()
    {
@@ -134,6 +103,7 @@
    {
       this.contexts = contexts;
    }
+   */
 
    @XmlElement(name = "Listener")
    public List<ListenerMetaData> getListeners()

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerMetaData.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerMetaData.java	2008-10-13 08:56:11 UTC (rev 79382)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerMetaData.java	2008-10-13 08:57:24 UTC (rev 79383)
@@ -36,16 +36,6 @@
    private List<ServiceMetaData> services;
    private List<ListenerMetaData> listeners;
 
-   @XmlAttribute(name = "name")
-   public String getName()
-   {
-      return name;
-   }
-   public void setName(String name)
-   {
-      this.name = name;
-   }
-   
    @XmlElement(name = "Service")
    public List<ServiceMetaData> getServices()
    {

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 08:56:11 UTC (rev 79382)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/metadata/ServerXMLObjectModelFactory.java	2008-10-13 08:57:24 UTC (rev 79383)
@@ -42,7 +42,6 @@
    public Object newRoot(Object root, UnmarshallingContext ctx, String namespaceURI, String localName, Attributes attrs)
    {
       ServerMetaData metaData = new ServerMetaData();
-      metaData.setName(attrs.getValue("name"));
       return metaData;
    }