JBossWS SVN: r2445 - in trunk/jbossws-core/src/main/java/org/jboss/ws: core/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alex.guizar(a)jboss.com
Date: 2007-02-23 04:01:36 -0500 (Fri, 23 Feb 2007)
New Revision: 2445
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
Log:
JBCTS-438
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java 2007-02-23 03:03:43 UTC (rev 2444)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/Constants.java 2007-02-23 09:01:36 UTC (rev 2445)
@@ -148,6 +148,7 @@
static final Name SOAP11_HEADER = new NameImpl("Header", PREFIX_ENV, NS_SOAP11_ENV);
static final Name SOAP11_BODY = new NameImpl("Body", PREFIX_ENV, NS_SOAP11_ENV);
static final Name SOAP11_FAULT = new NameImpl("Fault", PREFIX_ENV, NS_SOAP11_ENV);
+ static final Name SOAP12_FAULT = new NameImpl("Fault", PREFIX_ENV, NS_SOAP12_ENV);
/** The default RPC return parameter name */
static final String DEFAULT_RPC_RETURN_NAME = "result"; // FIXME: According to JSR-181 this should be 'return'
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-02-23 03:03:43 UTC (rev 2444)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPBodyImpl.java 2007-02-23 09:01:36 UTC (rev 2445)
@@ -48,7 +48,6 @@
import javax.xml.transform.stream.StreamSource;
import org.jboss.logging.Logger;
-import org.jboss.util.NotImplementedException;
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.core.CommonMessageContext;
@@ -218,17 +217,24 @@
{
log.trace("getFault");
expandToDOM();
- Iterator it = getChildElements(new NameImpl("Fault", Constants.PREFIX_ENV, getSOAPEnvelope().getNamespaceURI()));
- return (it.hasNext() ? (SOAPFault)it.next() : null);
+ Iterator it = getFaultIterator();
+ return it.hasNext() ? (SOAPFault)it.next() : null;
}
public boolean hasFault()
{
log.trace("hasFault");
expandToDOM();
- return getChildElements(Constants.SOAP11_FAULT).hasNext();
+ return getFaultIterator().hasNext();
}
+ private Iterator getFaultIterator()
+ {
+ Name faultName = Constants.NS_SOAP11_ENV.equals(getNamespaceURI()) ?
+ Constants.SOAP11_FAULT : Constants.SOAP12_FAULT;
+ return getChildElements(faultName);
+ }
+
public Node appendChild(Node newChild) throws DOMException
{
log.trace("appendChild: " + newChild.getNodeName());
@@ -448,7 +454,38 @@
public Document extractContentAsDocument() throws SOAPException
{
- //TODO: SAAJ 1.3
- throw new NotImplementedException();
+ log.trace("extractContentAsDocument");
+ expandToDOM();
+
+ Iterator childElements = DOMUtils.getChildElements(this);
+ // zero child elements?
+ if (!childElements.hasNext())
+ throw new SOAPException("there is no child SOAPElement of this SOAPBody");
+
+ SOAPElementImpl childElement = (SOAPElementImpl)childElements.next();
+
+ // more than one child element?
+ if (childElements.hasNext())
+ throw new SOAPException("there is more than one child SOAPElement of this SOAPBody");
+
+ if (childElement instanceof SOAPContentElement)
+ {
+ // cause expansion to DOM
+ SOAPContentElement contentElement = (SOAPContentElement) childElement;
+ // TODO change visibility of SOAPContentElement.expandToDOM() to package?
+ contentElement.getPayload();
+ }
+
+ // child SOAPElement is removed as part of this process
+ childElement.detachNode();
+
+ /* child element's owner document might be shared with other elements;
+ * we have to create a separate document for returning to our caller
+ */
+ Document newDocument = DOMUtils.getDocumentBuilder().newDocument();
+ Node adoptedElement = newDocument.adoptNode(childElement.domNode);
+ newDocument.appendChild(adoptedElement);
+
+ return newDocument;
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-02-23 03:03:43 UTC (rev 2444)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2007-02-23 09:01:36 UTC (rev 2445)
@@ -44,6 +44,7 @@
import org.jboss.ws.core.utils.DOMUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.NodeList;
@@ -68,8 +69,8 @@
private Element element;
// The element name
private Name elementName;
- /* The element's encoding style
- * JBCTS-440 #getEncodingStyleTest1 expects the initial value of the
+ // The element's encoding style
+ /* JBCTS-440 #getEncodingStyleTest1 expects the initial value of the
* encodingStyle property to be null
*/
private String encodingStyle = null;
@@ -143,39 +144,13 @@
if (Constants.NS_SOAP11_ENV.equals(getNamespaceURI()) || Constants.NS_SOAP12_ENV.equals(getNamespaceURI()))
throw new SOAPException("Changing the name of this SOAP Element is not allowed: " + getLocalName());
- // Since DOM Elements do not support renaming, we must copy the content
- Element copy = DOMUtils.createElement(qname.getLocalPart(), qname.getPrefix(), qname.getNamespaceURI());
+ elementName = new NameImpl(qname);
- // copy attributes (and namespaces by the way)
- NamedNodeMap attributes = element.getAttributes();
- for (int i = 0; i < attributes.getLength(); i++)
- {
- org.w3c.dom.Node attribute = attributes.item(i);
+ Document owner = domNode.getOwnerDocument();
+ domNode = owner.renameNode(domNode, elementName.getURI(), elementName.getQualifiedName());
+ element = (Element)domNode;
- // DOM disallows moving an attribute, it must explicitly be cloned
- copy.setAttributeNode((Attr)attribute.cloneNode(true));
- }
-
- // move child nodes
- for (org.w3c.dom.Node child = element.getFirstChild(), next; child != null; child = next)
- {
- next = child.getNextSibling();
-
- // DOM removes a node from the tree before adding it to a different element
- copy.appendChild(child);
- }
-
- // replace element with copy
- org.w3c.dom.Node parent = element.getParentNode();
- if (parent != null)
- parent.replaceChild(copy, element);
-
- // update fields
- domNode = copy;
- element = copy;
- elementName = null; // getElementName() regenerates this field
-
- return this;
+ return this.completeNamespaceDeclaration();
}
/**
@@ -460,7 +435,7 @@
String nsURI = getNamespaceURI(prefix);
if (nsURI == null)
throw new SOAPException("CAnnot obtain namespace URI for prefix: " + prefix);
-
+
return new QName(nsURI, localName, prefix);
}
17 years, 2 months
JBossWS SVN: r2444 - in trunk/jbossws-core/src/main/java/org/jboss/ws: metadata/builder/jaxrpc and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-22 22:03:43 -0500 (Thu, 22 Feb 2007)
New Revision: 2444
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java
Log:
Merge 2435 and 2437 from 1.2.0
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-02-23 03:00:03 UTC (rev 2443)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2007-02-23 03:03:43 UTC (rev 2444)
@@ -307,7 +307,7 @@
if (opMetaData.isDocumentWrapped() && !paramMetaData.isInHeader()&& !paramMetaData.isSwA() && !paramMetaData.isMessageType())
{
outParameters = ParameterWrapping.unwrapRequestParameters(paramMetaData, paramValue, payload);
- syncOutWrappedParameters(targetParameterTypes);
+ syncOutWrappedParameters(targetParameterTypes, payload);
}
else
{
@@ -338,7 +338,7 @@
}
}
- private void syncOutWrappedParameters(Class[] targetParameterTypes)
+ private void syncOutWrappedParameters(Class[] targetParameterTypes, Object[] payload)
{
ParameterMetaData returnMetaData = opMetaData.getReturnParameter();
if (returnMetaData != null)
@@ -347,8 +347,13 @@
{
try
{
- if (param.getIndex() >= 0 && !outParameters.containsKey(param.getIndex()) )
- outParameters.put(param.getIndex(), targetParameterTypes[param.getIndex()].newInstance());
+ // only OUT parameters need to be initialized
+ if (param.getIndex() >= 0 && !outParameters.containsKey(param.getIndex()))
+ {
+ Object holder = targetParameterTypes[param.getIndex()].newInstance();
+ payload[param.getIndex()] = holder;
+ outParameters.put(param.getIndex(), holder);
+ }
}
catch (Exception e)
{
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-02-23 03:00:03 UTC (rev 2443)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-02-23 03:03:43 UTC (rev 2444)
@@ -651,7 +651,13 @@
if (! "OUT".equals(parameterMode))
wrappedParameters.add(wrapped);
if (! "IN".equals(parameterMode))
+ {
+ wrapped.setHolder(true);
+ // wrapped parameters can not be shared between request/response objects (accessors)
+ if ("INOUT".equals(parameterMode))
+ wrapped = new WrappedParameter(wrapped);
wrappedResponseParameters.add(wrapped);
+ }
}
inMetaData.setWrappedParameters(wrappedParameters);
wsdlPosition = wrappedParameters.size();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-02-23 03:00:03 UTC (rev 2443)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-02-23 03:03:43 UTC (rev 2444)
@@ -624,10 +624,15 @@
if (mode != ParameterMode.OUT)
wrappedParameters.add(wrappedParameter);
+
if (mode != ParameterMode.IN)
{
+ wrappedParameter.setHolder(true);
+
+ // WrappedParameters can not be shared between request/response objects (accessors)
+ if (mode == ParameterMode.INOUT)
+ wrappedParameter = new WrappedParameter(wrappedParameter);
wrappedOutputParameters.add(wrappedParameter);
- wrappedParameter.setHolder(true);
}
}
else
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-02-23 03:00:03 UTC (rev 2443)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-02-23 03:03:43 UTC (rev 2444)
@@ -42,6 +42,17 @@
private int index = -2;
private Accessor accessor;
+ public WrappedParameter(WrappedParameter wrapped)
+ {
+ this.name = wrapped.name;
+ this.type = wrapped.type;
+ this.typeArguments = wrapped.typeArguments;
+ this.variable = wrapped.variable;
+ this.holder = wrapped.holder;
+ this.index = wrapped.index;
+ this.accessor = wrapped.accessor;
+ }
+
public WrappedParameter(QName name, String type, String variable, int index)
{
this.setName(name);
17 years, 2 months
JBossWS SVN: r2443 - trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-22 22:00:03 -0500 (Thu, 22 Feb 2007)
New Revision: 2443
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java
Log:
Revert 2424
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2007-02-23 00:48:32 UTC (rev 2442)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2007-02-23 03:00:03 UTC (rev 2443)
@@ -97,10 +97,9 @@
private FaultMetaData getFaultMetaData(Class exType, OperationMetaData om)
{
String exname = WSDLUtils.getInstance().getJustClassName(exType);
- QName xmlType = new QName(tmd.typeNamespace, exname);
- QName xmlName = new QName(om.getQName().getNamespaceURI(), exname);
+ QName xmlName = new QName(tmd.typeNamespace, exname);
- FaultMetaData fm = new FaultMetaData(om, xmlName, xmlType, exType.getName());
+ FaultMetaData fm = new FaultMetaData(om, xmlName, xmlName, exType.getName());
return fm;
}
17 years, 2 months
JBossWS SVN: r2442 - in tags/jbossws-1.2.0.CR4: integration-jboss42 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-22 19:48:32 -0500 (Thu, 22 Feb 2007)
New Revision: 2442
Modified:
tags/jbossws-1.2.0.CR4/build/version.properties
tags/jbossws-1.2.0.CR4/integration-jboss42/build.xml
Log:
Release
Modified: tags/jbossws-1.2.0.CR4/build/version.properties
===================================================================
--- tags/jbossws-1.2.0.CR4/build/version.properties 2007-02-22 17:01:05 UTC (rev 2441)
+++ tags/jbossws-1.2.0.CR4/build/version.properties 2007-02-23 00:48:32 UTC (rev 2442)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-1.2
-version.id=1.2.0.GA
-repository.id=1.2.0.GA
+version.id=1.2.0.CR4
+repository.id=1.2.0.CR4
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://www.jboss.org/products/jbossws
Modified: tags/jbossws-1.2.0.CR4/integration-jboss42/build.xml
===================================================================
--- tags/jbossws-1.2.0.CR4/integration-jboss42/build.xml 2007-02-22 17:01:05 UTC (rev 2441)
+++ tags/jbossws-1.2.0.CR4/integration-jboss42/build.xml 2007-02-23 00:48:32 UTC (rev 2442)
@@ -163,6 +163,14 @@
<include name="*.sh"/>
</fileset>
</copy>
+ <chmod perm="+x">
+ <fileset dir ="${jboss42.home}/bin">
+ <include name="wstools.sh"/>
+ <include name="wsprovide.sh"/>
+ <include name="wsconsume.sh"/>
+ <include name="wsrunclient.sh"/>
+ </fileset>
+ </chmod>
<copy todir="${jboss42.home}/client" overwrite="true">
<fileset dir="${core.output.lib.dir}">
<include name="jboss-jaxrpc.jar"/>
@@ -221,4 +229,4 @@
<target name="all" description="Create a distribution zip file" depends="main">
</target>
-</project>
\ No newline at end of file
+</project>
17 years, 2 months
JBossWS SVN: r2441 - tags.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-22 12:01:05 -0500 (Thu, 22 Feb 2007)
New Revision: 2441
Added:
tags/jbossws-1.2.0.CR4/
Log:
Prepare for CR4 release
Copied: tags/jbossws-1.2.0.CR4 (from rev 2440, branches/jbossws-1.2.0)
17 years, 2 months
JBossWS SVN: r2440 - trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity.
by jbossws-commits＠lists.jboss.org
Author: mageshbk
Date: 2007-02-22 08:05:00 -0500 (Thu, 22 Feb 2007)
New Revision: 2440
Modified:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java
Log:
[JBWS-1329] Fix StorePassEncryptTestCase for jbossas-5.0
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-02-22 10:30:16 UTC (rev 2439)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2007-02-22 13:05:00 UTC (rev 2440)
@@ -37,14 +37,16 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
import org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerOutbound;
/**
- * This test simulates simulates the usage of a jboss-ws-security keystore and truststore use cases
+ * This test simulates the usage of a jboss-ws-security keystore and truststore use cases
+ * using encrypted passwords for the store passwords.
*
- * @author magesh.bojan(a)jboss.com
+ * @author <a href="mailto:mbojan@redhat.com">Magesh Kumar B</a>
* @version $Revision$
*/
public class StorePassEncryptTestCase extends JBossWSTest
@@ -61,7 +63,7 @@
{
if (port == null)
{
- if (isTargetJBoss())
+ if (isTargetJBoss42() || isTargetJBoss40())
{
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
@@ -73,30 +75,17 @@
URL wsdlURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/wsdl/HelloService.wsdl").toURL();
URL mappingURL = new File("resources/jaxrpc/samples/wssecurity/WEB-INF/jaxrpc-mapping.xml").toURL();
URL securityURL = new File("resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF/jboss-wsse-client.xml").toURL();
-
- QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
- QName portName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloPort");
- ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, serviceName, mappingURL, securityURL);
-
- HandlerRegistry registry = service.getDynamicHandlerRegistry();
- List infos = registry.getHandlerChain(portName);
- infos.add(new HandlerInfo(WSSecurityHandlerOutbound.class, new HashMap(), new QName[] {}));
- registry.setHandlerChain(portName, infos);
-
+ QName qname = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
+ ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, qname, mappingURL, securityURL);
port = (Hello)service.getPort(Hello.class);
((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-samples-store-pass-encrypt");
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
}
}
}
public void testEndpoint() throws Exception
{
- if (isTargetJBoss50())
- {
- System.out.println("FIXME: [JBWS-1329] Fix StorePassEncryptTestCase for jbossas-5.0");
- return;
- }
-
UserType in0 = new UserType("Kermit");
UserType retObj = port.echoUserType(in0);
assertEquals(in0, retObj);
17 years, 2 months
JBossWS SVN: r2439 - branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-02-22 05:30:16 -0500 (Thu, 22 Feb 2007)
New Revision: 2439
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
Log:
Remove unused code from JBWS-1260 changes.
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-02-22 02:52:49 UTC (rev 2438)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-02-22 10:30:16 UTC (rev 2439)
@@ -533,58 +533,6 @@
return true;
}
- private void unwrapResponse(ServiceEndpointMethodMapping methodMapping, QName messageName, XSTypeDefinition xt)
- {
- if (xt instanceof XSComplexTypeDefinition == false)
- throw new WSException("Tried to unwrap a non-complex type.");
-
- XSComplexTypeDefinition wrapper = (XSComplexTypeDefinition)xt;
- XSParticle particle = wrapper.getParticle();
- XSTerm term = particle.getTerm();
- if (term instanceof XSModelGroup == false)
- throw new WSException("Expected model group, could not unwrap");
- unwrapResponseParticles(methodMapping, messageName, (XSModelGroup)term);
- }
-
- private boolean unwrapResponseParticles(ServiceEndpointMethodMapping methodMapping, QName messageName, XSModelGroup group)
- {
- if (group.getCompositor() != XSModelGroup.COMPOSITOR_SEQUENCE)
- throw new WSException("Only a sequence type can be unwrapped.");
-
- XSObjectList particles = group.getParticles();
-
- for (int i = 0; i < particles.getLength(); i++)
- {
- XSParticle particle = (XSParticle)particles.item(i);
- XSTerm term = particle.getTerm();
- if (term instanceof XSModelGroup)
- {
- if (unwrapResponseParticles(methodMapping, messageName, (XSModelGroup)term))
- return true;
- }
- else if (term instanceof XSElementDeclaration)
- {
- XSElementDeclaration element = (XSElementDeclaration)term;
- QName xmlName = new QName(element.getNamespace(), element.getName());
- QName xmlType = new QName(element.getTypeDefinition().getNamespace(), element.getTypeDefinition().getName());
- boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1;
- boolean primitive = !(element.getNillable() || (particle.getMinOccurs() == 0 && particle.getMaxOccurs() == 1));
-
- String javaType = getJavaTypeAsString(xmlName, xmlType, array, primitive);
-
- WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(methodMapping);
- wrvm.setMethodReturnValue(javaType);
- wrvm.setWsdlMessage(new QName(messageName.getNamespaceURI(), messageName.getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS));
- wrvm.setWsdlMessagePartName(xmlName.getLocalPart());
- methodMapping.setWsdlReturnValueMapping(wrvm);
-
- return true;
- }
- }
-
- return false;
- }
-
private void checkEssentials()
{
if (typeMapping == null)
17 years, 2 months
JBossWS SVN: r2438 - in branches/jbossws-1.2.0/jbossws-tests: ant-import and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-21 21:52:49 -0500 (Wed, 21 Feb 2007)
New Revision: 2438
Added:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/old.wsdl
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/WEB-INF/
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/WEB-INF/web.xml
Modified:
branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml
branches/jbossws-1.2.0/jbossws-tests/build.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java
Log:
Add JAX-WS Holder test
Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-22 02:51:17 UTC (rev 2437)
+++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-22 02:52:49 UTC (rev 2438)
@@ -240,6 +240,13 @@
</classes>
</war>
+ <!-- jaxws-holder -->
+ <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-wsaddressing-action -->
<war warfile="${tests.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-22 02:51:17 UTC (rev 2437)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-22 02:52:49 UTC (rev 2438)
@@ -258,6 +258,7 @@
<wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
<wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
<wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
+ <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
<wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/>
</target>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2007-02-22 02:51:17 UTC (rev 2437)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2007-02-22 02:52:49 UTC (rev 2438)
@@ -30,7 +30,6 @@
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.ws.Holder;
import org.jboss.logging.Logger;
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java 2007-02-22 02:52:49 UTC (rev 2438)
@@ -0,0 +1,92 @@
+/*
+ * 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.test.ws.jaxws.holder;
+
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.ws.Holder;
+
+/**
+ * A service which tests JAX-WS Holder types
+ *
+ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ */
+@WebService(name="Holder")
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public class HolderServiceImpl
+{
+ public Long echoOuts(
+ @WebParam(name = "in1") Integer in1,
+ @WebParam(name = "in2") String in2,
+ @WebParam(name = "in3") Long in3,
+ @WebParam(name = "out1", mode = WebParam.Mode.OUT) Holder<Integer> out1,
+ @WebParam(name = "out2", mode = WebParam.Mode.OUT) Holder<String> out2)
+ {
+ out1.value = in1;
+ out2.value = in2;
+ return in3;
+ }
+
+ public Long echoInOuts(
+ @WebParam(name = "in1") Long in1,
+ @WebParam(name = "inout1", mode = WebParam.Mode.INOUT) Holder<Integer> inout1,
+ @WebParam(name = "inout2", mode = WebParam.Mode.INOUT) Holder<String> inout2)
+ {
+ return in1;
+ }
+
+ public Long echoMixed(
+ @WebParam(name = "in1") Integer in1,
+ @WebParam(name = "in2") String in2,
+ @WebParam(name = "inout1", mode = WebParam.Mode.INOUT) Holder<Integer> inout1,
+ @WebParam(name = "inout2", mode = WebParam.Mode.INOUT) Holder<String> inout2,
+ @WebParam(name = "in3") Long in3,
+ @WebParam(name = "out1", mode = WebParam.Mode.OUT) Holder<Integer> out1,
+ @WebParam(name = "out2", mode = WebParam.Mode.OUT) Holder<String> out2)
+ {
+ out1.value = in1;
+ out2.value = in2;
+ return in3;
+ }
+
+ @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ public void echoBareOut(
+ @WebParam(name ="in") String in,
+ @WebParam(name ="out", mode=WebParam.Mode.OUT) Holder<String> out)
+ {
+ out.value = in;
+ }
+
+ @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
+ public void echoBareInOut(
+ @WebParam(name ="inout", mode=WebParam.Mode.INOUT) Holder<String> inout)
+ {
+ }
+
+ public void addInOut(
+ @WebParam(name ="sum", mode=WebParam.Mode.INOUT) Holder<Integer> sum,
+ @WebParam(name ="add") int add)
+ {
+ sum.value = sum.value.intValue() + add;
+ }
+}
\ No newline at end of file
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/HolderServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2007-02-22 02:52:49 UTC (rev 2438)
@@ -0,0 +1,125 @@
+/*
+ * 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.test.ws.jaxws.holder;
+
+// $Id$
+
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Holder;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * A JAX-WS holder test case
+ *
+ * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
+ */
+public class HolderTestCase extends JBossWSTest
+{
+ private org.jboss.test.ws.jaxws.holder.Holder port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(HolderTestCase.class, "jaxws-holder.war");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ URL wsdlURL = new File("resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl").toURL();
+ QName serviceName = new QName("http://holder.jaxws.ws.test.jboss.org/", "HolderService");
+ Service service = Service.create(wsdlURL, serviceName);
+ port = (org.jboss.test.ws.jaxws.holder.Holder)service.getPort(org.jboss.test.ws.jaxws.holder.Holder.class);
+ }
+
+ public void testEchoOuts() throws Exception
+ {
+ Holder<Integer> out1 = new Holder<Integer>();
+ Holder<String> out2 = new Holder<String>();
+ assertEquals(new Long(50), port.echoOuts(10, "Hello", 50L, out1, out2));
+ assertEquals(new Integer(10), out1.value);
+ assertEquals("Hello", out2.value);
+ }
+
+ public void testEchoInOuts() throws Exception
+ {
+ Holder<Integer> inout1 = new Holder<Integer>();
+ Holder<String> inout2 = new Holder<String>();
+ inout1.value = 50;
+ inout2.value = "Hello";
+ assertEquals(new Long(10), port.echoInOuts(10L, inout1, inout2));
+ assertEquals(new Integer(50), inout1.value);
+ assertEquals("Hello", inout2.value);
+ }
+
+ public void testEchoMixed() throws Exception
+ {
+ Holder<Integer> out1 = new Holder<Integer>();
+ Holder<String> out2 = new Holder<String>();
+ Holder<Integer> inout1 = new Holder<Integer>();
+ Holder<String> inout2 = new Holder<String>();
+ inout1.value = 50;
+ inout2.value = "Hello2";
+ assertEquals(new Long(20), port.echoMixed(30, "Hello1", inout1, inout2, 20L, out1, out2));
+ assertEquals(new Integer(30), out1.value);
+ assertEquals("Hello1", out2.value);
+ assertEquals(new Integer(50), inout1.value);
+ assertEquals("Hello2", inout2.value);
+ }
+
+ public void testEchoBareOut() throws Exception
+ {
+ Holder<String> out = new Holder<String>();
+ port.echoBareOut("hi", out);
+ assertEquals("hi", out.value);
+ }
+
+ public void testEchoBareInOut() throws Exception
+ {
+ Holder<String> inout = new Holder<String>();
+ inout.value = "hello world!";
+ port.echoBareInOut(inout);
+ assertEquals("hello world!", inout.value);
+ }
+
+ public void testInOutAdd() throws Exception
+ {
+ Holder<Integer> sum = new Holder<Integer>();
+ sum.value = 0;
+ port.addInOut(sum, 5);
+ port.addInOut(sum, 3);
+ port.addInOut(sum, 4);
+ assertEquals(new Integer(12), sum.value);
+ }
+}
\ No newline at end of file
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl 2007-02-22 02:52:49 UTC (rev 2438)
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name='HolderService' targetNamespace='http://holder.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://holder.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://holder.jaxws.ws.test.jboss.org/' version='1.0' xmlns:tns='http://holder.jaxws.ws.test.jboss.org/' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:element name='addInOut' type='tns:addInOut'/>
+ <xs:element name='addInOutResponse' type='tns:addInOutResponse'/>
+ <xs:element name='echoInOuts' type='tns:echoInOuts'/>
+ <xs:element name='echoInOutsResponse' type='tns:echoInOutsResponse'/>
+ <xs:element name='echoMixed' type='tns:echoMixed'/>
+ <xs:element name='echoMixedResponse' type='tns:echoMixedResponse'/>
+ <xs:element name='echoOuts' type='tns:echoOuts'/>
+ <xs:element name='echoOutsResponse' type='tns:echoOutsResponse'/>
+ <xs:element name='in' nillable='true' type='xs:string'/>
+ <xs:element name='inout' nillable='true' type='xs:string'/>
+ <xs:element name='out' nillable='true' type='xs:string'/>
+ <xs:complexType name='echoOuts'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='in1' type='xs:int'/>
+ <xs:element minOccurs='0' name='in2' type='xs:string'/>
+ <xs:element minOccurs='0' name='in3' type='xs:long'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoOutsResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:long'/>
+ <xs:element minOccurs='0' name='out1' type='xs:int'/>
+ <xs:element minOccurs='0' name='out2' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoInOuts'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='in1' type='xs:long'/>
+ <xs:element minOccurs='0' name='inout1' type='xs:int'/>
+ <xs:element minOccurs='0' name='inout2' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoInOutsResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:long'/>
+ <xs:element minOccurs='0' name='inout1' type='xs:int'/>
+ <xs:element minOccurs='0' name='inout2' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoMixed'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='in1' type='xs:int'/>
+ <xs:element minOccurs='0' name='in2' type='xs:string'/>
+ <xs:element minOccurs='0' name='inout1' type='xs:int'/>
+ <xs:element minOccurs='0' name='inout2' type='xs:string'/>
+ <xs:element minOccurs='0' name='in3' type='xs:long'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoMixedResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:long'/>
+ <xs:element minOccurs='0' name='inout1' type='xs:int'/>
+ <xs:element minOccurs='0' name='inout2' type='xs:string'/>
+ <xs:element minOccurs='0' name='out1' type='xs:int'/>
+ <xs:element minOccurs='0' name='out2' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='addInOut'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='sum' type='xs:int'/>
+ <xs:element name='add' type='xs:int'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='addInOutResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='sum' type='xs:int'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='Holder_echoBareOutResponse'>
+ <part element='tns:out' name='out'/>
+ </message>
+ <message name='Holder_addInOutResponse'>
+ <part element='tns:addInOutResponse' name='addInOutResponse'/>
+ </message>
+ <message name='Holder_echoOutsResponse'>
+ <part element='tns:echoOutsResponse' name='echoOutsResponse'/>
+ </message>
+ <message name='Holder_echoMixed'>
+ <part element='tns:echoMixed' name='echoMixed'/>
+ </message>
+ <message name='Holder_echoInOuts'>
+ <part element='tns:echoInOuts' name='echoInOuts'/>
+ </message>
+ <message name='Holder_echoBareOut'>
+ <part element='tns:in' name='in'/>
+ </message>
+ <message name='Holder_echoBareInOut'>
+ <part element='tns:inout' name='inout'/>
+ </message>
+ <message name='Holder_echoMixedResponse'>
+ <part element='tns:echoMixedResponse' name='echoMixedResponse'/>
+ </message>
+ <message name='Holder_echoInOutsResponse'>
+ <part element='tns:echoInOutsResponse' name='echoInOutsResponse'/>
+ </message>
+ <message name='Holder_echoOuts'>
+ <part element='tns:echoOuts' name='echoOuts'/>
+ </message>
+ <message name='Holder_echoBareInOutResponse'>
+ <part element='tns:inout' name='inout'/>
+ </message>
+ <message name='Holder_addInOut'>
+ <part element='tns:addInOut' name='addInOut'/>
+ </message>
+ <portType name='Holder'>
+ <operation name='addInOut' parameterOrder='addInOut'>
+ <input message='tns:Holder_addInOut'/>
+ <output message='tns:Holder_addInOutResponse'/>
+ </operation>
+ <operation name='echoBareInOut' parameterOrder='inout'>
+ <input message='tns:Holder_echoBareInOut'/>
+ <output message='tns:Holder_echoBareInOutResponse'/>
+ </operation>
+ <operation name='echoBareOut' parameterOrder='in out'>
+ <input message='tns:Holder_echoBareOut'/>
+ <output message='tns:Holder_echoBareOutResponse'/>
+ </operation>
+ <operation name='echoInOuts' parameterOrder='echoInOuts'>
+ <input message='tns:Holder_echoInOuts'/>
+ <output message='tns:Holder_echoInOutsResponse'/>
+ </operation>
+ <operation name='echoMixed' parameterOrder='echoMixed'>
+ <input message='tns:Holder_echoMixed'/>
+ <output message='tns:Holder_echoMixedResponse'/>
+ </operation>
+ <operation name='echoOuts' parameterOrder='echoOuts'>
+ <input message='tns:Holder_echoOuts'/>
+ <output message='tns:Holder_echoOutsResponse'/>
+ </operation>
+ </portType>
+ <binding name='HolderBinding' type='tns:Holder'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='addInOut'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoBareInOut'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoBareOut'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoInOuts'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoMixed'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoOuts'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='HolderService'>
+ <port binding='tns:HolderBinding' name='HolderPort'>
+ <soap:address location='http://@jbosstest.host.name@:8080/jaxws-holder/HolderService'/>
+ </port>
+ </service>
+</definitions>
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/old.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/old.wsdl (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/old.wsdl 2007-02-22 02:52:49 UTC (rev 2438)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name='HolderService' targetNamespace='http://holder.jaxws.ws.test.jboss.org/' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://holder.jaxws.ws.test.jboss.org/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://holder.jaxws.ws.test.jboss.org/' version='1.0' xmlns:tns='http://holder.jaxws.ws.test.jboss.org/' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:element name='echoInOuts' type='tns:echoInOuts'/>
+ <xs:element name='echoInOutsResponse' type='tns:echoInOutsResponse'/>
+ <xs:element name='echoMixed' type='tns:echoMixed'/>
+ <xs:element name='echoMixedResponse' type='tns:echoMixedResponse'/>
+ <xs:element name='echoOuts' type='tns:echoOuts'/>
+ <xs:element name='echoOutsResponse' type='tns:echoOutsResponse'/>
+ <xs:element name='in' nillable='true' type='xs:string'/>
+ <xs:element name='inout' nillable='true' type='xs:string'/>
+ <xs:element name='out' nillable='true' type='xs:string'/>
+ <xs:complexType name='echoOuts'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='in1' type='xs:int'/>
+ <xs:element minOccurs='0' name='in2' type='xs:string'/>
+ <xs:element minOccurs='0' name='in3' type='xs:long'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoOutsResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:long'/>
+ <xs:element minOccurs='0' name='out1' type='xs:int'/>
+ <xs:element minOccurs='0' name='out2' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoInOuts'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='in1' type='xs:long'/>
+ <xs:element minOccurs='0' name='inout1' type='xs:int'/>
+ <xs:element minOccurs='0' name='inout2' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoInOutsResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:long'/>
+ <xs:element minOccurs='0' name='inout1' type='xs:int'/>
+ <xs:element minOccurs='0' name='inout2' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoMixed'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='in1' type='xs:int'/>
+ <xs:element minOccurs='0' name='in2' type='xs:string'/>
+ <xs:element minOccurs='0' name='inout1' type='xs:int'/>
+ <xs:element minOccurs='0' name='inout2' type='xs:string'/>
+ <xs:element minOccurs='0' name='in3' type='xs:long'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoMixedResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:long'/>
+ <xs:element minOccurs='0' name='inout1' type='xs:int'/>
+ <xs:element minOccurs='0' name='inout2' type='xs:string'/>
+ <xs:element minOccurs='0' name='out1' type='xs:int'/>
+ <xs:element minOccurs='0' name='out2' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='Holder_echoBareOutResponse'>
+ <part element='tns:out' name='out'/>
+ </message>
+ <message name='Holder_echoOutsResponse'>
+ <part element='tns:echoOutsResponse' name='echoOutsResponse'/>
+ </message>
+ <message name='Holder_echoMixed'>
+ <part element='tns:echoMixed' name='echoMixed'/>
+ </message>
+ <message name='Holder_echoInOuts'>
+ <part element='tns:echoInOuts' name='echoInOuts'/>
+ </message>
+ <message name='Holder_echoBareOut'>
+ <part element='tns:in' name='in'/>
+ </message>
+ <message name='Holder_echoBareInOut'>
+ <part element='tns:inout' name='inout'/>
+ </message>
+ <message name='Holder_echoMixedResponse'>
+ <part element='tns:echoMixedResponse' name='echoMixedResponse'/>
+ </message>
+ <message name='Holder_echoInOutsResponse'>
+ <part element='tns:echoInOutsResponse' name='echoInOutsResponse'/>
+ </message>
+ <message name='Holder_echoOuts'>
+ <part element='tns:echoOuts' name='echoOuts'/>
+ </message>
+ <message name='Holder_echoBareInOutResponse'>
+ <part element='tns:inout' name='inout'/>
+ </message>
+ <portType name='Holder'>
+ <operation name='echoBareInOut' parameterOrder='inout'>
+ <input message='tns:Holder_echoBareInOut'/>
+ <output message='tns:Holder_echoBareInOutResponse'/>
+ </operation>
+ <operation name='echoBareOut' parameterOrder='in out'>
+ <input message='tns:Holder_echoBareOut'/>
+ <output message='tns:Holder_echoBareOutResponse'/>
+ </operation>
+ <operation name='echoInOuts' parameterOrder='echoInOuts'>
+ <input message='tns:Holder_echoInOuts'/>
+ <output message='tns:Holder_echoInOutsResponse'/>
+ </operation>
+ <operation name='echoMixed' parameterOrder='echoMixed'>
+ <input message='tns:Holder_echoMixed'/>
+ <output message='tns:Holder_echoMixedResponse'/>
+ </operation>
+ <operation name='echoOuts' parameterOrder='echoOuts'>
+ <input message='tns:Holder_echoOuts'/>
+ <output message='tns:Holder_echoOutsResponse'/>
+ </operation>
+ </portType>
+ <binding name='HolderBinding' type='tns:Holder'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoBareInOut'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoBareOut'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoInOuts'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoMixed'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='echoOuts'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='HolderService'>
+ <port binding='tns:HolderBinding' name='HolderPort'>
+ <soap:address location='http:///@jbosstest.host.name@:8080/jaxws-holder/HolderService'/>
+ </port>
+ </service>
+</definitions>
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/META-INF/wsdl/old.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/WEB-INF/web.xml (rev 0)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/WEB-INF/web.xml 2007-02-22 02:52:49 UTC (rev 2438)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>HolderService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.holder.HolderServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>HolderService</servlet-name>
+ <url-pattern>/HolderService</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/holder/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 2 months
JBossWS SVN: r2437 - in branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata: builder/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-21 21:51:17 -0500 (Wed, 21 Feb 2007)
New Revision: 2437
Modified:
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java
Log:
Fix doc/wrapped non header INOUTS
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-02-21 23:55:38 UTC (rev 2436)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2007-02-22 02:51:17 UTC (rev 2437)
@@ -651,7 +651,13 @@
if (! "OUT".equals(parameterMode))
wrappedParameters.add(wrapped);
if (! "IN".equals(parameterMode))
+ {
+ wrapped.setHolder(true);
+ // wrapped parameters can not be shared between request/response objects (accessors)
+ if ("INOUT".equals(parameterMode))
+ wrapped = new WrappedParameter(wrapped);
wrappedResponseParameters.add(wrapped);
+ }
}
inMetaData.setWrappedParameters(wrappedParameters);
wsdlPosition = wrappedParameters.size();
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-02-21 23:55:38 UTC (rev 2436)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-02-22 02:51:17 UTC (rev 2437)
@@ -624,10 +624,15 @@
if (mode != ParameterMode.OUT)
wrappedParameters.add(wrappedParameter);
+
if (mode != ParameterMode.IN)
{
+ wrappedParameter.setHolder(true);
+
+ // WrappedParameters can not be shared between request/response objects (accessors)
+ if (mode == ParameterMode.INOUT)
+ wrappedParameter = new WrappedParameter(wrappedParameter);
wrappedOutputParameters.add(wrappedParameter);
- wrappedParameter.setHolder(true);
}
}
else
Modified: branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-02-21 23:55:38 UTC (rev 2436)
+++ branches/jbossws-1.2.0/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2007-02-22 02:51:17 UTC (rev 2437)
@@ -42,6 +42,17 @@
private int index = -2;
private Accessor accessor;
+ public WrappedParameter(WrappedParameter wrapped)
+ {
+ this.name = wrapped.name;
+ this.type = wrapped.type;
+ this.typeArguments = wrapped.typeArguments;
+ this.variable = wrapped.variable;
+ this.holder = wrapped.holder;
+ this.index = wrapped.index;
+ this.accessor = wrapped.accessor;
+ }
+
public WrappedParameter(QName name, String type, String variable, int index)
{
this.setName(name);
17 years, 2 months
JBossWS SVN: r2436 - in branches/jbossws-1.2.0/jbossws-tests: src/main/java/org/jboss/test/ws/jaxws/complex and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jason.greene(a)jboss.com
Date: 2007-02-21 18:55:38 -0500 (Wed, 21 Feb 2007)
New Revision: 2436
Modified:
branches/jbossws-1.2.0/jbossws-tests/build.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl
Log:
Correct test case which should have had only one return type in the WSDL.
The WSDL must have come from 1.0.4 which has a bug that always inserts "result"
Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-21 23:54:20 UTC (rev 2435)
+++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-21 23:55:38 UTC (rev 2436)
@@ -372,7 +372,7 @@
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}">
<src path="${tests.java.dir}"/>
- <exclude name="org/jboss/test/ws/jaxws/**"/>
+ <exclude name="org/jboss/test/ws/jaxws/**/*"/>
<exclude name="org/jboss/test/ws/tools/jaxws/**"/>
<exclude name="org/jboss/test/ws/tools/jsr181/**"/>
<classpath refid="javac.classpath"/>
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-02-21 23:54:20 UTC (rev 2435)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/JSR181ComplexTestCase.java 2007-02-21 23:55:38 UTC (rev 2436)
@@ -72,14 +72,12 @@
XMLGregorianCalendar cal = getCalendar();
- Holder<Long> registeredID = new Holder<Long>();
- Holder<Long> result = new Holder<Long>();
- port.register(customer, cal, registeredID, result);
+ port.register(customer, cal);
customer = getAlCapone();
try
{
- port.register(customer, cal, registeredID, result);
+ port.register(customer, cal);
fail("Expected AlreadyRegisteredFault");
}
catch (AlreadyRegisteredFault_Exception e)
@@ -93,22 +91,15 @@
InvoiceCustomer customer = getInvoiceFredJackson();
customer.getReferredCustomers().add(getJohnDoe());
customer.getReferredCustomers().add(getAlCapone());
-
- Holder<Boolean> done = new Holder<Boolean>();
- Holder<Boolean> result = new Holder<Boolean>();
- port.registerForInvoice(customer, done, result);
- assertTrue(result.value);
+
+ assertTrue(port.registerForInvoice(customer));
}
public void testOtherPackage() throws Exception
{
- Holder<Statistics> statistics = new Holder<Statistics>();
- Holder<Statistics> result = new Holder<Statistics>();
- port.getStatistics(getFredJackson(), statistics, result);
- Statistics stats = statistics.value;
+ Statistics stats = port.getStatistics(getFredJackson());
System.out.println(stats.getActivationTime());
-
assertEquals(10, stats.getHits());
}
@@ -118,12 +109,10 @@
customers.add(getFredJackson());
customers.add(getJohnDoe());
- Holder<List<Long>> registeredIDs = new Holder<List<Long>>();
- Holder<List<Long>> result = new Holder<List<Long>>();
- port.bulkRegister(customers, getCalendar(), registeredIDs, result);
+ List<Long> result = port.bulkRegister(customers, getCalendar());
- assertEquals(123, result.value.get(0).longValue());
- assertEquals(124, result.value.get(1).longValue());
+ assertEquals(123, result.get(0).longValue());
+ assertEquals(124, result.get(1).longValue());
customers.clear();
customers.add(getFredJackson());
@@ -134,7 +123,7 @@
try
{
- port.bulkRegister(customers, getCalendar(), registeredIDs, result);
+ port.bulkRegister(customers, getCalendar());
}
catch (ValidationFault_Exception e)
{
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2007-02-21 23:54:20 UTC (rev 2435)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/complex/RegistrationServiceImpl.java 2007-02-21 23:55:38 UTC (rev 2436)
@@ -47,7 +47,7 @@
// Provide logging
private static Logger log = Logger.getLogger(RegistrationServiceImpl.class);
- public void register(Customer customer, Object when, Holder<Long> registeredID, Holder<Long> result) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception
+ public long register(Customer customer, Object when) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception
{
Name name = customer.getName();
if (name == null)
@@ -70,10 +70,10 @@
}
log.info("registering customer: " + customer);
- result.value = customer.getId();
+ return customer.getId();
}
- public void bulkRegister(List<Customer> customers, Object when, Holder<List<Long>> registeredIDs, Holder<List<Long>> result) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception
+ public List<Long> bulkRegister(List<Customer> customers, Object when) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception
{
List<Long> registered = new ArrayList<Long>(customers.size());
List<Long> failed = new ArrayList<Long>(customers.size());
@@ -82,10 +82,7 @@
{
try
{
- Holder<Long> id = new Holder<Long>();
- Holder<Long> res = new Holder<Long>();
- register(c, when, id, res);
- registered.add(res.value);
+ registered.add(register(c, when));
}
catch (ValidationFault_Exception e)
{
@@ -100,21 +97,21 @@
throw new ValidationFault_Exception("Validation errors on bulk registering customers", fault);
}
- result.value = registered;
+ return registered;
}
- public void registerForInvoice(InvoiceCustomer invoiceCustomer, Holder<Boolean> done, Holder<Boolean> result) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception
+ public boolean registerForInvoice(InvoiceCustomer invoiceCustomer) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception
{
log.info("registerForInvoice: " + invoiceCustomer.getCycleDay());
- result.value = true;
+ return true;
}
- public void getStatistics(Customer customer, Holder<Statistics> statistics, Holder<Statistics> result)
+ public Statistics getStatistics(Customer customer)
{
Statistics stats = new Statistics();
stats.setHits(10);
stats.setActivationTime(getCalendar());
- result.value = stats;
+ return stats;
}
private XMLGregorianCalendar getCalendar()
Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl
===================================================================
--- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl 2007-02-21 23:54:20 UTC (rev 2435)
+++ branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/complex/META-INF/wsdl/Registration_PortType.wsdl 2007-02-21 23:55:38 UTC (rev 2436)
@@ -23,7 +23,6 @@
<xs:complexType name="RegisterResponse">
<xs:sequence>
<xs:element name="RegisteredID" type="xs:long"/>
- <xs:element name="result" type="xs:long"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="AlreadyRegisteredFault">
@@ -52,7 +51,6 @@
<xs:complexType name="GetStatisticsResponse">
<xs:sequence>
<xs:element name="Statistics" nillable="true" type="ns2:Statistics"/>
- <xs:element name="result" nillable="true" type="ns2:Statistics"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="BulkRegister">
@@ -64,7 +62,6 @@
<xs:complexType name="BulkRegisterResponse">
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0" name="RegisteredIDs" type="xs:long"/>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="result" type="xs:long"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="RegisterForInvoice">
@@ -75,7 +72,6 @@
<xs:complexType name="RegisterForInvoiceResponse">
<xs:sequence>
<xs:element name="done" type="xs:boolean"/>
- <xs:element name="result" type="xs:boolean"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
17 years, 2 months