[jboss-cvs] JBossAS SVN: r66606 - in projects/metadata/trunk/src/main/java/org/jboss/metadata: serviceref and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 31 09:00:24 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-10-31 09:00:23 -0400 (Wed, 31 Oct 2007)
New Revision: 66606
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/CallPropertyMetaData.java
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/serviceref/ServiceReferenceHandler.java
Log:
Add port-component call-props
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/CallPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/CallPropertyMetaData.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/CallPropertyMetaData.java 2007-10-31 13:00:23 UTC (rev 66606)
@@ -0,0 +1,61 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * 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.metadata.javaee.jboss;
+
+// $Id: $
+
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.jboss.metadata.javaee.spec.ParamValueMetaData;
+
+/**
+ * A remapping of ParamValueMetaData to support prop-name, prop-value elements
+ * @author Thomas.Diesler at jboss.org
+ * @version $Revision: 66409 $
+ */
+public class CallPropertyMetaData extends ParamValueMetaData
+{
+ private static final long serialVersionUID = 1;
+
+ public String getPropName()
+ {
+ return super.getParamName();
+ }
+
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ public void setPropName(String name)
+ {
+ super.setParamName(name);
+ }
+
+ public String getPropValue()
+ {
+ return super.getParamValue();
+ }
+
+ @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+ public void setPropValue(String value)
+ {
+ super.setParamValue(value);
+ }
+}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java 2007-10-31 12:41:03 UTC (rev 66605)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossPortComponentRef.java 2007-10-31 13:00:23 UTC (rev 66606)
@@ -31,29 +31,29 @@
import org.jboss.metadata.javaee.spec.PortComponentRef;
/**
- jboss port-component-ref-type
+ jboss port-component-ref-type
- <xsd:complexType name="port-component-ref-type">
- <xsd:sequence>
- <xsd:element name="service-endpoint-interface" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="port-qname" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="config-name" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="config-file" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="stub-property" type="jboss:stub-property-type" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- </xsd:complexType>
+ <xsd:complexType name="port-component-ref-type">
+ <xsd:sequence>
+ <xsd:element name="service-endpoint-interface" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="port-qname" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="config-name" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="config-file" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="stub-property" type="jboss:stub-property-type" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
- <xsd:complexType name="stub-property-type">
- <xsd:sequence>
- <xsd:element name="prop-name" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="prop-value" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
+ <xsd:complexType name="stub-property-type">
+ <xsd:sequence>
+ <xsd:element name="prop-name" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="prop-value" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name="port-component-refType")
+ at XmlType(name = "port-component-refType")
public class JBossPortComponentRef extends PortComponentRef
{
private static final long serialVersionUID = 1;
@@ -62,41 +62,60 @@
private String configName;
private String configFile;
private List<StubPropertyMetaData> stubProperties;
+ private List<CallPropertyMetaData> callProperties;
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 QName getPortQname()
{
return portQname;
}
+
public void setPortQname(QName portQname)
{
this.portQname = portQname;
}
+
public List<StubPropertyMetaData> getStubProperties()
{
return stubProperties;
}
- @XmlElement(name="stub-property")
+
+ @XmlElement(name = "stub-property")
public void setStubProperties(List<StubPropertyMetaData> stubProperties)
{
this.stubProperties = stubProperties;
}
+ public List<CallPropertyMetaData> getCallProperties()
+ {
+ return callProperties;
+ }
+
+ @XmlElement(name = "call-property")
+ public void setCallProperties(List<CallPropertyMetaData> callProperties)
+ {
+ this.callProperties = callProperties;
+ }
+
public JBossPortComponentRef merge(JBossPortComponentRef ref)
{
JBossPortComponentRef merged = new JBossPortComponentRef();
@@ -107,23 +126,34 @@
public void merge(JBossPortComponentRef override, JBossPortComponentRef original)
{
super.merge(override, original);
- if(override != null && override.portQname != null)
+
+ if (override != null && override.portQname != null)
portQname = override.portQname;
- else if(original != null && original.portQname != null)
+ else if (original != null && original.portQname != null)
portQname = override.portQname;
- if(override != null && override.configName != null)
+
+ if (override != null && override.configName != null)
configName = override.configName;
- else if(original != null && original.configName != null)
+ else if (original != null && original.configName != null)
configName = override.configName;
- if(override != null && override.configFile != null)
+
+ if (override != null && override.configFile != null)
configFile = override.configFile;
- else if(original != null && original.configFile != null)
+ else if (original != null && original.configFile != null)
configFile = override.configFile;
- if(stubProperties == null)
+
+ if (stubProperties == null)
stubProperties = new ArrayList<StubPropertyMetaData>();
- if(override != null && override.stubProperties != null)
+ if (override != null && override.stubProperties != null)
stubProperties.addAll(override.stubProperties);
- else if(original != null && original.stubProperties != null)
+ else if (original != null && original.stubProperties != null)
stubProperties.addAll(original.stubProperties);
+
+ if (callProperties == null)
+ callProperties = new ArrayList<CallPropertyMetaData>();
+ if (override != null && override.callProperties != null)
+ callProperties.addAll(override.callProperties);
+ else if (original != null && original.callProperties != null)
+ callProperties.addAll(original.callProperties);
}
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java 2007-10-31 12:41:03 UTC (rev 66605)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/JBossServiceReferenceMetaData.java 2007-10-31 13:00:23 UTC (rev 66606)
@@ -26,31 +26,27 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.namespace.QName;
import org.jboss.metadata.javaee.spec.PortComponentRef;
-import org.jboss.metadata.javaee.spec.ServiceReferenceHandlerChainsMetaData;
-import org.jboss.metadata.javaee.spec.ServiceReferenceHandlersMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
/**
- <xsd:sequence>
- <xsd:element name="service-ref-name" type="xsd:string"/>
- <xsd:element name="service-impl-class" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="service-qname" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="config-name" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="config-file" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="handler-chain" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- <xsd:element name="port-component-ref" type="jboss:port-component-ref-type" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="wsdl-override" type="xsd:string" minOccurs="0" maxOccurs="1"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
+ <xsd:sequence>
+ <xsd:element name="service-ref-name" type="xsd:string"/>
+ <xsd:element name="service-impl-class" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="service-qname" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="config-name" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="config-file" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="handler-chain" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ <xsd:element name="port-component-ref" type="jboss:port-component-ref-type" minOccurs="0" maxOccurs="unbounded"/>
+ <xsd:element name="wsdl-override" type="xsd:string" minOccurs="0" maxOccurs="1"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
- at XmlType(name="service-refType")
-public class JBossServiceReferenceMetaData
- extends ServiceReferenceMetaData
+ at XmlType(name = "service-refType")
+public class JBossServiceReferenceMetaData extends ServiceReferenceMetaData
{
/** The serialVersionUID */
private static final long serialVersionUID = 5693673588576610322L;
@@ -65,7 +61,7 @@
/** The handler-chain */
private String handlerChain;
-
+
private List<JBossPortComponentRef> jbossPortComponentRef;
/** The wsdl file override */
@@ -95,7 +91,7 @@
* @param serviceRefName the serviceRefName.
* @throws IllegalArgumentException for a null serviceRefName
*/
- @XmlElement(name="service-ref-name")
+ @XmlElement(name = "service-ref-name")
public void setServiceRefName(String serviceRefName)
{
setName(serviceRefName);
@@ -135,22 +131,22 @@
{
return serviceClass;
}
- @XmlElement(name="service-impl-class")
+
+ @XmlElement(name = "service-impl-class")
public void setServiceClass(String serviceClass)
{
this.serviceClass = serviceClass;
}
-
- public List<? extends PortComponentRef> getJBossPortComponentRef()
+ public List<JBossPortComponentRef> getJBossPortComponentRef()
{
return jbossPortComponentRef;
}
- @XmlElement(name="port-component-ref", type=JBossPortComponentRef.class)
- public void setJBossPortComponentRef(List<? extends PortComponentRef> portComponentRef)
+ @XmlElement(name = "port-component-ref", type = JBossPortComponentRef.class)
+ public void setJBossPortComponentRef(List<JBossPortComponentRef> portComponentRef)
{
- this.jbossPortComponentRef = (List<JBossPortComponentRef>) portComponentRef;
+ this.jbossPortComponentRef = (List<JBossPortComponentRef>)portComponentRef;
}
public String getWsdlOverride()
@@ -167,14 +163,16 @@
{
JBossServiceReferenceMetaData merged = new JBossServiceReferenceMetaData();
merged.merge(this, original);
- return merged;
+ return merged;
}
+
public JBossServiceReferenceMetaData merge(JBossServiceReferenceMetaData original)
{
JBossServiceReferenceMetaData merged = new JBossServiceReferenceMetaData();
merged.merge(this, original);
return merged;
}
+
/**
* Merge the contents of override with original into this.
*
@@ -188,38 +186,38 @@
super.merge(sr0, sr1);
// TODO: how to merge portComponentRef
- if(override != null && override.getPortComponentRef() != null)
+ if (override != null && override.getPortComponentRef() != null)
{
- if(jbossPortComponentRef == null)
+ if (jbossPortComponentRef == null)
jbossPortComponentRef = new ArrayList<JBossPortComponentRef>();
- for(PortComponentRef ref : override.getPortComponentRef())
+ for (PortComponentRef ref : override.getPortComponentRef())
{
JBossPortComponentRef jref = new JBossPortComponentRef();
jref.merge(null, ref);
jbossPortComponentRef.add(jref);
}
}
- if(original != null && original.getPortComponentRef() != null)
+ if (original != null && original.getPortComponentRef() != null)
{
- if(jbossPortComponentRef == null)
+ if (jbossPortComponentRef == null)
jbossPortComponentRef = new ArrayList<JBossPortComponentRef>();
- for(PortComponentRef ref : original.getPortComponentRef())
+ for (PortComponentRef ref : original.getPortComponentRef())
{
JBossPortComponentRef jref = new JBossPortComponentRef();
jref.merge(null, ref);
jbossPortComponentRef.add(jref);
}
}
-
- if(override != null && override.getServiceClass() != null)
+
+ if (override != null && override.getServiceClass() != null)
setServiceClass(override.getServiceClass());
- if(override != null && override.getConfigName() != null)
+ if (override != null && override.getConfigName() != null)
setConfigName(override.getConfigName());
- if(override != null && override.getConfigFile() != null)
+ if (override != null && override.getConfigFile() != null)
setConfigFile(override.getConfigFile());
- if(override != null && override.getHandlerChain() != null)
+ if (override != null && override.getHandlerChain() != null)
setHandlerChain(override.getHandlerChain());
- if(override != null && override.getWsdlOverride() != null)
+ if (override != null && override.getWsdlOverride() != null)
setWsdlOverride(override.getWsdlOverride());
}
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java 2007-10-31 12:41:03 UTC (rev 66605)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/javaee/jboss/StubPropertyMetaData.java 2007-10-31 13:00:23 UTC (rev 66606)
@@ -21,13 +21,15 @@
*/
package org.jboss.metadata.javaee.jboss;
+// $Id$
+
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
/**
- * A remapping of ParamValueMetaData to support stub-name, stub-value elements
+ * A remapping of ParamValueMetaData to support prop-name, prop-value elements
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
@@ -39,15 +41,18 @@
{
return super.getParamName();
}
+
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
public void setPropName(String name)
{
super.setParamName(name);
}
+
public String getPropValue()
{
return super.getParamValue();
}
+
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
public void setPropValue(String value)
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/serviceref/ServiceReferenceHandler.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/serviceref/ServiceReferenceHandler.java 2007-10-31 12:41:03 UTC (rev 66605)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/serviceref/ServiceReferenceHandler.java 2007-10-31 13:00:23 UTC (rev 66606)
@@ -31,9 +31,9 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
+import org.jboss.metadata.javaee.jboss.CallPropertyMetaData;
import org.jboss.metadata.javaee.jboss.JBossPortComponentRef;
import org.jboss.metadata.javaee.jboss.JBossServiceReferenceMetaData;
-import org.jboss.metadata.javaee.jboss.StubPropertyMetaData;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
import org.jboss.metadata.javaee.spec.PortComponentRef;
import org.jboss.metadata.javaee.spec.ServiceReferenceHandlerChainMetaData;
@@ -44,13 +44,13 @@
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
import org.jboss.wsf.spi.serviceref.ServiceRefHandler;
import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefMetaData;
@@ -159,8 +159,6 @@
result.setConfigFile(jbRef.getConfigFile());
result.setWsdlOverride(jbRef.getWsdlOverride());
result.setHandlerChain(jbRef.getHandlerChain());
- // TODO
- //result.setCallProperties(callProps);
}
return result;
}
@@ -220,17 +218,28 @@
result.setPortQName(jbpcref.getPortQname());
result.setConfigName(jbpcref.getConfigName());
result.setConfigFile(jbpcref.getConfigFile());
- List<StubPropertyMetaData> stubProps = jbpcref.getStubProperties();
+ List<CallPropertyMetaData> stubProps = jbpcref.getCallProperties();
if (stubProps != null)
{
- for (StubPropertyMetaData stubProp : stubProps)
+ for (CallPropertyMetaData stubProp : stubProps)
{
- UnifiedStubPropertyMetaData prop = new UnifiedStubPropertyMetaData();
+ UnifiedCallPropertyMetaData prop = new UnifiedCallPropertyMetaData();
prop.setPropName(stubProp.getPropName());
prop.setPropValue(stubProp.getPropValue());
- result.addStubProperty(prop);
+ result.addCallProperty(prop);
}
}
+ List<CallPropertyMetaData> callProps = jbpcref.getCallProperties();
+ if (callProps != null)
+ {
+ for (CallPropertyMetaData callProp : callProps)
+ {
+ UnifiedCallPropertyMetaData prop = new UnifiedCallPropertyMetaData();
+ prop.setPropName(callProp.getPropName());
+ prop.setPropValue(callProp.getPropValue());
+ result.addCallProperty(prop);
+ }
+ }
}
return result;
}
More information about the jboss-cvs-commits
mailing list