[jboss-cvs] JBossAS SVN: r61162 - in branches/tdiesler/trunk/server: src/main/org/jboss/metadata/serviceref and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Mar 6 16:24:07 EST 2007


Author: thomas.diesler at jboss.com
Date: 2007-03-06 16:24:07 -0500 (Tue, 06 Mar 2007)
New Revision: 61162

Removed:
   branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java.rej
   branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java.rej
   branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java.rej
   branches/tdiesler/trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
Modified:
   branches/tdiesler/trunk/server/build.xml
Log:


Modified: branches/tdiesler/trunk/server/build.xml
===================================================================
--- branches/tdiesler/trunk/server/build.xml	2007-03-06 21:04:15 UTC (rev 61161)
+++ branches/tdiesler/trunk/server/build.xml	2007-03-06 21:24:07 UTC (rev 61162)
@@ -78,6 +78,7 @@
       <path refid="apache.commons.classpath"/>
       <path refid="apache.log4j.classpath"/>
       <path refid="apache.xerces.classpath"/>
+      <path refid="dom4j.dom4j.classpath"/>
       <path refid="gjt.jpl-util.classpath"/>
       <path refid="gnu.getopt.classpath"/>
       <path refid="ibm.wsdl4j.classpath"/>

Deleted: branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java.rej
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java.rej	2007-03-06 21:04:15 UTC (rev 61161)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java.rej	2007-03-06 21:24:07 UTC (rev 61162)
@@ -1,280 +0,0 @@
-***************
-*** 23,37 ****
-  
-  // $Id$
-  
-  import org.jboss.metadata.MetaData;
-  import org.jboss.xb.QNameBuilder;
-- import org.w3c.dom.Element;
-  
-- import javax.xml.namespace.QName;
-- import java.util.ArrayList;
-- import java.util.Iterator;
-- import java.io.Serializable;
-- 
-  /** The unified metdata data for a handler element
-   * 
-   * @author Thomas.Diesler at jboss.org
---- 23,40 ----
-  
-  // $Id$
-  
-+ import java.io.Serializable;
-+ import java.util.ArrayList;
-+ import java.util.Iterator;
-+ import java.util.List;
-+ 
-+ import javax.xml.namespace.QName;
-+ 
-+ import org.dom4j.DocumentHelper;
-+ import org.dom4j.Element;
-  import org.jboss.metadata.MetaData;
-  import org.jboss.xb.QNameBuilder;
-  
-  /** The unified metdata data for a handler element
-   * 
-   * @author Thomas.Diesler at jboss.org
-***************
-*** 39,58 ****
-   */
-  public class HandlerMetaData implements Serializable
-  {
--    static final long serialVersionUID = 8749727542255024909L;
-- 
-     // The required <handler-name> element
-     private String handlerName;
-     // The required <handler-class> element
-     private String handlerClass;
-     // The optional <init-param> elements
--    private ArrayList initParams = new ArrayList();
-     // The optional <soap-header> elements
--    private ArrayList soapHeaders = new ArrayList();
-     // The optional <soap-role> elements
--    private ArrayList soapRoles = new ArrayList();
-     // The optional <port-name> elements, these only apply to webserve clients
--    private ArrayList portNames = new ArrayList();
-  
-     public void setHandlerName(String value)
-     {
---- 42,59 ----
-   */
-  public class HandlerMetaData implements Serializable
-  {
-     // The required <handler-name> element
-     private String handlerName;
-     // The required <handler-class> element
-     private String handlerClass;
-     // The optional <init-param> elements
-+    private List<InitParamMetaData> initParams = new ArrayList<InitParamMetaData>();
-     // The optional <soap-header> elements
-+    private List<QName> soapHeaders = new ArrayList<QName>();
-     // The optional <soap-role> elements
-+    private List<String> soapRoles = new ArrayList<String>();
-     // The optional <port-name> elements, these only apply to webserve clients
-+    private List<String> portNames = new ArrayList<String>();
-  
-     public void setHandlerName(String value)
-     {
-***************
-*** 79,89 ****
-        initParams.add(param);
-     }
-  
--    public InitParamMetaData[] getInitParams()
-     {
--       InitParamMetaData[] array = new InitParamMetaData[initParams.size()];
--       initParams.toArray(array);
--       return array;
-     }
-  
-     public void addSoapHeader(QName qName)
---- 80,88 ----
-        initParams.add(param);
-     }
-  
-+    public List<InitParamMetaData> getInitParams()
-     {
-+       return initParams;
-     }
-  
-     public void addSoapHeader(QName qName)
-***************
-*** 91,101 ****
-        soapHeaders.add(qName);
-     }
-  
--    public QName[] getSoapHeaders()
-     {
--       QName[] array = new QName[soapHeaders.size()];
--       soapHeaders.toArray(array);
--       return array;
-     }
-  
-     public void addSoapRole(String value)
---- 90,98 ----
-        soapHeaders.add(qName);
-     }
-  
-+    public List<QName> getSoapHeaders()
-     {
-+       return soapHeaders;
-     }
-  
-     public void addSoapRole(String value)
-***************
-*** 103,120 ****
-        soapRoles.add(value);
-     }
-  
--    public String[] getSoapRoles()
-     {
--       String[] array = new String[soapRoles.size()];
--       soapRoles.toArray(array);
--       return array;
-     }
-  
--    public String[] getPortNames()
-     {
--       String[] array = new String[portNames.size()];
--       portNames.toArray(array);
--       return array;
-     }
-  
-     public void addPortName(String value)
---- 100,113 ----
-        soapRoles.add(value);
-     }
-  
-+    public List<String> getSoapRoles()
-     {
-+       return soapRoles;
-     }
-  
-+    public List<String> getPortNames()
-     {
-+       return portNames;
-     }
-  
-     public void addPortName(String value)
-***************
-*** 122,128 ****
-        portNames.add(value);
-     }
-  
--    public void importStandardXml(Element element)
-     {
-        handlerName = MetaData.getUniqueChildContent(element, "handler-name");
-  
---- 115,122 ----
-        portNames.add(value);
-     }
-  
-+    /** @deprecated */
-+    public void importStandardXml(org.w3c.dom.Element element)
-     {
-        handlerName = MetaData.getUniqueChildContent(element, "handler-name");
-  
-***************
-*** 132,138 ****
-        Iterator iterator = MetaData.getChildrenByTagName(element, "init-param");
-        while (iterator.hasNext())
-        {
--          Element paramElement = (Element)iterator.next();
-           InitParamMetaData param = new InitParamMetaData();
-           param.setParamName(MetaData.getUniqueChildContent(paramElement, "param-name"));
-           param.setParamValue(MetaData.getUniqueChildContent(paramElement, "param-value"));
---- 126,132 ----
-        Iterator iterator = MetaData.getChildrenByTagName(element, "init-param");
-        while (iterator.hasNext())
-        {
-+          org.w3c.dom.Element paramElement = (org.w3c.dom.Element)iterator.next();
-           InitParamMetaData param = new InitParamMetaData();
-           param.setParamName(MetaData.getUniqueChildContent(paramElement, "param-name"));
-           param.setParamValue(MetaData.getUniqueChildContent(paramElement, "param-value"));
-***************
-*** 143,149 ****
-        iterator = MetaData.getChildrenByTagName(element, "soap-header");
-        while (iterator.hasNext())
-        {
--          Element headerElement = (Element)iterator.next();
-           String content = MetaData.getElementContent(headerElement);
-           QName qname = QNameBuilder.buildQName(headerElement, content);
-           soapHeaders.add(qname);
---- 137,143 ----
-        iterator = MetaData.getChildrenByTagName(element, "soap-header");
-        while (iterator.hasNext())
-        {
-+          org.w3c.dom.Element headerElement = (org.w3c.dom.Element)iterator.next();
-           String content = MetaData.getElementContent(headerElement);
-           QName qname = QNameBuilder.buildQName(headerElement, content);
-           soapHeaders.add(qname);
-***************
-*** 153,159 ****
-        iterator = MetaData.getChildrenByTagName(element, "soap-role");
-        while (iterator.hasNext())
-        {
--          Element roleElement = (Element)iterator.next();
-           String content = MetaData.getElementContent(roleElement);
-           soapRoles.add(content);
-        }
---- 147,153 ----
-        iterator = MetaData.getChildrenByTagName(element, "soap-role");
-        while (iterator.hasNext())
-        {
-+          org.w3c.dom.Element roleElement = (org.w3c.dom.Element)iterator.next();
-           String content = MetaData.getElementContent(roleElement);
-           soapRoles.add(content);
-        }
-***************
-*** 162,182 ****
-        iterator = MetaData.getChildrenByTagName(element, "port-name");
-        while (iterator.hasNext())
-        {
--          Element portElement = (Element)iterator.next();
-           String content = MetaData.getElementContent(portElement);
-           portNames.add(content);
-        }
-     }
-- 
--    public String toString()
-     {
--       StringBuffer buffer = new StringBuffer("\nHandlerMetaData:");
--       buffer.append("\n name=" + handlerName);
--       buffer.append("\n class=" + handlerClass);
--       buffer.append("\n params=" + initParams);
--       buffer.append("\n headers=" + soapHeaders);
--       buffer.append("\n roles=" + soapRoles);
--       buffer.append("\n ports=" + portNames);
--       return buffer.toString();
-     }
-  }
---- 156,184 ----
-        iterator = MetaData.getChildrenByTagName(element, "port-name");
-        while (iterator.hasNext())
-        {
-+          org.w3c.dom.Element portElement = (org.w3c.dom.Element)iterator.next();
-           String content = MetaData.getElementContent(portElement);
-           portNames.add(content);
-        }
-     }
-+    
-+    Element toXMLFragment()
-     {
-+       Element root = DocumentHelper.createElement("handler");
-+       root.addElement("handler-name").addText(handlerName);
-+       root.addElement("handler-class").addText(handlerClass);
-+       for (InitParamMetaData param : getInitParams())
-+       {
-+          Element paramEl = root.addElement("init-param");
-+          paramEl.addElement("param-name").addText(param.getParamName());
-+          paramEl.addElement("param-value").addText(param.getParamValue());
-+       }
-+       for (QName soapHeader : getSoapHeaders())
-+          root.addElement("soap-header").addText(soapHeader.toString());
-+       for (String soapRole : getSoapRoles())
-+          root.addElement("soap-role").addText(soapRole);
-+       for (String portName : getPortNames())
-+          root.addElement("port-name").addText(portName);
-+       return root;
-     }
-  }

Deleted: branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java.rej
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java.rej	2007-03-06 21:04:15 UTC (rev 61161)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java.rej	2007-03-06 21:24:07 UTC (rev 61162)
@@ -1,241 +0,0 @@
-***************
-*** 24,52 ****
-  // $Id$
-  
-  import java.io.Serializable;
-  import java.util.Iterator;
-- import java.util.Properties;
-  
-  import org.jboss.metadata.MetaData;
-- import org.w3c.dom.Element;
-  
-  /** The metdata data from service-ref/port-component-ref element in web.xml, ejb-jar.xml, and application-client.xml.
-   *
-   * @author Thomas.Diesler at jboss.org
--  * @version $Revision$
-   */
-  public class PortComponentRefMetaData implements Serializable
-  {
--    static final long serialVersionUID = 3856598615591044263L;
-     // The parent service-ref
-     private ServiceRefMetaData serviceRefMetaData;
-  
-     // The required <service-endpoint-interface> element
-     private String serviceEndpointInterface;
-     // The optional <port-component-link> element
-     private String portComponentLink;
-     // Arbitrary proxy properties given by <call-property> 
--    private Properties callProperties = new Properties();
-  
-     public PortComponentRefMetaData(ServiceRefMetaData serviceRefMetaData)
-     {
---- 24,64 ----
-  // $Id$
-  
-  import java.io.Serializable;
-+ import java.util.ArrayList;
-  import java.util.Iterator;
-+ import java.util.List;
-  
-+ import javax.xml.namespace.QName;
-+ 
-+ import org.dom4j.DocumentHelper;
-+ import org.dom4j.Element;
-  import org.jboss.metadata.MetaData;
-  
-  /** The metdata data from service-ref/port-component-ref element in web.xml, ejb-jar.xml, and application-client.xml.
-   *
-   * @author Thomas.Diesler at jboss.org
-   */
-  public class PortComponentRefMetaData implements Serializable
-  {
-     // The parent service-ref
-     private ServiceRefMetaData serviceRefMetaData;
-  
-     // The required <service-endpoint-interface> element
-     private String serviceEndpointInterface;
-+    // The optional <enable-mtom> element
-+    private Boolean enableMTOM;
-     // The optional <port-component-link> element
-     private String portComponentLink;
-+    // The optional <port-qname> element
-+    private QName portQName;
-     // Arbitrary proxy properties given by <call-property> 
-+    private List<CallPropertyMetaData> callProperties = new ArrayList<CallPropertyMetaData>();
-+    // Arbitrary proxy properties given by <stub-property> 
-+    private List<StubPropertyMetaData> stubProperties = new ArrayList<StubPropertyMetaData>();
-+    // The optional JBossWS config-name
-+    private String configName;
-+    // The optional JBossWS config-file
-+    private String configFile;
-  
-     public PortComponentRefMetaData(ServiceRefMetaData serviceRefMetaData)
-     {
-***************
-*** 92,135 ****
-     {
-        return serviceEndpointInterface;
-     }
--    
-     public void setServiceEndpointInterface(String serviceEndpointInterface)
-     {
-        this.serviceEndpointInterface = serviceEndpointInterface;
-     }
-  
--    public Properties getCallProperties()
-     {
-        return callProperties;
-     }
-     
--    public void setCallProperties(Properties props)
-     {
--       callProperties = props;
-     }
-  
--    public void addCallProperty(String name, String value)
-     {
--       callProperties.setProperty(name, value);
-     }
-  
--    public void importStandardXml(Element element)
-     {
-        serviceEndpointInterface = MetaData.getUniqueChildContent(element, "service-endpoint-interface");
-        portComponentLink = MetaData.getOptionalChildContent(element, "port-component-link");
-     }
-  
--    public void importJBossXml(Element element)
-     {
-        // Look for call-property elements
-        Iterator iterator = MetaData.getChildrenByTagName(element, "call-property");
-        while (iterator.hasNext())
-        {
--          Element propElement = (Element)iterator.next();
-           String name = MetaData.getUniqueChildContent(propElement, "prop-name");
-           String value = MetaData.getUniqueChildContent(propElement, "prop-value");
--          callProperties.setProperty(name, value);
-        }
-- 
-     }
-  }
---- 114,234 ----
-     {
-        return serviceEndpointInterface;
-     }
-+ 
-     public void setServiceEndpointInterface(String serviceEndpointInterface)
-     {
-        this.serviceEndpointInterface = serviceEndpointInterface;
-     }
-  
-+    public QName getPortQName()
-     {
-+       return portQName;
-+    }
-+ 
-+    public void setPortQName(QName portQName)
-+    {
-+       this.portQName = portQName;
-+    }
-+ 
-+    public List<CallPropertyMetaData> getCallProperties()
-+    {
-        return callProperties;
-     }
-+ 
-+    public void setCallProperties(List<CallPropertyMetaData> callProps)
-+    {
-+       callProperties = callProps;
-+    }
-+ 
-+    public void addCallProperty(CallPropertyMetaData callProp)
-+    {
-+       callProperties.add(callProp);
-+    }
-     
-+    public List<StubPropertyMetaData> getStubProperties()
-     {
-+       return stubProperties;
-     }
-  
-+    public void setStubProperties(List<StubPropertyMetaData> stubProps)
-     {
-+       stubProperties = stubProps;
-     }
-  
-+    public void addStubProperty(StubPropertyMetaData stubProp)
-     {
-+       stubProperties.add(stubProp);
-+    }
-+    
-+    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;
-+    }
-+ 
-+    /** @deprecated */
-+    public void importStandardXml(org.w3c.dom.Element element)
-+    {
-        serviceEndpointInterface = MetaData.getUniqueChildContent(element, "service-endpoint-interface");
-        portComponentLink = MetaData.getOptionalChildContent(element, "port-component-link");
-     }
-  
-+    /** @deprecated */
-+    public void importJBossXml(org.w3c.dom.Element element)
-     {
-        // Look for call-property elements
-        Iterator iterator = MetaData.getChildrenByTagName(element, "call-property");
-        while (iterator.hasNext())
-        {
-+          org.w3c.dom.Element propElement = (org.w3c.dom.Element)iterator.next();
-           String name = MetaData.getUniqueChildContent(propElement, "prop-name");
-           String value = MetaData.getUniqueChildContent(propElement, "prop-value");
-+          callProperties.add(new CallPropertyMetaData(name, value));
-        }
-     }
-+    
-+    Element toXMLFragment()
-+    {
-+       Element root = DocumentHelper.createElement("port-component-ref");
-+       root.addElement("service-endpoint-interface").addText(serviceEndpointInterface);
-+       if (enableMTOM != null)
-+          root.addElement("enable-mtom").addText(enableMTOM.toString());
-+       if (portComponentLink != null)
-+          root.addElement("port-component-link").addText(portComponentLink);
-+       if (portQName != null)
-+          root.addElement("port-qname").addText(portQName.toString());
-+       if (configName != null)
-+          root.addElement("config-name").addText(configName);
-+       if (configFile != null)
-+          root.addElement("config-file").addText(configFile);
-+       
-+       for (CallPropertyMetaData prop : getCallProperties())
-+       {
-+          Element propEl = root.addElement("call-property");
-+          propEl.addElement("prop-name").addText(prop.getPropName());
-+          propEl.addElement("prop-value").addText(prop.getPropValue());
-+       }
-+       for (StubPropertyMetaData prop : getStubProperties())
-+       {
-+          Element propEl = root.addElement("stub-property");
-+          propEl.addElement("prop-name").addText(prop.getPropName());
-+          propEl.addElement("prop-value").addText(prop.getPropValue());
-+       }
-+       
-+       return root;
-+    }
-  }

Deleted: branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java.rej
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java.rej	2007-03-06 21:04:15 UTC (rev 61161)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/ServiceRefMetaData.java.rej	2007-03-06 21:24:07 UTC (rev 61162)
@@ -1,567 +0,0 @@
-***************
-*** 29,56 ****
-  import java.util.ArrayList;
-  import java.util.Iterator;
-  import java.util.LinkedHashMap;
-  import java.util.Map;
-  import java.util.Properties;
-  
-  import javax.xml.namespace.QName;
-  
-  import org.jboss.logging.Logger;
-  import org.jboss.metadata.MetaData;
-  import org.jboss.metadata.Ref;
-  import org.jboss.xb.QNameBuilder;
-- import org.w3c.dom.DocumentType;
-- import org.w3c.dom.Element;
-  
-- /** The metdata data from service-ref element in web.xml, ejb-jar.xml, and
-   * application-client.xml.
--  *
-   * @author Thomas.Diesler at jboss.org
-   * @version $Revision$
-   */
-  public class ServiceRefMetaData extends Ref implements Serializable
-  {
--    private static final long serialVersionUID = -3723577995017108437L;
-- 
-     // provide logging
-     private static Logger log = Logger.getLogger(ServiceRefMetaData.class);
-  
---- 29,57 ----
-  import java.util.ArrayList;
-  import java.util.Iterator;
-  import java.util.LinkedHashMap;
-+ import java.util.List;
-  import java.util.Map;
-  import java.util.Properties;
-  
-  import javax.xml.namespace.QName;
-  
-+ import org.dom4j.Document;
-+ import org.dom4j.DocumentHelper;
-+ import org.dom4j.Element;
-  import org.jboss.logging.Logger;
-  import org.jboss.metadata.MetaData;
-  import org.jboss.metadata.Ref;
-  import org.jboss.xb.QNameBuilder;
-  
-+ /**
-+  * The metdata data from service-ref element in web.xml, ejb-jar.xml, and
-   * application-client.xml.
-+  * 
-   * @author Thomas.Diesler at jboss.org
-   * @version $Revision$
-   */
-  public class ServiceRefMetaData extends Ref implements Serializable
-  {
-     // provide logging
-     private static Logger log = Logger.getLogger(ServiceRefMetaData.class);
-  
-***************
-*** 59,65 ****
-     // The required <service-interface> element
-     private String serviceInterface;
-     // service-res-type
--    private String serviceResType;
-     // The optional <wsdl-file> element
-     private String wsdlFile;
-     // The optional <jaxrpc-mapping-file> element
---- 60,66 ----
-     // The required <service-interface> element
-     private String serviceInterface;
-     // service-res-type
-+    private String serviceRefType;
-     // The optional <wsdl-file> element
-     private String wsdlFile;
-     // The optional <jaxrpc-mapping-file> element
-***************
-*** 68,105 ****
-     private QName serviceQName;
-     // The LinkedHashMap<String, PortComponentRefMetaData> for <port-component-ref> elements
-     private Map<String, PortComponentRefMetaData> portComponentRefs = new LinkedHashMap<String, PortComponentRefMetaData>();
--    // The optional <handler> elements
--    private ArrayList handlers = new ArrayList();
-- 
-     // The optional JBossWS config-name
-     private String configName;
-     // The optional JBossWS config-file
-     private String configFile;
--    /** The URL of the actual WSDL to use, <wsdl-override> */
-     private URL wsdlOverride;
--    /** Arbitrary proxy properties given by <call-property> */
--    private Properties callProperties;
-  
--    /** Default constructor, used when unmarshalling on the client side
-      */
-     public ServiceRefMetaData()
-     {
-     }
-  
--    /** Constructor with a given service ref name
--     */
--    public ServiceRefMetaData(String serviceRefName)
--    {
--       this.serviceRefName = serviceRefName;
--    }
-- 
-     public void merge(ServiceRefMetaData sourceRef)
-     {
-        configName = sourceRef.configName;
-        configFile = sourceRef.configFile;
-        wsdlOverride = sourceRef.wsdlOverride;
-        callProperties = sourceRef.getCallProperties();
--       
-        for (PortComponentRefMetaData pcSourceRef : sourceRef.getPortComponentRefs())
-        {
-           String seiName = pcSourceRef.getServiceEndpointInterface();
---- 69,104 ----
-     private QName serviceQName;
-     // The LinkedHashMap<String, PortComponentRefMetaData> for <port-component-ref> elements
-     private Map<String, PortComponentRefMetaData> portComponentRefs = new LinkedHashMap<String, PortComponentRefMetaData>();
-+    // The optional <handler> elements. JAX-RPC handlers declared in the standard J2EE1.4 descriptor
-+    private List<HandlerMetaData> handlers = new ArrayList<HandlerMetaData>();
-+    // The optional <handler-chains> elements. JAX-WS handlers declared in the standard JavaEE5 descriptor
-+    private HandlerChainsMetaData handlerChains;
-+    // The optional <handler-chain> element. JAX-WS handler chain declared in the JBoss JavaEE5 descriptor
-+    private String handlerChain;
-     // The optional JBossWS config-name
-     private String configName;
-     // The optional JBossWS config-file
-     private String configFile;
-+    // The optional URL of the actual WSDL to use, <wsdl-override> 
-     private URL wsdlOverride;
-+    // Arbitrary proxy properties given by <call-property> 
-+    private List<CallPropertyMetaData> callProperties = new ArrayList<CallPropertyMetaData>();
-  
-+    /**
-+     * Default constructor, used when unmarshalling on the client side
-      */
-     public ServiceRefMetaData()
-     {
-     }
-  
-     public void merge(ServiceRefMetaData sourceRef)
-     {
-+       handlerChain = sourceRef.getHandlerChain();
-        configName = sourceRef.configName;
-        configFile = sourceRef.configFile;
-        wsdlOverride = sourceRef.wsdlOverride;
-        callProperties = sourceRef.getCallProperties();
-+ 
-        for (PortComponentRefMetaData pcSourceRef : sourceRef.getPortComponentRefs())
-        {
-           String seiName = pcSourceRef.getServiceEndpointInterface();
-***************
-*** 108,114 ****
-              log.warn("Illegal service endpoint interface: " + seiName);
-              continue;
-           }
--          
-           PortComponentRefMetaData pcTargetRef = portComponentRefs.get(seiName);
-           if (pcTargetRef == null)
-           {
---- 107,113 ----
-              log.warn("Illegal service endpoint interface: " + seiName);
-              continue;
-           }
-+ 
-           PortComponentRefMetaData pcTargetRef = portComponentRefs.get(seiName);
-           if (pcTargetRef == null)
-           {
-***************
-*** 116,126 ****
-              addPortComponentRef(pcSourceRef);
-              pcTargetRef = pcSourceRef;
-           }
--          
-           pcTargetRef.setCallProperties(pcSourceRef.getCallProperties());
-        }
-     }
--    
-     public String getMappingFile()
-     {
-        return mappingFile;
---- 115,127 ----
-              addPortComponentRef(pcSourceRef);
-              pcTargetRef = pcSourceRef;
-           }
-+ 
-+          pcTargetRef.setPortQName(pcSourceRef.getPortQName());
-           pcTargetRef.setCallProperties(pcSourceRef.getCallProperties());
-+          pcTargetRef.setStubProperties(pcSourceRef.getStubProperties());
-        }
-     }
-+ 
-     public String getMappingFile()
-     {
-        return mappingFile;
-***************
-*** 137,166 ****
-        portComponentRefs.values().toArray(array);
-        return array;
-     }
--    
-     public PortComponentRefMetaData getPortComponentRef(String seiName)
-     {
-        PortComponentRefMetaData ref = portComponentRefs.get(seiName);
-        return ref;
-     }
--    
-     public void addPortComponentRef(PortComponentRefMetaData pcRef)
-     {
-        portComponentRefs.put(pcRef.getServiceEndpointInterface(), pcRef);
-     }
-  
--    public HandlerMetaData[] getHandlers()
-     {
--       HandlerMetaData[] array = new HandlerMetaData[handlers.size()];
--       handlers.toArray(array);
--       return array;
-     }
-  
-     public void addHandler(HandlerMetaData handler)
-     {
-        handlers.add(handler);
-     }
--    
-     public String getServiceInterface()
-     {
-        return serviceInterface;
---- 138,165 ----
-        portComponentRefs.values().toArray(array);
-        return array;
-     }
-+ 
-     public PortComponentRefMetaData getPortComponentRef(String seiName)
-     {
-        PortComponentRefMetaData ref = portComponentRefs.get(seiName);
-        return ref;
-     }
-+ 
-     public void addPortComponentRef(PortComponentRefMetaData pcRef)
-     {
-        portComponentRefs.put(pcRef.getServiceEndpointInterface(), pcRef);
-     }
-  
-+    public List<HandlerMetaData> getHandlers()
-     {
-+       return handlers;
-     }
-  
-     public void addHandler(HandlerMetaData handler)
-     {
-        handlers.add(handler);
-     }
-+ 
-     public String getServiceInterface()
-     {
-        return serviceInterface;
-***************
-*** 191,204 ****
-        this.serviceRefName = serviceRefName;
-     }
-  
--    public String getServiceResType()
-     {
--       return serviceResType;
-     }
-  
--    public void setServiceResType(String serviceResType)
-     {
--       this.serviceResType = serviceResType;
-     }
-  
-     public String getWsdlFile()
---- 190,203 ----
-        this.serviceRefName = serviceRefName;
-     }
-  
-+    public String getServiceRefType()
-     {
-+       return serviceRefType;
-     }
-  
-+    public void setServiceRefType(String serviceResType)
-     {
-+       this.serviceRefType = serviceResType;
-     }
-  
-     public String getWsdlFile()
-***************
-*** 235,241 ****
-     {
-        return wsdlOverride;
-     }
--    
-     public void setWsdlOverride(String wsdlOverride)
-     {
-        try
---- 234,240 ----
-     {
-        return wsdlOverride;
-     }
-+ 
-     public void setWsdlOverride(String wsdlOverride)
-     {
-        try
-***************
-*** 248,284 ****
-        }
-     }
-  
--    public Properties getCallProperties()
-     {
-        return callProperties;
-     }
-  
--    public static boolean isValidDoctype(Element element)
-     {
--       // Verify J2EE-1.4
--       String nsURI = element.getOwnerDocument().getDocumentElement().getNamespaceURI();
--       boolean isValid = "http://java.sun.com/xml/ns/j2ee".equals(nsURI);
-  
--       // Verify JBoss-4.0
--       DocumentType doctype = element.getOwnerDocument().getDoctype();
--       if (isValid == false && doctype != null)
--       {
--          String publicId = doctype.getPublicId();
--          isValid |= "-//JBoss//DTD JBOSS 4.0//EN".equals(publicId);
--          isValid |= "-//JBoss//DTD Web Application 2.4//EN".equals(publicId);
--          isValid |= "-//JBoss//DTD Application Client 4.0//EN".equals(publicId);
--       }
-  
--       if (isValid == false)
--       {
--          String dtstr = (doctype != null ? "[public=" + doctype.getPublicId() + ",system=" + doctype.getSystemId() + "]" : null);
--          log.debug("Skip <service-ref> for: nsURI=" + nsURI + ",doctype=" + dtstr);
--       }
--       return isValid;
-     }
-  
--    public void importStandardXml(Element element)
-     {
-        serviceRefName = MetaData.getUniqueChildContent(element, "service-ref-name");
-  
-        serviceInterface = MetaData.getUniqueChildContent(element, "service-interface");
---- 247,290 ----
-        }
-     }
-  
-+    public List<CallPropertyMetaData> getCallProperties()
-     {
-        return callProperties;
-     }
-  
-+    public void setCallProperties(List<CallPropertyMetaData> callProps)
-     {
-+       callProperties = callProps;
-+    }
-  
-+    public void addCallProperty(CallPropertyMetaData callProp)
-+    {
-+       callProperties.add(callProp);
-+    }
-  
-+    public HandlerChainsMetaData getHandlerChains()
-+    {
-+       return handlerChains;
-     }
-  
-+    public void setHandlerChains(HandlerChainsMetaData handlerChains)
-     {
-+       this.handlerChains = handlerChains;
-+    }
-+    
-+    public String getHandlerChain()
-+    {
-+       return handlerChain;
-+    }
-+ 
-+    public void setHandlerChain(String handlerChain)
-+    {
-+       this.handlerChain = handlerChain;
-+    }
-+ 
-+    /** @deprecated */
-+    public void importStandardXml(org.w3c.dom.Element element)
-+    {
-        serviceRefName = MetaData.getUniqueChildContent(element, "service-ref-name");
-  
-        serviceInterface = MetaData.getUniqueChildContent(element, "service-interface");
-***************
-*** 287,293 ****
-  
-        mappingFile = MetaData.getOptionalChildContent(element, "jaxrpc-mapping-file");
-  
--       Element qnameElement = MetaData.getOptionalChild(element, "service-qname");
-        if (qnameElement != null)
-           serviceQName = QNameBuilder.buildQName(qnameElement, MetaData.getElementContent(qnameElement));
-  
---- 293,299 ----
-  
-        mappingFile = MetaData.getOptionalChildContent(element, "jaxrpc-mapping-file");
-  
-+       org.w3c.dom.Element qnameElement = MetaData.getOptionalChild(element, "service-qname");
-        if (qnameElement != null)
-           serviceQName = QNameBuilder.buildQName(qnameElement, MetaData.getElementContent(qnameElement));
-  
-***************
-*** 295,301 ****
-        Iterator iterator = MetaData.getChildrenByTagName(element, "port-component-ref");
-        while (iterator.hasNext())
-        {
--          Element pcrefElement = (Element)iterator.next();
-           PortComponentRefMetaData pcrefMetaData = new PortComponentRefMetaData(this);
-           pcrefMetaData.importStandardXml(pcrefElement);
-           portComponentRefs.put(pcrefMetaData.getServiceEndpointInterface(), pcrefMetaData);
---- 301,307 ----
-        Iterator iterator = MetaData.getChildrenByTagName(element, "port-component-ref");
-        while (iterator.hasNext())
-        {
-+          org.w3c.dom.Element pcrefElement = (org.w3c.dom.Element)iterator.next();
-           PortComponentRefMetaData pcrefMetaData = new PortComponentRefMetaData(this);
-           pcrefMetaData.importStandardXml(pcrefElement);
-           portComponentRefs.put(pcrefMetaData.getServiceEndpointInterface(), pcrefMetaData);
-***************
-*** 305,320 ****
-        iterator = MetaData.getChildrenByTagName(element, "handler");
-        while (iterator.hasNext())
-        {
--          Element handlerElement = (Element)iterator.next();
-           HandlerMetaData handlerMetaData = new HandlerMetaData();
-           handlerMetaData.importStandardXml(handlerElement);
-           handlers.add(handlerMetaData);
-        }
-     }
-  
--    /** Parse jboss specific service-ref child elements
--     */
--    public void importJBossXml(Element element)
-     {
-        configName = MetaData.getOptionalChildContent(element, "config-name");
-  
---- 311,325 ----
-        iterator = MetaData.getChildrenByTagName(element, "handler");
-        while (iterator.hasNext())
-        {
-+          org.w3c.dom.Element handlerElement = (org.w3c.dom.Element)iterator.next();
-           HandlerMetaData handlerMetaData = new HandlerMetaData();
-           handlerMetaData.importStandardXml(handlerElement);
-           handlers.add(handlerMetaData);
-        }
-     }
-  
-+    /** @deprecated */
-+    public void importJBossXml(org.w3c.dom.Element element)
-     {
-        configName = MetaData.getOptionalChildContent(element, "config-name");
-  
-***************
-*** 334,340 ****
-        Iterator iterator = MetaData.getChildrenByTagName(element, "port-component-ref");
-        while (iterator.hasNext())
-        {
--          Element pcrefElement = (Element)iterator.next();
-           String name = MetaData.getOptionalChildContent(pcrefElement, "service-endpoint-interface");
-           if (name != null)
-           {
---- 339,345 ----
-        Iterator iterator = MetaData.getChildrenByTagName(element, "port-component-ref");
-        while (iterator.hasNext())
-        {
-+          org.w3c.dom.Element pcrefElement = (org.w3c.dom.Element)iterator.next();
-           String name = MetaData.getOptionalChildContent(pcrefElement, "service-endpoint-interface");
-           if (name != null)
-           {
-***************
-*** 355,366 ****
-        iterator = MetaData.getChildrenByTagName(element, "call-property");
-        while (iterator.hasNext())
-        {
--          Element propElement = (Element)iterator.next();
-           String name = MetaData.getUniqueChildContent(propElement, "prop-name");
-           String value = MetaData.getUniqueChildContent(propElement, "prop-value");
--          if (callProperties == null)
--             callProperties = new Properties();
--          callProperties.setProperty(name, value);
-        }
-     }
-  }
---- 360,435 ----
-        iterator = MetaData.getChildrenByTagName(element, "call-property");
-        while (iterator.hasNext())
-        {
-+          org.w3c.dom.Element propElement = (org.w3c.dom.Element)iterator.next();
-           String name = MetaData.getUniqueChildContent(propElement, "prop-name");
-           String value = MetaData.getUniqueChildContent(propElement, "prop-value");
-+          callProperties.add(new CallPropertyMetaData(name, value));
-        }
-     }
-+    
-+    public static boolean isJ2EE14Descriptor(org.w3c.dom.Element element)
-+    {
-+       // Verify J2EE-1.4
-+       String nsURI = element.getOwnerDocument().getDocumentElement().getNamespaceURI();
-+       boolean isValid = "http://java.sun.com/xml/ns/j2ee".equals(nsURI);
-+ 
-+       // Verify JBoss-4.0
-+       org.w3c.dom.DocumentType doctype = element.getOwnerDocument().getDoctype();
-+       if (isValid == false && doctype != null)
-+       {
-+          String publicId = doctype.getPublicId();
-+          isValid |= "-//JBoss//DTD JBOSS 4.0//EN".equals(publicId);
-+          isValid |= "-//JBoss//DTD JBOSS 4.2//EN".equals(publicId);
-+          isValid |= "-//JBoss//DTD Web Application 2.4//EN".equals(publicId);
-+          isValid |= "-//JBoss//DTD Application Client 4.0//EN".equals(publicId);
-+          isValid |= "-//JBoss//DTD Application Client 4.2//EN".equals(publicId);
-+       }
-+ 
-+       if (isValid == false)
-+       {
-+          String dtstr = (doctype != null ? "[public=" + doctype.getPublicId() + ",system=" + doctype.getSystemId() + "]" : null);
-+          log.debug("Skip <service-ref> for: nsURI=" + nsURI + ",doctype=" + dtstr);
-+       }
-+       return isValid;
-+    }
-+    
-+    public String toXMLFragmet()
-+    {
-+       Document document = DocumentHelper.createDocument();
-+       Element root = document.addElement("service-ref");
-+       root.addElement("service-ref-name").addText(serviceRefName);
-+       if (serviceInterface != null)
-+          root.addElement("service-interface").addText(serviceInterface);
-+       if (serviceRefType != null)
-+          root.addElement("service-ref-type").addText(serviceRefType);
-+       if (wsdlFile != null)
-+          root.addElement("wsdl-file").addText(wsdlFile);
-+       if (mappingFile != null)
-+          root.addElement("jaxrpc-mapping-file").addText(mappingFile);
-+       if (serviceQName != null)
-+          root.addElement("service-qname").addText(serviceQName.toString());
-+       for (PortComponentRefMetaData pcref : getPortComponentRefs())
-+          root.add(pcref.toXMLFragment());
-+       for (HandlerMetaData handler : getHandlers())
-+          root.add(handler.toXMLFragment());
-+       if (handlerChains != null)
-+          root.add(handlerChains.toXMLFragment());
-+       
-+       for (CallPropertyMetaData prop : getCallProperties())
-+       {
-+          Element propEl = root.addElement("call-property");
-+          propEl.addElement("prop-name").addText(prop.getPropName());
-+          propEl.addElement("prop-value").addText(prop.getPropValue());
-+       }
-+       
-+       if (configName != null)
-+          root.addElement("config-name").addText(configName);
-+       if (configFile != null)
-+          root.addElement("config-file").addText(configFile);
-+       if (handlerChain != null)
-+          root.addElement("handler-chain").addText(handlerChain);
-+       if (wsdlOverride != null)
-+          root.addElement("wsdl-override").addText(wsdlOverride.toExternalForm());
-+       return root.asXML();
-+    }
-  }

Deleted: branches/tdiesler/trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java	2007-03-06 21:04:15 UTC (rev 61161)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metamodel/descriptor/PortInfo.java	2007-03-06 21:24:07 UTC (rev 61162)
@@ -1,256 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metamodel.descriptor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-// $Id$
-
-/**
- * Represents a <port-info> element in <webservice-ref>
- *
- * @author Thomas.Diesler at jboss.com
- */
-public class PortInfo
-{
-   private WebServiceRefMetaData serviceRef;
-   private String serviceEndpointInterface;
-   private QName portQName;
-   private String configName;
-   private String configFile;
-   private List<NameValuePair> stubProperties = new ArrayList<NameValuePair>();
-
-   public PortInfo(WebServiceRefMetaData serviceRef)
-   {
-      this.serviceRef = serviceRef;
-   }
-   
-   public WebServiceRefMetaData getServiceRef()
-   {
-      return serviceRef;
-   }
-
-   public QName getPortQName()
-   {
-      return portQName;
-   }
-
-   public void setPortQName(QName portName)
-   {
-      this.portQName = portName;
-   }
-
-   public String getServiceEndpointInterface()
-   {
-      return serviceEndpointInterface;
-   }
-
-   public void setServiceEndpointInterface(String serviceEndpointInterface)
-   {
-      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;
-   }
-
-   public String toXMLFragment()
-   {
-      StringBuilder xml = new StringBuilder("<port-info>");
-
-      if (serviceEndpointInterface != null)
-         xml.append("<service-endpoint-interface>" + serviceEndpointInterface + "</service-endpoint-interface>");
-
-      if (portQName != null)
-         xml.append("<port-qname>" + portQName + "</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>");
-         xml.append("<name>" + nvp.getName() + "</name>");
-         xml.append("<value>" + nvp.getValue() + "</value>");
-         xml.append("</stub-property>");
-      }
-
-      xml.append("</port-info>");
-
-      return xml.toString();
-   }
-}
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.metamodel.descriptor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.jboss.metadata.serviceref.ServiceRefMetaData;
-
-// $Id$
-
-/**
- * Represents a <port-info> element in <webservice-ref>
- *
- * @author Thomas.Diesler at jboss.com
- */
-public class PortInfo
-{
-   private ServiceRefMetaData serviceRef;
-   private String serviceEndpointInterface;
-   private QName portQName;
-   private String configName;
-   private String configFile;
-   private List<NameValuePair> stubProperties = new ArrayList<NameValuePair>();
-
-   public PortInfo(ServiceRefMetaData serviceRef)
-   {
-      this.serviceRef = serviceRef;
-   }
-   
-   public ServiceRefMetaData getServiceRef()
-   {
-      return serviceRef;
-   }
-
-   public QName getPortQName()
-   {
-      return portQName;
-   }
-
-   public void setPortQName(QName portName)
-   {
-      this.portQName = portName;
-   }
-
-   public String getServiceEndpointInterface()
-   {
-      return serviceEndpointInterface;
-   }
-
-   public void setServiceEndpointInterface(String serviceEndpointInterface)
-   {
-      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;
-   }
-
-   public String toXMLFragment()
-   {
-      StringBuilder xml = new StringBuilder("<port-info>");
-
-      if (serviceEndpointInterface != null)
-         xml.append("<service-endpoint-interface>" + serviceEndpointInterface + "</service-endpoint-interface>");
-
-      if (portQName != null)
-         xml.append("<port-qname>" + portQName + "</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>");
-         xml.append("<name>" + nvp.getName() + "</name>");
-         xml.append("<value>" + nvp.getValue() + "</value>");
-         xml.append("</stub-property>");
-      }
-
-      xml.append("</port-info>");
-
-      return xml.toString();
-   }
-}




More information about the jboss-cvs-commits mailing list