[jboss-cvs] JBossAS SVN: r61158 - branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 6 15:49:14 EST 2007
Author: thomas.diesler at jboss.com
Date: 2007-03-06 15:49:14 -0500 (Tue, 06 Mar 2007)
New Revision: 61158
Modified:
branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java
branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/InitParamMetaData.java
branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java
Log:
partial commit
Modified: branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java 2007-03-06 20:48:07 UTC (rev 61157)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/HandlerMetaData.java 2007-03-06 20:49:14 UTC (rev 61158)
@@ -25,12 +25,15 @@
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
*
@@ -112,6 +115,53 @@
portNames.add(value);
}
+ /** @deprecated */
+ public void importStandardXml(org.w3c.dom.Element element)
+ {
+ handlerName = MetaData.getUniqueChildContent(element, "handler-name");
+
+ handlerClass = MetaData.getUniqueChildContent(element, "handler-class");
+
+ // Parse the init-param elements
+ 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"));
+ initParams.add(param);
+ }
+
+ // Parse the soap-header elements
+ 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);
+ }
+
+ // Parse the soap-role elements
+ 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);
+ }
+
+ // Parse the port-name elements
+ 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");
Modified: branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/InitParamMetaData.java
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/InitParamMetaData.java 2007-03-06 20:48:07 UTC (rev 61157)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/InitParamMetaData.java 2007-03-06 20:49:14 UTC (rev 61158)
@@ -26,19 +26,14 @@
import java.io.Serializable;
/**
- * XML Binding and ws4ee meta-data element for
- * <code>webservices/webservice-description/port-component/handler/init-param</code>
- *
* @author Thomas.Diesler at jboss.org
* @since 06-May-2004
*/
public class InitParamMetaData implements Serializable
{
- static final long serialVersionUID = 849652901282654531L;
-
- // The required <handler-name> element
+ // The required <param-name> element
private String paramName;
- // The required <handler-class> element
+ // The required <param-value> element
private String paramValue;
public String getParamName()
Modified: branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java
===================================================================
--- branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java 2007-03-06 20:48:07 UTC (rev 61157)
+++ branches/tdiesler/trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java 2007-03-06 20:49:14 UTC (rev 61158)
@@ -24,10 +24,15 @@
// $Id$
import java.io.Serializable;
-import java.util.Properties;
+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.
*
@@ -44,8 +49,16 @@
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 Properties callProperties = new Properties();
+ 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)
{
@@ -67,16 +80,6 @@
this.enableMTOM = enableMTOM;
}
- public Boolean getEnableMTOM()
- {
- return enableMTOM;
- }
-
- public void setEnableMTOM(Boolean enableMTOM)
- {
- this.enableMTOM = enableMTOM;
- }
-
/**
* The port-component-link element links a port-component-ref
* to a specific port-component required to be made available
@@ -108,21 +111,87 @@
this.serviceEndpointInterface = serviceEndpointInterface;
}
- public Properties getCallProperties()
+ public QName getPortQName()
{
+ return portQName;
+ }
+
+ public void setPortQName(QName portQName)
+ {
+ this.portQName = portQName;
+ }
+
+ public List<CallPropertyMetaData> getCallProperties()
+ {
return callProperties;
}
- public void setCallProperties(Properties props)
+ public void setCallProperties(List<CallPropertyMetaData> callProps)
{
- callProperties = props;
+ callProperties = callProps;
}
- public void addCallProperty(String name, String value)
+ public void addCallProperty(CallPropertyMetaData callProp)
{
- callProperties.setProperty(name, value);
+ 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");
@@ -131,6 +200,26 @@
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;
}
}
More information about the jboss-cvs-commits
mailing list