[jboss-cvs] JBossAS SVN: r59772 - in trunk/server/src: resources/dtd and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2007-01-18 09:04:54 -0500 (Thu, 18 Jan 2007)
New Revision: 59772

Modified:
   trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
   trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
   trunk/server/src/resources/dtd/service-ref_5_0.dtd
Log:
Support config-name, config-file in port-info

Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-01-18 13:57:50 UTC (rev 59771)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/DDObjectFactory.java	2007-01-18 14:04:54 UTC (rev 59772)
@@ -377,6 +377,14 @@
       {
          portInfo.setPortQName(navigator.resolveQName(value));
       }
+      else if (localName.equals("config-name"))
+      {
+         portInfo.setConfigName(value);
+      }
+      else if (localName.equals("config-file"))
+      {
+         portInfo.setConfigFile(value);
+      }
    }
 
    public Object newChild(PortInfo portInfo, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)

Modified: trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
===================================================================
--- trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java	2007-01-18 13:57:50 UTC (rev 59771)
+++ trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java	2007-01-18 14:04:54 UTC (rev 59772)
@@ -38,6 +38,8 @@
    private ServiceRef serviceRef;
    private String serviceEndpointInterface;
    private QName portQName;
+   private String configName;
+   private String configFile;
    private List<NameValuePair> stubProperties = new ArrayList<NameValuePair>();
 
    public PortInfo(ServiceRef serviceRef)
@@ -70,6 +72,26 @@
       this.serviceEndpointInterface = serviceEndpointInterface;
    }
 
+   public String getConfigFile()
+   {
+      return configFile;
+   }
+
+   public void setConfigFile(String configFile)
+   {
+      this.configFile = configFile;
+   }
+
+   public String getConfigName()
+   {
+      return configName;
+   }
+
+   public void setConfigName(String configName)
+   {
+      this.configName = configName;
+   }
+
    public List<NameValuePair> getStubProperties()
    {
       return stubProperties;
@@ -89,6 +111,11 @@
          xml.append("<port-qname " + nsDecl + ">" + qualname + "</port-qname>");
       }
 
+      if (configName != null)
+         xml.append("<config-name>" + configName + "</config-name>");
+      if (configFile != null)
+         xml.append("<config-file>" + configFile + "</config-file>");
+      
       for (NameValuePair nvp : stubProperties)
       {
          xml.append("<stub-property>");

Modified: trunk/server/src/resources/dtd/service-ref_5_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/service-ref_5_0.dtd	2007-01-18 13:57:50 UTC (rev 59771)
+++ trunk/server/src/resources/dtd/service-ref_5_0.dtd	2007-01-18 14:04:54 UTC (rev 59772)
@@ -103,7 +103,7 @@
   selection, it must not appear in more than one port-info entry
   within the same service-ref.
 -->
-<!ELEMENT port-info (service-endpoint-interface?, port-qname?, stub-property*)>
+<!ELEMENT port-info (service-endpoint-interface?, port-qname?, config-name?, config-file?, stub-property*)>
 
 <!--
   Fully qualified name of service endpoint interface