JBossWS SVN: r1926 - trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-11 09:55:27 -0500 (Thu, 11 Jan 2007)
New Revision: 1926
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
Log:
cleanup swa fix
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-11 14:51:07 UTC (rev 1925)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-11 14:55:27 UTC (rev 1926)
@@ -142,8 +142,7 @@
// Temporary files used by this reader.
private List<File> tempFiles = new ArrayList<File>();
- // SWA handling
- private static final QName SWA_PORT_TYPE = new QName("jboss.ws.wsdl.porttype.swa");
+ // SWA handling
private Map<QName, List<String>> skippedSWAParts = new HashMap<QName, List<String>>();
/**
@@ -769,7 +768,7 @@
// R2204 A document-literal binding in a DESCRIPTION MUST refer, in each of its soapbind:body element(s),
// only to wsdl:part element(s) that have been defined using the element attribute
// [hb] do this only for non swa porttypes
- if (srcPart.getElementName() == null && srcPart.getExtensionAttribute(SWA_PORT_TYPE)==null)
+ if (srcPart.getElementName() == null)
throw new WSDLException(WSDLException.INVALID_WSDL, "Document style message parts must define an element name: " + srcMessage.getQName());
// <part name="param" element="tns:SomeType" />
@@ -929,7 +928,7 @@
// Input
if(bindingOperation.getBindingInput()!=null)
- markSWAParts( bindingOperation.getBindingInput().getExtensibilityElements() , srcBinding, srcWsdl);
+ markSWAParts( bindingOperation.getBindingInput().getExtensibilityElements() , srcBinding, srcWsdl);
// Output
if(bindingOperation.getBindingOutput()!=null)
@@ -966,8 +965,6 @@
}
}
- PortTypeImpl p = (PortTypeImpl)srcWsdl.getPortTypes().get(portTypeName);
- p.setExtensionAttribute( SWA_PORT_TYPE, "true");
break;
}
}
18 years
- 1
- 0
JBossWS SVN: r1925 - in trunk: jbossws-tests/src/main/java/org/jboss/test/ws/common/wsdl11 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-11 09:51:07 -0500 (Thu, 11 Jan 2007)
New Revision: 1925
Added:
trunk/jbossws-tests/src/main/resources/common/wsdl11/SwaTestService.wsdl
trunk/jbossws-tests/src/main/resources/common/wsdl11/WS-ISwA.xsd
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java
Log:
Fix SWA processing
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-11 14:44:14 UTC (rev 1924)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-01-11 14:51:07 UTC (rev 1925)
@@ -102,6 +102,7 @@
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import com.ibm.wsdl.PortTypeImpl;
/**
* A helper that translates a WSDL-1.1 object graph into a WSDL-2.0 object graph.
@@ -141,6 +142,10 @@
// Temporary files used by this reader.
private List<File> tempFiles = new ArrayList<File>();
+ // SWA handling
+ private static final QName SWA_PORT_TYPE = new QName("jboss.ws.wsdl.porttype.swa");
+ private Map<QName, List<String>> skippedSWAParts = new HashMap<QName, List<String>>();
+
/**
* Takes a WSDL11 Definition element and converts into
* our object graph that has been developed for WSDL20
@@ -521,7 +526,7 @@
Message srcMessage = srcInput.getMessage();
if (srcMessage == null)
throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find input message on operation " + srcOperation.getName() + " on port type: "
- + srcPortType.getQName());
+ + srcPortType.getQName());
log.trace("processOperationInput: " + srcMessage.getQName());
@@ -542,12 +547,15 @@
WSDLInterfaceOperationInput rpcInput = new WSDLInterfaceOperationInput(destOperation);
for (Part srcPart : (List<Part>)srcMessage.getOrderedParts(paramOrder))
{
+ // Skip SWA attachment parts
+ if( ignorePart(srcPortType, srcPart) ) continue;
+
if (Constants.URI_STYLE_DOCUMENT == destOperation.getStyle())
{
WSDLInterfaceOperationInput destInput = new WSDLInterfaceOperationInput(destOperation);
QName elementName = messagePartToElementName(srcMessage, srcPart, destOperation);
destInput.setElement(elementName);
-
+
//Lets remember the Message name
destInput.setMessageName(srcMessage.getQName());
destOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_IN, srcMessage.getQName().getLocalPart()));
@@ -578,6 +586,22 @@
}
}
+ private boolean ignorePart(PortType srcPortType, Part srcPart) {
+
+ boolean canBeSkipped = false;
+ QName parentName = srcPortType.getQName();
+ if(skippedSWAParts.containsKey(parentName))
+ {
+ if(skippedSWAParts.get(parentName).contains(srcPart.getName()))
+ {
+ log.trace("Skip attachment part: " + parentName+"->"+srcPart.getName());
+ canBeSkipped = true;
+ }
+ }
+
+ return canBeSkipped;
+ }
+
private void processOperationOutput(Definition srcWsdl, Operation srcOperation, WSDLInterfaceOperation destOperation, PortType srcPortType) throws WSDLException
{
Output srcOutput = srcOperation.getOutput();
@@ -590,8 +614,8 @@
Message srcMessage = srcOutput.getMessage();
if (srcMessage == null)
throw new WSDLException(WSDLException.INVALID_WSDL, "Cannot find output message on operation " + srcOperation.getName() + " on port type: "
- + srcPortType.getQName());
-
+ + srcPortType.getQName());
+
log.trace("processOperationOutput: " + srcMessage.getQName());
destOperation.setPattern(Constants.WSDL20_PATTERN_IN_OUT);
@@ -617,6 +641,9 @@
WSDLInterfaceOperationOutput rpcOutput = new WSDLInterfaceOperationOutput(destOperation);
for (Part srcPart : (List<Part>)srcMessage.getOrderedParts(null))
{
+ // Skip SWA attachment parts
+ if(ignorePart(srcPortType, srcPart)) continue;
+
if (Constants.URI_STYLE_DOCUMENT == destOperation.getStyle())
{
WSDLInterfaceOperationOutput destOutput = new WSDLInterfaceOperationOutput(destOperation);
@@ -711,12 +738,12 @@
}
/** Translate the message part name into an XML element name.
- * @throws WSDLException
+ * @throws WSDLException
*/
private QName messagePartToElementName(Message srcMessage, Part srcPart, WSDLInterfaceOperation destOperation) throws WSDLException
{
QName xmlName;
-
+
// R2306 A wsdl:message in a DESCRIPTION MUST NOT specify both type and element attributes on the same wsdl:part
if (srcPart.getTypeName() != null && srcPart.getElementName() != null)
throw new WSDLException(WSDLException.INVALID_WSDL, "Message parts must not define an element name and type name: " + srcMessage.getQName());
@@ -728,11 +755,11 @@
// only to wsdl:part element(s) that have been defined using the type attribute.
if (srcPart.getName() == null)
throw new WSDLException(WSDLException.INVALID_WSDL, "RPC style message parts must define a typy name: " + srcMessage.getQName());
-
+
// <part name="param" element="tns:SomeType" />
// Headers do have an element name even in rpc
xmlName = srcPart.getElementName();
-
+
// <part name="param" type="xsd:string" />
if (xmlName == null)
xmlName = new QName(srcPart.getName());
@@ -741,9 +768,10 @@
{
// R2204 A document-literal binding in a DESCRIPTION MUST refer, in each of its soapbind:body element(s),
// only to wsdl:part element(s) that have been defined using the element attribute
- if (srcPart.getElementName() == null)
+ // [hb] do this only for non swa porttypes
+ if (srcPart.getElementName() == null && srcPart.getExtensionAttribute(SWA_PORT_TYPE)==null)
throw new WSDLException(WSDLException.INVALID_WSDL, "Document style message parts must define an element name: " + srcMessage.getQName());
-
+
// <part name="param" element="tns:SomeType" />
xmlName = srcPart.getElementName();
}
@@ -859,6 +887,9 @@
destBinding.setType(bindingType);
destWsdl.addBinding(destBinding);
+ // mark SWA Parts upfront
+ preProcessSWAParts(srcBinding, srcWsdl);
+
processPortType(srcWsdl, srcPortType);
String bindingStyle = Style.getDefaultStyle().toString();
@@ -883,6 +914,65 @@
return true;
}
+ /**
+ * Identify and mark message parts that belong to
+ * an SWA binding and can be skipped when processing this WSDL
+ * @param srcBinding
+ * @param srcWsdl
+ */
+ private void preProcessSWAParts(Binding srcBinding, Definition srcWsdl) {
+
+ Iterator opIt = srcBinding.getBindingOperations().iterator();
+ while(opIt.hasNext())
+ {
+ BindingOperation bindingOperation = (BindingOperation)opIt.next();
+
+ // Input
+ if(bindingOperation.getBindingInput()!=null)
+ markSWAParts( bindingOperation.getBindingInput().getExtensibilityElements() , srcBinding, srcWsdl);
+
+ // Output
+ if(bindingOperation.getBindingOutput()!=null)
+ markSWAParts( bindingOperation.getBindingOutput().getExtensibilityElements() , srcBinding, srcWsdl);
+ }
+ }
+
+ private void markSWAParts(List extensions, Binding srcBinding, Definition srcWsdl) {
+ Iterator extIt = extensions.iterator();
+ while(extIt.hasNext())
+ {
+ Object o = extIt.next();
+ if(o instanceof MIMEMultipartRelated)
+ {
+
+ QName portTypeName = srcBinding.getPortType().getQName();
+
+ if(log.isTraceEnabled())
+ log.trace("SWA found on portType" + portTypeName);
+
+ MIMEMultipartRelated mrel = (MIMEMultipartRelated)o;
+ Iterator mimePartIt = mrel.getMIMEParts().iterator();
+ while(mimePartIt.hasNext())
+ {
+ MIMEPart mimePartDesc = (MIMEPart)mimePartIt.next();
+ List mimePartExt = mimePartDesc.getExtensibilityElements();
+ if(! mimePartExt.isEmpty() && (mimePartExt.get(0) instanceof MIMEContent))
+ {
+ MIMEContent mimeContent = (MIMEContent)mimePartExt.get(0);
+
+ if(skippedSWAParts.get(portTypeName)==null)
+ skippedSWAParts.put(portTypeName, new ArrayList<String>());
+ skippedSWAParts.get(portTypeName).add(mimeContent.getPart());
+ }
+ }
+
+ PortTypeImpl p = (PortTypeImpl)srcWsdl.getPortTypes().get(portTypeName);
+ p.setExtensionAttribute( SWA_PORT_TYPE, "true");
+ break;
+ }
+ }
+ }
+
private Map<QName, Binding> getPortTypeBindings(Definition srcWsdl)
{
getAllDefinedBindings(srcWsdl);
@@ -990,7 +1080,7 @@
}
private void processBindingInput(Definition srcWsdl, WSDLBindingOperation destBindingOperation, final WSDLInterfaceOperation destIntfOperation,
- final BindingOperation srcBindingOperation, BindingInput srcBindingInput) throws WSDLException
+ final BindingOperation srcBindingOperation, BindingInput srcBindingInput) throws WSDLException
{
log.trace("processBindingInput");
@@ -1023,7 +1113,7 @@
}
private void processBindingOutput(Definition srcWsdl, WSDLBindingOperation destBindingOperation, final WSDLInterfaceOperation destIntfOperation,
- final BindingOperation srcBindingOperation, BindingOutput srcBindingOutput) throws WSDLException
+ final BindingOperation srcBindingOperation, BindingOutput srcBindingOutput) throws WSDLException
{
log.trace("processBindingInput");
@@ -1057,7 +1147,7 @@
}
private void processBindingReference(Definition srcWsdl, WSDLBindingOperation destBindingOperation, WSDLInterfaceOperation destIntfOperation, QName soap11Body,
- List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, BindingOperation srcBindingOperation, ReferenceCallback callback) throws WSDLException
+ List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, BindingOperation srcBindingOperation, ReferenceCallback callback) throws WSDLException
{
for (ExtensibilityElement extElement : extList)
{
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-01-11 14:44:14 UTC (rev 1924)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2007-01-11 14:51:07 UTC (rev 1925)
@@ -173,4 +173,14 @@
assertNotNull(eventSourceInterface);
assertEquals(eventSourceInterface.getQName().getNamespaceURI(), EventingConstants.NS_EVENTING);
}
+
+ public void testSwaMessages() throws Exception
+ {
+ File wsdlFile = new File("resources/common/wsdl11/SwaTestService.wsdl");
+ assertTrue(wsdlFile.exists());
+
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL());
+ assertNotNull(wsdlDefinitions); // should throw an Exception when SWA parts are not skipped
+ }
}
Added: trunk/jbossws-tests/src/main/resources/common/wsdl11/SwaTestService.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/common/wsdl11/SwaTestService.wsdl 2007-01-11 14:44:14 UTC (rev 1924)
+++ trunk/jbossws-tests/src/main/resources/common/wsdl11/SwaTestService.wsdl 2007-01-11 14:51:07 UTC (rev 1925)
@@ -0,0 +1,487 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="SwaTestService"
+ targetNamespace="http://SwaTestService.org/wsdl"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:tns="http://SwaTestService.org/wsdl"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+ xmlns:s="http://SwaTestService.org/xsd"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+ <types>
+ <schema targetNamespace="http://SwaTestService.org/xsd"
+ xmlns:tns="http://SwaTestService.org/xsd"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:ref="http://ws-i.org/profiles/basic/1.1/xsd"
+ elementFormDefault="qualified">
+ <import namespace="http://ws-i.org/profiles/basic/1.1/xsd" schemaLocation="WS-ISwA.xsd"/>
+ <element name="InputRequestGet" type="tns:InputRequestGet"/>
+ <complexType name="InputRequestGet">
+ <sequence>
+ <element name="mimeType1" type="string"/>
+ <element name="mimeType2" type="string"/>
+ <element name="url1" type="string"/>
+ <element name="url2" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="InputRequestPut" type="tns:InputRequestPut"/>
+ <complexType name="InputRequestPut">
+ <sequence>
+ <element name="mimeType1" type="string"/>
+ <element name="mimeType2" type="string"/>
+ <element name="header" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="InputRequest" type="tns:InputRequest"/>
+ <complexType name="InputRequest">
+ <sequence>
+ <element name="mimeType1" type="string"/>
+ <element name="mimeType2" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="InputRequestThrowAFault" type="tns:InputRequestThrowAFault"/>
+ <complexType name="InputRequestThrowAFault">
+ <sequence>
+ <element name="mimeType1" type="string"/>
+ <element name="mimeType2" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="InputRequestWithHeader" type="tns:InputRequestWithHeader"/>
+ <complexType name="InputRequestWithHeader">
+ <sequence>
+ <element name="mimeType1" type="string"/>
+ <element name="mimeType2" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="InputRequestString" type="tns:InputRequestString"/>
+ <complexType name="InputRequestString">
+ <sequence>
+ <element name="myString" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="OutputResponse" type="tns:OutputResponse"/>
+ <complexType name="OutputResponse">
+ <sequence>
+ <element name="mimeType1" type="string"/>
+ <element name="mimeType2" type="string"/>
+ <element name="result" type="string"/>
+ <element name="reason" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="OutputResponseString" type="tns:OutputResponseString"/>
+ <complexType name="OutputResponseString">
+ <sequence>
+ <element name="myString" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="MyHeader" type="tns:MyHeader"/>
+ <complexType name="MyHeader">
+ <sequence>
+ <annotation>
+ <documentation>
+ This is my header
+ </documentation>
+ </annotation>
+ <element name="message" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="MyFaultReason" type="tns:MyFaultType"/>
+ <complexType name="MyFaultType">
+ <sequence>
+ <annotation>
+ <documentation>
+ This is my fault
+ </documentation>
+ </annotation>
+ <element name="message" type="string"/>
+ </sequence>
+ </complexType>
+ <element name="VoidRequest" type="tns:VoidRequest"/>
+ <complexType name="VoidRequest">
+ <sequence/>
+ </complexType>
+ <element name="OutputResponseAll" type="tns:OutputResponseAll"/>
+ <complexType name="OutputResponseAll">
+ <sequence>
+ <element name="result" type="string"/>
+ <element name="reason" type="string"/>
+ </sequence>
+ </complexType>
+ </schema>
+ </types>
+
+ <message name="messageInputGet">
+ <part name="request" element="s:InputRequestGet"/>
+ </message>
+
+ <message name="messageInputPut">
+ <part name="request" element="s:InputRequestPut"/>
+ <part name="attach1" type="xsd:string"/>
+ <part name="attach2" type="xsd:string"/>
+ </message>
+
+ <message name="messageInput">
+ <part name="request" element="s:InputRequest"/>
+ <part name="attach1" type="xsd:string"/>
+ <part name="attach2" type="xsd:string"/>
+ </message>
+
+ <message name="messageInputThrowAFault">
+ <part name="request" element="s:InputRequestThrowAFault"/>
+ <part name="attach1" type="xsd:string"/>
+ <part name="attach2" type="xsd:string"/>
+ </message>
+
+ <message name="messageInputNoAttachments">
+ <part name="request" element="s:InputRequestString"/>
+ </message>
+
+ <message name="messageInputAllAttachmentTypes">
+ <part name="request" element="s:VoidRequest"/>
+ <part name="attach1" type="xsd:string"/>
+ <part name="attach2" type="xsd:string"/>
+ <part name="attach3" type="xsd:string"/>
+ <part name="attach4" type="xsd:base64Binary"/>
+ <part name="attach5" type="xsd:base64Binary"/>
+ </message>
+
+ <message name="messageInputWithHeader">
+ <part name="request" element="s:InputRequestWithHeader"/>
+ <part name="header" element="s:MyHeader"/>
+ <part name="attach1" type="xsd:string"/>
+ <part name="attach2" type="xsd:string"/>
+ </message>
+
+ <message name="messageOutput">
+ <part name="response" element="s:OutputResponse"/>
+ <part name="attach1" type="xsd:string"/>
+ <part name="attach2" type="xsd:string"/>
+ </message>
+
+ <message name="messageOutputAllAttachmentTypes">
+ <part name="response" element="s:OutputResponseAll"/>
+ <part name="attach1" type="xsd:string"/>
+ <part name="attach2" type="xsd:string"/>
+ <part name="attach3" type="xsd:string"/>
+ <part name="attach4" type="xsd:base64Binary"/>
+ <part name="attach5" type="xsd:base64Binary"/>
+ </message>
+
+ <message name="messageOutputStringResponse">
+ <part name="response" element="s:OutputResponseString"/>
+ </message>
+
+ <message name="MyFault">
+ <part name="MyFault" element="s:MyFaultReason"/>
+ </message>
+
+ <message name="MyHeaderFault">
+ <part name="MyHeaderFault" element="s:MyHeaderFaultReason"/>
+ </message>
+
+ <portType name="SwaTest1">
+ <operation name="getMultipleAttachments">
+ <input message="tns:messageInputGet"/>
+ <output message="tns:messageOutput"/>
+ </operation>
+ <operation name="putMultipleAttachments">
+ <input message="tns:messageInputPut"/>
+ <output message="tns:messageOutputStringResponse"/>
+ </operation>
+ <operation name="echoMultipleAttachments">
+ <input message="tns:messageInput"/>
+ <output message="tns:messageOutput"/>
+ </operation>
+ <operation name="echoNoAttachments">
+ <input message="tns:messageInputNoAttachments"/>
+ <output message="tns:messageOutputStringResponse"/>
+ </operation>
+ <operation name="echoAllAttachmentTypes">
+ <input message="tns:messageInputAllAttachmentTypes"/>
+ <output message="tns:messageOutputAllAttachmentTypes"/>
+ </operation>
+ <operation name="echoAttachmentsAndThrowAFault">
+ <input message="tns:messageInputThrowAFault"/>
+ <output message="tns:messageOutput"/>
+ <fault name="MyFault" message="tns:MyFault"/>
+ </operation>
+ <operation name="echoAttachmentsWithHeader">
+ <input message="tns:messageInputWithHeader"/>
+ <output message="tns:messageOutput"/>
+ <fault name="MyFault" message="tns:MyFault"/>
+ </operation>
+ </portType>
+
+ <portType name="SwaTest2">
+ <operation name="putMultipleAttachments">
+ <input message="tns:messageInputPut"/>
+ <output message="tns:messageOutputStringResponse"/>
+ </operation>
+ <operation name="echoNoAttachments">
+ <input message="tns:messageInputNoAttachments"/>
+ <output message="tns:messageOutputStringResponse"/>
+ </operation>
+ </portType>
+
+ <binding name="SwaTestSoapBinding1" type="tns:SwaTest1">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="getMultipleAttachments">
+ <soap:operation/>
+ <input>
+ <soap:body parts="request" use="literal"/>
+ </input>
+ <output>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="response" use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/html"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </output>
+ </operation>
+ <operation name="putMultipleAttachments">
+ <soap:operation/>
+ <input>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="request" use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ <mime:content part="attach1" type="text/html"/>
+ <mime:content part="attach1" type="text/xml"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/plain"/>
+ <mime:content part="attach2" type="text/html"/>
+ <mime:content part="attach2" type="text/xml"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </input>
+ <output>
+ <soap:body use="literal" message="tns:messageOutputStringResponse" parts="response"/>
+ </output>
+ </operation>
+ <operation name="echoMultipleAttachments">
+ <soap:operation/>
+ <input>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="request" use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ <mime:content part="attach1" type="text/html"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/plain"/>
+ <mime:content part="attach2" type="text/html"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </input>
+ <output>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="response" use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ <mime:content part="attach1" type="text/html"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/plain"/>
+ <mime:content part="attach2" type="text/html"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </output>
+ </operation>
+ <operation name="echoNoAttachments">
+ <soap:operation/>
+ <input>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="request" use="literal"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </input>
+ <output>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body use="literal" message="tns:messageOutputStringResponse" parts="response"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </output>
+ </operation>
+ <operation name="echoAllAttachmentTypes">
+ <soap:operation/>
+ <input>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="request" use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/html"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach3" type="text/xml"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach4" type="image/jpeg"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach5" type="image/jpeg"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </input>
+ <output>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="response" use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/html"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach3" type="text/xml"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach4" type="image/jpeg"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach5" type="image/jpeg"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </output>
+ </operation>
+ <operation name="echoAttachmentsAndThrowAFault">
+ <soap:operation/>
+ <input>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="request" use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/html"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </input>
+ <output>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="response" use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/html"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </output>
+ <fault name="MyFault">
+ <soap:fault name="MyFault" use="literal"/>
+ </fault>
+ </operation>
+ <operation name="echoAttachmentsWithHeader">
+ <soap:operation/>
+ <input>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="request" use="literal"/>
+ <soap:header part="header" use="literal" message="tns:messageInputWithHeader"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/html"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </input>
+ <output>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="response" use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/html"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </output>
+ <fault name="MyFault">
+ <soap:fault name="MyFault" use="literal"/>
+ </fault>
+ </operation>
+ </binding>
+
+ <binding name="SwaTestSoapBinding2" type="tns:SwaTest2">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="putMultipleAttachments">
+ <soap:operation/>
+ <input>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="request" use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach1" type="text/plain"/>
+ <mime:content part="attach1" type="text/html"/>
+ <mime:content part="attach1" type="text/xml"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attach2" type="text/plain"/>
+ <mime:content part="attach2" type="text/html"/>
+ <mime:content part="attach2" type="text/xml"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </input>
+ <output>
+ <soap:body use="literal" message="tns:messageOutputStringResponse" parts="response"/>
+ </output>
+ </operation>
+ <operation name="echoNoAttachments">
+ <soap:operation/>
+ <input>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body parts="request" use="literal"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </input>
+ <output>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body use="literal" message="tns:messageOutputStringResponse" parts="response"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </output>
+ </operation>
+ </binding>
+
+ <service name="WSIDLSwaTestService">
+ <port name="SwaTestOnePort" binding="tns:SwaTestSoapBinding1">
+ <soap:address location="http://localhost:8080/WSIDLSwaTest/jaxws/SwaTestOne"/>
+ </port>
+ <port name="SwaTestTwoPort" binding="tns:SwaTestSoapBinding2">
+ <soap:address location="http://localhost:8080/WSIDLSwaTest/jaxws/SwaTestTwo"/>
+ </port>
+ </service>
+</definitions>
Property changes on: trunk/jbossws-tests/src/main/resources/common/wsdl11/SwaTestService.wsdl
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/jbossws-tests/src/main/resources/common/wsdl11/WS-ISwA.xsd
===================================================================
--- trunk/jbossws-tests/src/main/resources/common/wsdl11/WS-ISwA.xsd 2007-01-11 14:44:14 UTC (rev 1924)
+++ trunk/jbossws-tests/src/main/resources/common/wsdl11/WS-ISwA.xsd 2007-01-11 14:51:07 UTC (rev 1925)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!--
+ Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+ SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+-->
+
+<!--
+ July, 2002
+
+ (c) Copyright 2003, The Web Services-Interoperability Organization (WS-I)
+ Download or use of this file is governed by the Policies and Bylaws of WS-I.
+
+ For more information, send email info(a)ws-i.org.
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+ targetNamespace="http://ws-i.org/profiles/basic/1.1/xsd"
+ xmlns:tns="http://ws-i.org/profiles/basic/1.1/xsd">
+ <xsd:simpleType name="swaRef">
+ <xsd:restriction base="xsd:anyURI" />
+ </xsd:simpleType>
+</xsd:schema>
18 years
- 1
- 0
JBossWS SVN: r1924 - in branches/tdiesler/trunk/jbossws-tests: ant-import and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-11 09:44:14 -0500 (Thu, 11 Jan 2007)
New Revision: 1924
Added:
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml
Modified:
branches/tdiesler/trunk/jbossws-tests/.classpath
branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
Log:
Add test for [JBWS-1384] - Cannot obtain java/xml type mapping for attachment part
Modified: branches/tdiesler/trunk/jbossws-tests/.classpath
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/.classpath 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/.classpath 2007-01-11 14:44:14 UTC (rev 1924)
@@ -40,11 +40,6 @@
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/junit.jar"/>
- <classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-jaxrpc.jar"/>
- <classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-jaxws.jar"/>
- <classpathentry kind="lib" path="/jbossws-core/output/lib/jboss-saaj.jar"/>
- <classpathentry kind="lib" path="/jbossws-core/output/lib/jbossws-client.jar"/>
- <classpathentry kind="lib" path="/jbossws-core/output/lib/jbossws-core.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/mail.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-11 14:44:14 UTC (rev 1924)
@@ -933,6 +933,19 @@
</webinf>
</war>
+ <!-- jaxrpc-jbws1384 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1384.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1384/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws1384/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1384/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxrpc-jbws1386 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,81 @@
+/*
+ * 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.jaxrpc.jbws1384;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
+import javax.xml.rpc.Stub;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl;
+
+/**
+ * Cannot obtain java/xml type mapping for attachment part
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1384
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 11-Jan-2007
+ */
+public class JBWS1384TestCase extends JBossWSTest
+{
+ private static TransmulatorInterface port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1384TestCase.class, "jaxrpc-jbws1384.war");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null && false)
+ {
+ ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
+ URL wsdlURL = new File("resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.webservice/samples2", "Gasherbrum");
+ Service service = factory.createService(wsdlURL, serviceName , mappingURL);
+ port = (TransmulatorInterface)service.getPort(TransmulatorInterface.class);
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1384");
+ }
+ }
+
+ public void testEndpoint() throws Exception
+ {
+ if (true)
+ {
+ System.out.println("FIXME: [JBWS-1384] - Cannot obtain java/xml type mapping for attachment part");
+ return;
+ }
+
+ String retStr = port.invokeAttach("user", "pass", "op", "<root/>", "attach");
+ assertEquals("attach", retStr);
+ }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,56 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jaxrpc.jbws1384;
+
+
+public class ParaListType {
+ protected java.lang.String username;
+ protected java.lang.String password;
+ protected java.lang.String operationName;
+ protected java.lang.String inputXML;
+
+ public ParaListType() {
+ }
+
+ public ParaListType(java.lang.String username, java.lang.String password, java.lang.String operationName, java.lang.String inputXML) {
+ this.username = username;
+ this.password = password;
+ this.operationName = operationName;
+ this.inputXML = inputXML;
+ }
+
+ public java.lang.String getUsername() {
+ return username;
+ }
+
+ public void setUsername(java.lang.String username) {
+ this.username = username;
+ }
+
+ public java.lang.String getPassword() {
+ return password;
+ }
+
+ public void setPassword(java.lang.String password) {
+ this.password = password;
+ }
+
+ public java.lang.String getOperationName() {
+ return operationName;
+ }
+
+ public void setOperationName(java.lang.String operationName) {
+ this.operationName = operationName;
+ }
+
+ public java.lang.String getInputXML() {
+ return inputXML;
+ }
+
+ public void setInputXML(java.lang.String inputXML) {
+ this.inputXML = inputXML;
+ }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ParaListType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,26 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jaxrpc.jbws1384;
+
+
+public class ResponseType {
+ protected java.lang.String result;
+
+ public ResponseType() {
+ }
+
+ public ResponseType(java.lang.String result) {
+ this.result = result;
+ }
+
+ public java.lang.String getResult() {
+ return result;
+ }
+
+ public void setResult(java.lang.String result) {
+ this.result = result;
+ }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/ResponseType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,35 @@
+/*
+ * 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.jaxrpc.jbws1384;
+
+import org.jboss.logging.Logger;
+
+public class TranslatorBean implements TransmulatorInterface
+{
+ private Logger log = Logger.getLogger(TranslatorBean.class);
+
+ public String invokeAttach(String username, String password, String operationName, String inputXML, String attachmentContents)
+ {
+ log.info("[user=" + username + ",pass=" + password + ",op=" + operationName + ",xml=" + inputXML + ",attach=" + attachmentContents + "]");
+ return attachmentContents;
+ }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,14 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jaxrpc.jbws1384;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface TransmulatorInterface extends Remote
+{
+ public String invokeAttach(String username, String password, String operationName, String inputXML, String attachmentContents) throws RemoteException;
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1384</package-type>
+ <namespaceURI>http://org.jboss.test.webservice/samples2</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1384</package-type>
+ <namespaceURI>http://org.jboss.test.webservice/samples2/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1384.ParaListType</java-type>
+ <root-type-qname xmlns:typeNS="http://org.jboss.test.webservice/samples2/types">typeNS:paraListType</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>username</java-variable-name>
+ <xml-element-name>username</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>password</java-variable-name>
+ <xml-element-name>password</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>operationName</java-variable-name>
+ <xml-element-name>operationName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>inputXML</java-variable-name>
+ <xml-element-name>inputXML</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1384.ResponseType</java-type>
+ <root-type-qname xmlns:typeNS="http://org.jboss.test.webservice/samples2/types">typeNS:responseType</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1384.Gasherbrum</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://org.jboss.test.webservice/samples2">serviceNS:Gasherbrum</wsdl-service-name>
+ <port-mapping>
+ <port-name>TransmulatorInterfacePort</port-name>
+ <java-port-name>TransmulatorInterfacePort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1384.TransmulatorInterface</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://org.jboss.test.webservice/samples2">portTypeNS:TransmulatorInterface</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://org.jboss.test.webservice/samples2">bindingNS:TransmulatorInterfaceBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>invokeAttach</java-method-name>
+ <wsdl-operation>invokeAttach</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachRequest</wsdl-message>
+ <wsdl-message-part-name>username</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>1</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachRequest</wsdl-message>
+ <wsdl-message-part-name>password</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>2</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachRequest</wsdl-message>
+ <wsdl-message-part-name>operationName</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>3</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachRequest</wsdl-message>
+ <wsdl-message-part-name>inputXML</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <method-param-parts-mapping>
+ <param-position>4</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachRequest</wsdl-message>
+ <wsdl-message-part-name>attachmentContents</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.test.webservice/samples2">wsdlMsgNS:attachResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4" 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">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1384.TranslatorBean</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,16 @@
+<webservices 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://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd' version='1.1'>
+ <webservice-description>
+ <webservice-description-name>ExampleService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/ExampleService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TransmulatorInterfacePort</port-component-name>
+ <wsdl-port xmlns:portNS='http://org.jboss.test.webservice/samples2'>portNS:TransmulatorInterfacePort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1384.TransmulatorInterface</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,65 @@
+<definitions name="Gasherbrum" targetNamespace="http://org.jboss.test.webservice/samples2" xmlns:tns="http://org.jboss.test.webservice/samples2"
+ xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns2="http://org.jboss.test.webservice/samples2/types" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <types>
+ <schema targetNamespace="http://org.jboss.test.webservice/samples2/types" xmlns:tns="http://org.jboss.test.webservice/samples2/types"
+ xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns="http://www.w3.org/2001/XMLSchema">
+ <complexType name="paraListType">
+ <sequence>
+ <element name="username" type="string" nillable="true"/>
+ <element name="password" type="string" nillable="true"/>
+ <element name="operationName" type="string" nillable="true"/>
+ <element name="inputXML" type="string" nillable="true"/>
+ </sequence>
+ </complexType>
+ <complexType name="responseType">
+ <sequence>
+ <element name="result" type="string" nillable="true"/>
+ </sequence>
+ </complexType>
+ <element name="paraList2" type="tns:paraListType"/>
+ <element name="responseXML" type="tns:responseType"/>
+ </schema>
+ </types>
+ <message name="attachRequest">
+ <part name="parameters" element="ns2:paraList2"/>
+ <part name="attachmentContents" type="xsd:string"/>
+ </message>
+ <message name="attachResponse">
+ <part name="result" element="ns2:responseXML"/>
+ </message>
+ <portType name="TransmulatorInterface">
+ <operation name="invokeAttach">
+ <input message="tns:attachRequest"/>
+ <output message="tns:attachResponse"/>
+ </operation>
+ </portType>
+ <binding name="TransmulatorInterfaceBinding" type="tns:TransmulatorInterface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="invokeAttach">
+ <input>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body use="literal"/>
+ </mime:part>
+ <mime:part>
+ <mime:content part="attachmentContents" type="text/plain"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </input>
+ <output>
+ <mime:multipartRelated>
+ <mime:part>
+ <soap:body use="literal"/>
+ </mime:part>
+ </mime:multipartRelated>
+ </output>
+ </operation>
+ </binding>
+ <service name="Gasherbrum">
+ <port name="TransmulatorInterfacePort" binding="tns:TransmulatorInterfaceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/wsdl/ExampleService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wscompile -cp ../../../../output/classes -gen:server -mapping jaxrpc-mapping.xml -keep config.xml
+-->
+
+<configuration
+ xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+
+ <wsdl location="./WEB-INF/wsdl/ExampleService.wsdl"
+ packageName="org.jboss.test.ws.jaxrpc.jbws1384">
+ </wsdl>
+
+</configuration>
+
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml 2007-01-11 13:35:12 UTC (rev 1923)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml 2007-01-11 14:44:14 UTC (rev 1924)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools
+ http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <global>
+ <package-namespace package="org.jboss.test.ws.jaxrpc.jbws1384" namespace="http://org.jboss.test.webservice/samples2"/>
+ </global>
+
+ <wsdl-java location="./WEB-INF/wsdl/ExampleService.wsdl">
+ <mapping file="jaxrpc-mapping.xml" />
+ <webservices servlet-link="ExampleService" />
+ </wsdl-java>
+
+</configuration>
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r1923 - in branches/dlofthouse/JBWS-1259/jbossws-tests/src/main: resources/tools/jbws1259 and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-11 08:35:12 -0500 (Thu, 11 Jan 2007)
New Revision: 1923
Added:
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/Lookup.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook.wsdl
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/wstools-config.xml
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml
Removed:
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml
Modified:
branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
Log:
JBWS-1259 - Added test scenarios.
Modified: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1259/JBWS1259TestCase.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -22,6 +22,7 @@
package org.jboss.test.ws.tools.jbws1259;
import java.io.File;
+import java.io.FilenameFilter;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
@@ -36,30 +37,80 @@
public class JBWS1259TestCase extends JBossWSTest
{
- private static final String resourceDir = "resources/tools/jbws1259";
- private static final String toolsDir = "tools/jbws1259";
+ public void testScenario_A() throws Exception
+ {
+ generateScenario("A");
+ }
- public void testGenerate() throws Exception
+ public void testScenario_B() throws Exception
{
+ generateScenario("B");
+ }
+
+ public void testScenario_C() throws Exception
+ {
+ generateScenario("C");
+ }
+
+ public void testScenario_D() throws Exception
+ {
+ generateScenario("D");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1259/scenario_" + scenario;
+ String toolsDir = "tools/jbws1259/scenario_" + scenario;
String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
new WSTools().generate(args);
- compareSource("Lookup.java");
- compareSource("PhoneBook_PortType.java");
- compareSource("TelephoneNumber.java");
+ File resourceDirFile = new File(resourceDir);
+ String[] expectedFiles = resourceDirFile.list(new FilenameFilter() {
+ public boolean accept(File dir, String name)
+ {
+ return name.endsWith(".java");
+ }
+ });
+ for (int i = 0; i < expectedFiles.length; i++)
+ {
+ String currentFile = expectedFiles[i];
+
+ try
+ {
+ compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1259/" + currentFile);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Validation of '" + currentFile + "' failed.", e);
+ }
+ }
+
+ File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1259");
+ String[] generatedFiles = packageDir.list();
+ for (int i = 0; i < generatedFiles.length; i++)
+ {
+ String currentFile = generatedFiles[i];
+
+ boolean matched = "PhoneBook_Service.java".equals(currentFile);
+
+ for (int j = 0; j < expectedFiles.length && (matched == false); j++)
+ matched = currentFile.equals(expectedFiles[j]);
+
+ assertTrue("File '" + currentFile + "' was not expected to be generated", matched);
+ }
+
JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
}
- private static void compareSource(final String fileName) throws Exception
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
{
- File expected = new File(resourceDir + "/" + fileName);
- File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName);
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
sc.validate();
sc.validateImports();
}
-
}
Deleted: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -1,46 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1259;
-
-
-public class Lookup {
- protected java.lang.String firstName;
- protected java.lang.String surname;
- protected org.jboss.test.ws.jbws1259.Lookup[] lookup;
-
- public Lookup() {
- }
-
- public Lookup(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Lookup[] lookup) {
- this.firstName = firstName;
- this.surname = surname;
- this.lookup = lookup;
- }
-
- public java.lang.String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(java.lang.String firstName) {
- this.firstName = firstName;
- }
-
- public java.lang.String getSurname() {
- return surname;
- }
-
- public void setSurname(java.lang.String surname) {
- this.surname = surname;
- }
-
- public org.jboss.test.ws.jbws1259.Lookup[] getLookup() {
- return lookup;
- }
-
- public void setLookup(org.jboss.test.ws.jbws1259.Lookup[] lookup) {
- this.lookup = lookup;
- }
-}
Deleted: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl 2007-01-11 13:35:12 UTC (rev 1923)
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1259' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1259/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1259' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1259/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1259/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
-
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='areaCode' nillable='true' type='string'/>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
-
- <element name='lookup'>
- <complexType>
- <sequence>
- <element name='firstName' nillable='true' type='string'/>
- <element name='surname' nillable='true' type='string'/>
- <element maxOccurs='unbounded' ref='tns:lookup'/>
- </sequence>
- </complexType>
- </element>
-
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
Deleted: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -1,11 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1259;
-
-public interface PhoneBook_PortType extends java.rmi.Remote {
- public org.jboss.test.ws.jbws1259.TelephoneNumber lookup(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Lookup[] lookup) throws
- java.rmi.RemoteException;
-}
Deleted: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/TelephoneNumber.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -1,36 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1259;
-
-
-public class TelephoneNumber {
- protected java.lang.String areaCode;
- protected java.lang.String number;
-
- public TelephoneNumber() {
- }
-
- public TelephoneNumber(java.lang.String areaCode, java.lang.String number) {
- this.areaCode = areaCode;
- this.number = number;
- }
-
- public java.lang.String getAreaCode() {
- return areaCode;
- }
-
- public void setAreaCode(java.lang.String areaCode) {
- this.areaCode = areaCode;
- }
-
- public java.lang.String getNumber() {
- return number;
- }
-
- public void setNumber(java.lang.String number) {
- this.number = number;
- }
-}
Deleted: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml 2007-01-11 13:35:12 UTC (rev 1923)
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1259</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1259</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1259</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1259/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1259.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1259/types">typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>areaCode</java-variable-name>
- <xml-element-name>areaCode</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1259.Lookup</java-type>
- <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:>lookup</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>firstName</java-variable-name>
- <xml-element-name>firstName</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>lookup</java-variable-name>
- <xml-element-name>lookup</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1259.Lookup[]</java-type>
- <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:>lookup>lookup[1,unbounded]</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1259.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1259">serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1259.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1259">portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1259">bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <wrapped-element/>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>firstName</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>surname</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>2</param-position>
- <param-type>org.jboss.test.ws.jbws1259.Lookup[]</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>lookup</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1259.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/Lookup.java (from rev 1914, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java)
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/Lookup.java 2007-01-10 22:49:33 UTC (rev 1914)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/Lookup.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,46 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class Lookup {
+ protected java.lang.String firstName;
+ protected java.lang.String surname;
+ protected org.jboss.test.ws.jbws1259.Lookup lookup;
+
+ public Lookup() {
+ }
+
+ public Lookup(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Lookup lookup) {
+ this.firstName = firstName;
+ this.surname = surname;
+ this.lookup = lookup;
+ }
+
+ public java.lang.String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(java.lang.String firstName) {
+ this.firstName = firstName;
+ }
+
+ public java.lang.String getSurname() {
+ return surname;
+ }
+
+ public void setSurname(java.lang.String surname) {
+ this.surname = surname;
+ }
+
+ public org.jboss.test.ws.jbws1259.Lookup getLookup() {
+ return lookup;
+ }
+
+ public void setLookup(org.jboss.test.ws.jbws1259.Lookup lookup) {
+ this.lookup = lookup;
+ }
+}
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,46 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class LookupResponse {
+ protected java.lang.String areaCode;
+ protected java.lang.String number;
+ protected org.jboss.test.ws.jbws1259.LookupResponse lookupResponse;
+
+ public LookupResponse() {
+ }
+
+ public LookupResponse(java.lang.String areaCode, java.lang.String number, org.jboss.test.ws.jbws1259.LookupResponse lookupResponse) {
+ this.areaCode = areaCode;
+ this.number = number;
+ this.lookupResponse = lookupResponse;
+ }
+
+ public java.lang.String getAreaCode() {
+ return areaCode;
+ }
+
+ public void setAreaCode(java.lang.String areaCode) {
+ this.areaCode = areaCode;
+ }
+
+ public java.lang.String getNumber() {
+ return number;
+ }
+
+ public void setNumber(java.lang.String number) {
+ this.number = number;
+ }
+
+ public org.jboss.test.ws.jbws1259.LookupResponse getLookupResponse() {
+ return lookupResponse;
+ }
+
+ public void setLookupResponse(org.jboss.test.ws.jbws1259.LookupResponse lookupResponse) {
+ this.lookupResponse = lookupResponse;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/LookupResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook.wsdl (from rev 1914, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl)
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook.wsdl 2007-01-10 22:49:33 UTC (rev 1914)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook.wsdl 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1259' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1259/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1259' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1259/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1259/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <element name='lookup'>
+ <complexType>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ <element ref='tns:lookup'/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name='lookupResponse'>
+ <complexType>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ <element ref='tns:lookupResponse'/>
+ </sequence>
+ </complexType>
+ </element>
+
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Copied: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook_PortType.java (from rev 1914, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java)
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/PhoneBook_PortType.java 2007-01-10 22:49:33 UTC (rev 1914)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/PhoneBook_PortType.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1259.LookupResponse lookup(org.jboss.test.ws.jbws1259.Lookup parameters) throws
+ java.rmi.RemoteException;
+}
Copied: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/jaxrpc-mapping.xml (from rev 1914, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml)
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/jaxrpc-mapping.xml 2007-01-10 22:49:33 UTC (rev 1914)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/jaxrpc-mapping.xml 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1259</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1259</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1259</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1259/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.LookupResponse</java-type>
+ <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:>lookupResponse</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>lookupResponse</java-variable-name>
+ <xml-element-name>lookupResponse</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.Lookup</java-type>
+ <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:>lookup</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>lookup</java-variable-name>
+ <xml-element-name>lookup</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1259.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1259">serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1259.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1259">portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1259">bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1259.Lookup</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1259.LookupResponse</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Copied: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/wstools-config.xml (from rev 1914, branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml)
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml 2007-01-10 22:49:33 UTC (rev 1914)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_A/wstools-config.xml 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1259/scenario_A/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,46 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class Person {
+ protected java.lang.String firstName;
+ protected java.lang.String surname;
+ protected org.jboss.test.ws.jbws1259.Person lookup;
+
+ public Person() {
+ }
+
+ public Person(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Person lookup) {
+ this.firstName = firstName;
+ this.surname = surname;
+ this.lookup = lookup;
+ }
+
+ public java.lang.String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(java.lang.String firstName) {
+ this.firstName = firstName;
+ }
+
+ public java.lang.String getSurname() {
+ return surname;
+ }
+
+ public void setSurname(java.lang.String surname) {
+ this.surname = surname;
+ }
+
+ public org.jboss.test.ws.jbws1259.Person getLookup() {
+ return lookup;
+ }
+
+ public void setLookup(org.jboss.test.ws.jbws1259.Person lookup) {
+ this.lookup = lookup;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1259' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1259/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1259' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1259/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1259/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ <element ref='tns:lookup'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ <element ref='tns:lookupResponse'/>
+ </sequence>
+ </complexType>
+
+ <element name='lookup' type='tns:Person' />
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1259.TelephoneNumber lookup(org.jboss.test.ws.jbws1259.Person parameters) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,46 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class TelephoneNumber {
+ protected java.lang.String areaCode;
+ protected java.lang.String number;
+ protected org.jboss.test.ws.jbws1259.TelephoneNumber lookupResponse;
+
+ public TelephoneNumber() {
+ }
+
+ public TelephoneNumber(java.lang.String areaCode, java.lang.String number, org.jboss.test.ws.jbws1259.TelephoneNumber lookupResponse) {
+ this.areaCode = areaCode;
+ this.number = number;
+ this.lookupResponse = lookupResponse;
+ }
+
+ public java.lang.String getAreaCode() {
+ return areaCode;
+ }
+
+ public void setAreaCode(java.lang.String areaCode) {
+ this.areaCode = areaCode;
+ }
+
+ public java.lang.String getNumber() {
+ return number;
+ }
+
+ public void setNumber(java.lang.String number) {
+ this.number = number;
+ }
+
+ public org.jboss.test.ws.jbws1259.TelephoneNumber getLookupResponse() {
+ return lookupResponse;
+ }
+
+ public void setLookupResponse(org.jboss.test.ws.jbws1259.TelephoneNumber lookupResponse) {
+ this.lookupResponse = lookupResponse;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1259</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1259</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1259</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1259/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1259/types">typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>lookupResponse</java-variable-name>
+ <xml-element-name>lookupResponse</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.Person</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1259/types">typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>lookup</java-variable-name>
+ <xml-element-name>lookup</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1259.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1259">serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1259.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1259">portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1259">bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1259.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1259.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1259/scenario_B/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_B/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,36 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class Comment {
+ protected java.lang.String test;
+ protected org.jboss.test.ws.jbws1259.Comment comment;
+
+ public Comment() {
+ }
+
+ public Comment(java.lang.String test, org.jboss.test.ws.jbws1259.Comment comment) {
+ this.test = test;
+ this.comment = comment;
+ }
+
+ public java.lang.String getTest() {
+ return test;
+ }
+
+ public void setTest(java.lang.String test) {
+ this.test = test;
+ }
+
+ public org.jboss.test.ws.jbws1259.Comment getComment() {
+ return comment;
+ }
+
+ public void setComment(org.jboss.test.ws.jbws1259.Comment comment) {
+ this.comment = comment;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Comment.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,46 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class Person {
+ protected java.lang.String firstName;
+ protected java.lang.String surname;
+ protected org.jboss.test.ws.jbws1259.Comment comment;
+
+ public Person() {
+ }
+
+ public Person(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Comment comment) {
+ this.firstName = firstName;
+ this.surname = surname;
+ this.comment = comment;
+ }
+
+ public java.lang.String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(java.lang.String firstName) {
+ this.firstName = firstName;
+ }
+
+ public java.lang.String getSurname() {
+ return surname;
+ }
+
+ public void setSurname(java.lang.String surname) {
+ this.surname = surname;
+ }
+
+ public org.jboss.test.ws.jbws1259.Comment getComment() {
+ return comment;
+ }
+
+ public void setComment(org.jboss.test.ws.jbws1259.Comment comment) {
+ this.comment = comment;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1259' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1259/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1259' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1259/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1259/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ <element ref='tns:comment'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ <element ref='tns:comment'/>
+ </sequence>
+ </complexType>
+
+ <element name='comment'>
+ <complexType>
+ <sequence>
+ <element name='test' type='string' />
+ <element ref='tns:comment' />
+ </sequence>
+ </complexType>
+ </element>
+
+ <element name='lookup' type='tns:Person' />
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1259.TelephoneNumber lookup(org.jboss.test.ws.jbws1259.Person parameters) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,46 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class TelephoneNumber {
+ protected java.lang.String areaCode;
+ protected java.lang.String number;
+ protected org.jboss.test.ws.jbws1259.Comment comment;
+
+ public TelephoneNumber() {
+ }
+
+ public TelephoneNumber(java.lang.String areaCode, java.lang.String number, org.jboss.test.ws.jbws1259.Comment comment) {
+ this.areaCode = areaCode;
+ this.number = number;
+ this.comment = comment;
+ }
+
+ public java.lang.String getAreaCode() {
+ return areaCode;
+ }
+
+ public void setAreaCode(java.lang.String areaCode) {
+ this.areaCode = areaCode;
+ }
+
+ public java.lang.String getNumber() {
+ return number;
+ }
+
+ public void setNumber(java.lang.String number) {
+ this.number = number;
+ }
+
+ public org.jboss.test.ws.jbws1259.Comment getComment() {
+ return comment;
+ }
+
+ public void setComment(org.jboss.test.ws.jbws1259.Comment comment) {
+ this.comment = comment;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1259</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1259</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1259</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1259/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1259/types">typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>comment</java-variable-name>
+ <xml-element-name>comment</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.Comment</java-type>
+ <anonymous-type-qname>http://test.jboss.org/ws/jbws1259/types:>TelephoneNumber>comment</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>test</java-variable-name>
+ <xml-element-name>test</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>comment</java-variable-name>
+ <xml-element-name>comment</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.Person</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1259/types">typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>comment</java-variable-name>
+ <xml-element-name>comment</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1259.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1259">serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1259.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1259">portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1259">bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1259.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1259.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1259/scenario_C/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_C/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,36 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class Comment {
+ protected java.lang.String test;
+ protected org.jboss.test.ws.jbws1259.Comment comment;
+
+ public Comment() {
+ }
+
+ public Comment(java.lang.String test, org.jboss.test.ws.jbws1259.Comment comment) {
+ this.test = test;
+ this.comment = comment;
+ }
+
+ public java.lang.String getTest() {
+ return test;
+ }
+
+ public void setTest(java.lang.String test) {
+ this.test = test;
+ }
+
+ public org.jboss.test.ws.jbws1259.Comment getComment() {
+ return comment;
+ }
+
+ public void setComment(org.jboss.test.ws.jbws1259.Comment comment) {
+ this.comment = comment;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Comment.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,46 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class Person {
+ protected java.lang.String firstName;
+ protected java.lang.String surname;
+ protected org.jboss.test.ws.jbws1259.Comment comment;
+
+ public Person() {
+ }
+
+ public Person(java.lang.String firstName, java.lang.String surname, org.jboss.test.ws.jbws1259.Comment comment) {
+ this.firstName = firstName;
+ this.surname = surname;
+ this.comment = comment;
+ }
+
+ public java.lang.String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(java.lang.String firstName) {
+ this.firstName = firstName;
+ }
+
+ public java.lang.String getSurname() {
+ return surname;
+ }
+
+ public void setSurname(java.lang.String surname) {
+ this.surname = surname;
+ }
+
+ public org.jboss.test.ws.jbws1259.Comment getComment() {
+ return comment;
+ }
+
+ public void setComment(org.jboss.test.ws.jbws1259.Comment comment) {
+ this.comment = comment;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/Person.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1259' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1259/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1259' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1259/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1259/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+ <complexType name='Person'>
+ <sequence>
+ <element name='firstName' nillable='true' type='string'/>
+ <element name='surname' nillable='true' type='string'/>
+ <element ref='tns:comment'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='TelephoneNumber'>
+ <sequence>
+ <element name='areaCode' nillable='true' type='string'/>
+ <element name='number' nillable='true' type='string'/>
+ <element ref='tns:comment'/>
+ </sequence>
+ </complexType>
+
+ <complexType name='Comment'>
+ <sequence>
+ <element name='test' type='string' />
+ <element ref='tns:comment' />
+ </sequence>
+ </complexType>
+
+ <element name='comment' type='tns:Comment' />
+
+ <element name='lookup' type='tns:Person' />
+ <element name='lookupResponse' type='tns:TelephoneNumber'/>
+ </schema>
+ </types>
+ <message name='PhoneBook_lookup'>
+ <part element='ns1:lookup' name='parameters'/>
+ </message>
+ <message name='PhoneBook_lookupResponse'>
+ <part element='ns1:lookupResponse' name='result'/>
+ </message>
+ <portType name='PhoneBook'>
+ <operation name='lookup'>
+ <input message='tns:PhoneBook_lookup'/>
+ <output message='tns:PhoneBook_lookupResponse'/>
+ </operation>
+ </portType>
+ <binding name='PhoneBookBinding' type='tns:PhoneBook'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='lookup'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='PhoneBook'>
+ <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+public interface PhoneBook_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1259.TelephoneNumber lookup(org.jboss.test.ws.jbws1259.Person parameters) throws
+ java.rmi.RemoteException;
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/PhoneBook_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,46 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1259;
+
+
+public class TelephoneNumber {
+ protected java.lang.String areaCode;
+ protected java.lang.String number;
+ protected org.jboss.test.ws.jbws1259.Comment comment;
+
+ public TelephoneNumber() {
+ }
+
+ public TelephoneNumber(java.lang.String areaCode, java.lang.String number, org.jboss.test.ws.jbws1259.Comment comment) {
+ this.areaCode = areaCode;
+ this.number = number;
+ this.comment = comment;
+ }
+
+ public java.lang.String getAreaCode() {
+ return areaCode;
+ }
+
+ public void setAreaCode(java.lang.String areaCode) {
+ this.areaCode = areaCode;
+ }
+
+ public java.lang.String getNumber() {
+ return number;
+ }
+
+ public void setNumber(java.lang.String number) {
+ this.number = number;
+ }
+
+ public org.jboss.test.ws.jbws1259.Comment getComment() {
+ return comment;
+ }
+
+ public void setComment(org.jboss.test.ws.jbws1259.Comment comment) {
+ this.comment = comment;
+ }
+}
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/TelephoneNumber.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1259</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1259</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1259</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1259/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.TelephoneNumber</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1259/types">typeNS:TelephoneNumber</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>areaCode</java-variable-name>
+ <xml-element-name>areaCode</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>number</java-variable-name>
+ <xml-element-name>number</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>comment</java-variable-name>
+ <xml-element-name>comment</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.Comment</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1259/types">typeNS:Comment</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>test</java-variable-name>
+ <xml-element-name>test</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>comment</java-variable-name>
+ <xml-element-name>comment</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1259.Person</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1259/types">typeNS:Person</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>firstName</java-variable-name>
+ <xml-element-name>firstName</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>surname</java-variable-name>
+ <xml-element-name>surname</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>comment</java-variable-name>
+ <xml-element-name>comment</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1259.PhoneBook_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1259">serviceNS:PhoneBook</wsdl-service-name>
+ <port-mapping>
+ <port-name>PhoneBookPort</port-name>
+ <java-port-name>PhoneBookPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1259.PhoneBook_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1259">portTypeNS:PhoneBook</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1259">bindingNS:PhoneBookBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>lookup</java-method-name>
+ <wsdl-operation>lookup</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1259.Person</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1259.TelephoneNumber</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1259">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml 2007-01-11 13:35:12 UTC (rev 1923)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1259/scenario_D/PhoneBook.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/scenario_D/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml
===================================================================
--- branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml 2007-01-11 12:29:13 UTC (rev 1922)
+++ branches/dlofthouse/JBWS-1259/jbossws-tests/src/main/resources/tools/jbws1259/wstools-config.xml 2007-01-11 13:35:12 UTC (rev 1923)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1259/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
18 years
- 1
- 0
JBossWS SVN: r1922 - branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-11 07:29:13 -0500 (Thu, 11 Jan 2007)
New Revision: 1922
Modified:
branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java
Log:
[JBWS-1393] - Problem interpreting messages with attachment when confronted with no <start> header
Modified: branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java
===================================================================
--- branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2007-01-11 12:16:41 UTC (rev 1921)
+++ branches/tdiesler/trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedDecoder.java 2007-01-11 12:29:13 UTC (rev 1922)
@@ -95,7 +95,11 @@
try
{
- boundary = ("\r\n--" + boundaryParameter).getBytes("US-ASCII");
+ // [JBWS-1393] - Problem interpreting messages with attachment when confronted with no <start> header
+ if (start == null)
+ boundary = ("--" + boundaryParameter).getBytes("US-ASCII");
+ else
+ boundary = ("\r\n--" + boundaryParameter).getBytes("US-ASCII");
}
catch (UnsupportedEncodingException e)
{
@@ -140,7 +144,7 @@
{
if (isValidRootType(part.getContentType()) == false)
throw new IllegalArgumentException("multipart/related type specified a root type other than the one" + " that was found.");
-
+
rootPart = part;
}
else
18 years
- 1
- 0
JBossWS SVN: r1921 - in branches/tdiesler/trunk/jbossws-tests: src/main/java/org/jboss/test/ws/jaxrpc and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-11 07:16:41 -0500 (Thu, 11 Jan 2007)
New Revision: 1921
Added:
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl
branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml
Modified:
branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
Log:
[JBWS-1378] - NPE in replaceAddressLocation with SOAP1.2 WSDL
Modified: branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-01-11 12:16:41 UTC (rev 1921)
@@ -920,6 +920,19 @@
</metainf>
</jar>
+ <!-- jaxrpc-jbws1378 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1378.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1378/**"/>
+ <exclude name="org/jboss/test/ws/jaxrpc/jbws1378/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1378/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+
<!-- jaxrpc-jbws1386 -->
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1386.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1386/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java 2007-01-11 12:16:41 UTC (rev 1921)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jan 11 13:01:23 CET 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jaxrpc.jbws1378;
+
+
+public class Echo
+{
+
+protected java.lang.String value;
+public Echo(){}
+
+public Echo(java.lang.String value){
+this.value=value;
+}
+public java.lang.String getValue() { return value ;}
+
+public void setValue(java.lang.String value){ this.value=value; }
+
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/Echo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java 2007-01-11 12:16:41 UTC (rev 1921)
@@ -0,0 +1,27 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jan 11 13:01:23 CET 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+
+package org.jboss.test.ws.jaxrpc.jbws1378;
+
+
+public class EchoResponse
+{
+
+protected java.lang.String result;
+public EchoResponse(){}
+
+public EchoResponse(java.lang.String result){
+this.result=result;
+}
+public java.lang.String getResult() { return result ;}
+
+public void setResult(java.lang.String result){ this.result=result; }
+
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/EchoResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java 2007-01-11 12:16:41 UTC (rev 1921)
@@ -0,0 +1,15 @@
+/*
+ * JBossWS WS-Tools Generated Source
+ *
+ * Generation Date: Thu Jan 11 13:01:23 CET 2007
+ *
+ * This generated source code represents a derivative work of the input to
+ * the generator that produced it. Consult the input for the copyright and
+ * terms of use that apply to this source code.
+ */
+package org.jboss.test.ws.jaxrpc.jbws1378;
+public interface ExamplePort extends java.rmi.Remote
+{
+
+ public java.lang.String echo(java.lang.String value) throws java.rmi.RemoteException;
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePort.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java 2007-01-11 12:16:41 UTC (rev 1921)
@@ -0,0 +1,38 @@
+/*
+ * 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.jaxrpc.jbws1378;
+
+import java.rmi.RemoteException;
+
+import org.jboss.logging.Logger;
+
+public class ExamplePortBean implements ExamplePort
+{
+ private Logger log = Logger.getLogger(this.getClass());
+
+ public String echo(String message) throws RemoteException
+ {
+ log.info("message: " + message);
+
+ return message;
+ }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/ExamplePortBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java 2007-01-11 12:16:41 UTC (rev 1921)
@@ -0,0 +1,75 @@
+/*
+ * 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.jaxrpc.jbws1378;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+import javax.xml.rpc.ServiceFactory;
+import javax.xml.rpc.Stub;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.ws.core.jaxrpc.ServiceFactoryImpl;
+
+/**
+ * NPE in replaceAddressLocation with SOAP1.2 WSDL
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1378
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 11-Jan-2007
+ */
+public class JBWS1378TestCase extends JBossWSTest
+{
+ private static ExamplePort port;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1378TestCase.class, "jaxrpc-jbws1378.war");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ ServiceFactoryImpl factory = (ServiceFactoryImpl)ServiceFactory.newInstance();
+ URL wsdlURL = new File("resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl").toURL();
+ URL mappingURL = new File("resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new QName("http://org.jboss.test.ws/jbws1378", "ExampleService");
+ Service service = factory.createService(wsdlURL, serviceName , mappingURL);
+ port = (ExamplePort)service.getPort(ExamplePort.class);
+ ((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxrpc-jbws1378");
+ }
+ }
+
+ public void testEndpoint() throws Exception
+ {
+ String retStr = port.echo("Hello World");
+ assertEquals("Hello World", retStr);
+ }
+}
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1378/JBWS1378TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml 2007-01-11 12:16:41 UTC (rev 1921)
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' 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://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1378</package-type>
+ <namespaceURI>http://www.example.com/Example</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1378.Echo</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://www.example.com/Example'>typeNS:>Echo</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>value</java-variable-name>
+ <xml-element-name>value</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1378.EchoResponse</java-type>
+ <anonymous-type-qname xmlns:typeNS='http://www.example.com/Example'>typeNS:>EchoResponse</anonymous-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>result</java-variable-name>
+ <xml-element-name>result</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1378.ExampleService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://www.example.com/Example'>serviceNS:ExampleService</wsdl-service-name>
+ <port-mapping>
+ <port-name>ExamplePort</port-name>
+ <java-port-name>ExamplePort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1378.ExamplePort</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://www.example.com/Example'>portTypeNS:ExamplePort</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://www.example.com/Example'>bindingNS:ExampleBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echo</java-method-name>
+ <wsdl-operation>Echo</wsdl-operation>
+ <wrapped-element/>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://www.example.com/Example'>wsdlMsgNS:EchoInMsg</wsdl-message>
+ <wsdl-message-part-name>value</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://www.example.com/Example'>wsdlMsgNS:EchoOutMsg</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml 2007-01-11 12:16:41 UTC (rev 1921)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4" 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">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1378.ExamplePortBean</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml 2007-01-11 12:16:41 UTC (rev 1921)
@@ -0,0 +1,16 @@
+<webservices 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://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd' version='1.1'>
+ <webservice-description>
+ <webservice-description-name>ExampleService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/ExampleService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>ExamplePort</port-component-name>
+ <wsdl-port xmlns:portNS='http://www.example.com/Example'>portNS:ExamplePort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1378.ExamplePort</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl 2007-01-11 12:16:41 UTC (rev 1921)
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<definitions
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap12/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://www.example.com/Example"
+ xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
+ targetNamespace="http://www.example.com/Example"
+ name="Example"
+ >
+
+ <types>
+ <xsd:schema
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.example.com/Example"
+ elementFormDefault="qualified"
+ >
+
+ <xsd:element name="Echo">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string"
+ minOccurs="1" maxOccurs="1"
+ />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="EchoResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="result" type="xsd:string"
+ minOccurs="1" maxOccurs="1"
+ />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ </xsd:schema>
+ </types>
+
+ <message name="EchoInMsg">
+ <part name="echo" element="tns:Echo"/>
+ </message>
+
+ <message name="EchoOutMsg">
+ <part name="echo" element="tns:EchoResponse"/>
+ </message>
+
+ <portType name="ExamplePort">
+ <operation name="Echo">
+ <input message="tns:EchoInMsg"/>
+ <output message="tns:EchoOutMsg"/>
+ </operation>
+ </portType>
+
+ <binding name="ExampleBinding" type="tns:ExamplePort">
+ <soap:binding style="document"
+ transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="Echo">
+ <soap:operation style="document"
+ soapAction="http://www.example.com/Example/Echo"/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+
+ <service name="ExampleService">
+ <port name="ExamplePort" binding="tns:ExampleBinding">
+ <soap:address location="http://REPLACE_WITH_ACTUAL_URL" />
+ </port>
+ </service>
+
+</definitions>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/WEB-INF/wsdl/ExampleService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml 2007-01-11 11:16:46 UTC (rev 1920)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml 2007-01-11 12:16:41 UTC (rev 1921)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools
+ http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+
+ <global>
+ <package-namespace package="org.jboss.test.ws.jaxrpc.jbws1378" namespace="http://www.example.com/Example"/>
+ </global>
+
+ <wsdl-java location="./WEB-INF/wsdl/ExampleService.wsdl">
+ <mapping file="jaxrpc-mapping.xml" />
+ <webservices servlet-link="ExampleService" />
+ </wsdl-java>
+
+</configuration>
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1378/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r1920 - in branches/tdiesler/trunk: integration-jboss42 and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-11 06:16:46 -0500 (Thu, 11 Jan 2007)
New Revision: 1920
Added:
branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/
branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml
Modified:
branches/tdiesler/trunk/integration-jboss40/.classpath
branches/tdiesler/trunk/integration-jboss42/.classpath
branches/tdiesler/trunk/integration-jboss50/.classpath
branches/tdiesler/trunk/integration-tomcat/.classpath
branches/tdiesler/trunk/jbossws-core/.classpath
branches/tdiesler/trunk/jbossws-tests/.classpath
branches/tdiesler/trunk/jbossws-tests/build.xml
branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
Log:
[JBWS-1407] -Premature end of File exception on createMessage
Modified: branches/tdiesler/trunk/integration-jboss40/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-jboss40/.classpath 2007-01-11 10:29:56 UTC (rev 1919)
+++ branches/tdiesler/trunk/integration-jboss40/.classpath 2007-01-11 11:16:46 UTC (rev 1920)
@@ -27,7 +27,7 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
Modified: branches/tdiesler/trunk/integration-jboss42/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/.classpath 2007-01-11 10:29:56 UTC (rev 1919)
+++ branches/tdiesler/trunk/integration-jboss42/.classpath 2007-01-11 11:16:46 UTC (rev 1920)
@@ -27,7 +27,7 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
Modified: branches/tdiesler/trunk/integration-jboss50/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/.classpath 2007-01-11 10:29:56 UTC (rev 1919)
+++ branches/tdiesler/trunk/integration-jboss50/.classpath 2007-01-11 11:16:46 UTC (rev 1920)
@@ -30,7 +30,7 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
Modified: branches/tdiesler/trunk/integration-tomcat/.classpath
===================================================================
--- branches/tdiesler/trunk/integration-tomcat/.classpath 2007-01-11 10:29:56 UTC (rev 1919)
+++ branches/tdiesler/trunk/integration-tomcat/.classpath 2007-01-11 11:16:46 UTC (rev 1920)
@@ -26,7 +26,7 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
Modified: branches/tdiesler/trunk/jbossws-core/.classpath
===================================================================
--- branches/tdiesler/trunk/jbossws-core/.classpath 2007-01-11 10:29:56 UTC (rev 1919)
+++ branches/tdiesler/trunk/jbossws-core/.classpath 2007-01-11 11:16:46 UTC (rev 1920)
@@ -25,7 +25,7 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
Modified: branches/tdiesler/trunk/jbossws-tests/.classpath
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/.classpath 2007-01-11 10:29:56 UTC (rev 1919)
+++ branches/tdiesler/trunk/jbossws-tests/.classpath 2007-01-11 11:16:46 UTC (rev 1920)
@@ -9,7 +9,7 @@
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-vfs.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/policy-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/policy.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/qdox.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xmlunit1.0.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/ant.jar"/>
@@ -35,7 +35,7 @@
<classpathentry kind="lib" path="/build/thirdparty/jboss-dependency.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/jboss-microcontainer.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/servlet-api.jar"/>
- <classpathentry kind="lib" path="/build/thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="/build/thirdparty/stax-api.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/wstx-lgpl-2.0.6.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xalan.jar"/>
<classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/>
Modified: branches/tdiesler/trunk/jbossws-tests/build.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/build.xml 2007-01-11 10:29:56 UTC (rev 1919)
+++ branches/tdiesler/trunk/jbossws-tests/build.xml 2007-01-11 11:16:46 UTC (rev 1920)
@@ -160,6 +160,7 @@
<pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/>
<pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
<pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
+ <pathelement location="${thirdparty.dir}/junit.jar"/>
<pathelement location="${thirdparty.dir}/qdox.jar"/>
<pathelement location="${thirdparty.dir}/policy.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
Modified: branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-01-11 10:29:56 UTC (rev 1919)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-01-11 11:16:46 UTC (rev 1920)
@@ -22,6 +22,8 @@
package org.jboss.test.ws.common.soap;
import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.SOAPBody;
@@ -103,4 +105,21 @@
Element expEnv = DOMUtils.parse(expEnvStr);
assertEquals(expEnv, env);
}
+
+ // http://jira.jboss.org/jira/browse/JBWS-1407
+ // Premature end of File exception on createMessage
+ public void testPrematureEndOfFile() throws Exception
+ {
+ File envFile = new File("resources/common/soap/MessageFactory/jbws1407.xml");
+ assertTrue("File exists: " + envFile, envFile.exists());
+
+ FileInputStream inputStream = new FileInputStream(envFile);
+
+ MessageFactory factory = new MessageFactoryImpl();
+ SOAPMessage soapMsg = factory.createMessage(null, inputStream);
+ SOAPEnvelope env = soapMsg.getSOAPPart().getEnvelope();
+
+ assertEquals("SOAP-ENV:Envelope", env.getNodeName());
+ assertEquals(Constants.NS_SOAP11_ENV, env.getNamespaceURI());
+ }
}
Added: branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml 2007-01-11 10:29:56 UTC (rev 1919)
+++ branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml 2007-01-11 11:16:46 UTC (rev 1920)
@@ -0,0 +1,58 @@
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
+ xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:cwmp="urn:dslforum-org:cwmp-1-0" xmlns="urn:dslforum-org:cwmp-1-0">
+<SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" id="_0">
+<cwmp:Inform>
+ <DeviceId xsi:type="cwmp:DeviceIdStruct">
+ <Manufacturer xsi:type="xsd:string">Somebody</Manufacturer>
+ <OUI xsi:type="xsd:string">9999</OUI>
+ <ProductClass xsi:type="xsd:string">Somebody</ProductClass>
+ <SerialNumber xsi:type="xsd:string">1234567890</SerialNumber>
+ </DeviceId>
+ <Event xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="cwmp:EventStruct[2]">
+ <EventStruct xsi:type="cwmp:EventStruct">
+ <EventCode xsi:type="xsd:string">1 BOOT</EventCode>
+ <CommandKey xsi:type="xsd:string"></CommandKey>
+ </EventStruct>
+ <EventStruct xsi:type="cwmp:EventStruct">
+ <EventCode xsi:type="xsd:string">4 VALUE CHANGE</EventCode>
+ <CommandKey xsi:type="xsd:string"></CommandKey>
+ </EventStruct>
+ </Event>
+ <MaxEnvelopes xsi:type="xsd:unsignedInt">1</MaxEnvelopes>
+ <CurrentTime xsi:type="xsd:dateTime">0000-00-00T00:04:49</CurrentTime>
+ <RetryCount xsi:type="xsd:unsignedInt">1</RetryCount>
+ <ParameterList xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="cwmp:ParameterValueStruct[7]">
+ <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+ <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.SpecVersion</Name>
+ <Value xsi:type="xsd:string">1.0</Value>
+ </ParameterValueStruct>
+ <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+ <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.HardwareVersion</Name>
+ <Value xsi:type="xsd:string">1.0002.0</Value>
+ </ParameterValueStruct>
+ <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+ <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.SoftwareVersion</Name>
+ <Value xsi:type="xsd:string">1.01.38</Value>
+ </ParameterValueStruct><ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+ <Name xsi:type="xsd:string">InternetGatewayDevice.DeviceInfo.ProvisioningCode</Name>
+ <Value xsi:type="xsd:string"></Value>
+ </ParameterValueStruct>
+ <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+ <Name xsi:type="xsd:string">InternetGatewayDevice.ManagementServer.ConnectionRequestURL</Name>
+ <Value xsi:type="xsd:string">http://123.123.123.123:12345/</Value>
+ </ParameterValueStruct>
+ <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+ <Name xsi:type="xsd:string">InternetGatewayDevice.ManagementServer.ParameterKey</Name>
+ <Value xsi:type="xsd:string">parameterkey</Value>
+ </ParameterValueStruct>
+ <ParameterValueStruct xsi:type="cwmp:ParameterValueStruct">
+ <Name xsi:type="xsd:string">InternetGatewayDevice.WANDevice.1.WANConnectionDevice.1.WANPPPConnection.1.ExternalIPAddress</Name>
+ <Value xsi:type="xsd:string">192.168.0.101</Value>
+ </ParameterValueStruct>
+ </ParameterList>
+</cwmp:Inform>
+</SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/jbossws-tests/src/main/resources/common/soap/MessageFactory/jbws1407.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r1919 - in branches/tdiesler/trunk: integration-jboss40 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-11 05:29:56 -0500 (Thu, 11 Jan 2007)
New Revision: 1919
Modified:
branches/tdiesler/trunk/build/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration-jboss40/build.xml
branches/tdiesler/trunk/integration-jboss42/build.xml
branches/tdiesler/trunk/integration-jboss50/build.xml
branches/tdiesler/trunk/jbossws-tests/build.xml
Log:
switch to unversioned jar names
Modified: branches/tdiesler/trunk/build/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/build/ant-import/build-thirdparty.xml 2007-01-11 08:28:06 UTC (rev 1918)
+++ branches/tdiesler/trunk/build/ant-import/build-thirdparty.xml 2007-01-11 10:29:56 UTC (rev 1919)
@@ -56,6 +56,7 @@
<get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
@@ -63,9 +64,8 @@
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy-1.0.jar" dest="${thirdparty.dir}/policy-1.0.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx-lgpl-2.0.6.jar" dest="${thirdparty.dir}/wstx-lgpl-2.0.6.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api-1.0.jar" dest="${thirdparty.dir}/stax-api-1.0.jar" usetimestamp="true" verbose="true"/>
<unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/>
</target>
@@ -88,7 +88,7 @@
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
- <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-api.jar"/>
<pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
<pathelement location="${thirdparty.dir}/wstx-lgpl-2.0.6.jar"/>
<pathelement location="${thirdparty.dir}/xmlsec.jar"/>
Modified: branches/tdiesler/trunk/integration-jboss40/build.xml
===================================================================
--- branches/tdiesler/trunk/integration-jboss40/build.xml 2007-01-11 08:28:06 UTC (rev 1918)
+++ branches/tdiesler/trunk/integration-jboss40/build.xml 2007-01-11 10:29:56 UTC (rev 1919)
@@ -150,9 +150,9 @@
<fileset dir="${thirdparty.dir}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
- <include name="policy-1.0.jar"/>
+ <include name="policy.jar"/>
<include name="sjsxp.jar"/>
- <include name="stax-api-1.0.jar"/>
+ <include name="stax-api.jar"/>
<include name="wstx-lgpl-2.9.3.jar"/>
<include name="xmlsec.jar"/>
</fileset>
@@ -248,9 +248,9 @@
<fileset dir="${thirdparty.dir}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
- <include name="policy-1.0.jar"/>
+ <include name="policy.jar"/>
<include name="sjsxp.jar"/>
- <include name="stax-api-1.0.jar"/>
+ <include name="stax-api.jar"/>
<include name="wstx-lgpl-2.9.3.jar"/>
<include name="xmlsec.jar"/>
</fileset>
Modified: branches/tdiesler/trunk/integration-jboss42/build.xml
===================================================================
--- branches/tdiesler/trunk/integration-jboss42/build.xml 2007-01-11 08:28:06 UTC (rev 1918)
+++ branches/tdiesler/trunk/integration-jboss42/build.xml 2007-01-11 10:29:56 UTC (rev 1919)
@@ -107,9 +107,9 @@
<fileset dir="${thirdparty.dir}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
- <include name="policy-1.0.jar"/>
+ <include name="policy.jar"/>
<include name="sjsxp.jar"/>
- <include name="stax-api-1.0.jar"/>
+ <include name="stax-api.jar"/>
<include name="wstx-lgpl-2.9.3.jar"/>
<include name="xmlsec.jar"/>
</fileset>
Modified: branches/tdiesler/trunk/integration-jboss50/build.xml
===================================================================
--- branches/tdiesler/trunk/integration-jboss50/build.xml 2007-01-11 08:28:06 UTC (rev 1918)
+++ branches/tdiesler/trunk/integration-jboss50/build.xml 2007-01-11 10:29:56 UTC (rev 1919)
@@ -102,9 +102,9 @@
<fileset dir="${thirdparty.dir}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
- <include name="policy-1.0.jar"/>
+ <include name="policy.jar"/>
<include name="sjsxp.jar"/>
- <include name="stax-api-1.0.jar"/>
+ <include name="stax-api.jar"/>
<include name="wstx-lgpl-2.9.3.jar"/>
<include name="xmlsec.jar"/>
</fileset>
Modified: branches/tdiesler/trunk/jbossws-tests/build.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-tests/build.xml 2007-01-11 08:28:06 UTC (rev 1918)
+++ branches/tdiesler/trunk/jbossws-tests/build.xml 2007-01-11 10:29:56 UTC (rev 1919)
@@ -161,9 +161,9 @@
<pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/>
<pathelement location="${thirdparty.dir}/jboss-vfs.jar"/>
<pathelement location="${thirdparty.dir}/qdox.jar"/>
- <pathelement location="${thirdparty.dir}/policy-1.0.jar"/>
+ <pathelement location="${thirdparty.dir}/policy.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
- <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-api.jar"/>
<pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/>
</path>
18 years
- 1
- 0
JBossWS SVN: r1918 - in trunk/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-01-11 03:28:06 -0500 (Thu, 11 Jan 2007)
New Revision: 1918
Added:
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveFieldAccessor.java
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
Log:
Refactor fault handling to no long need element names
Introduce field accessor
Fix CTS regression
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveFieldAccessor.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveFieldAccessor.java 2007-01-10 23:14:18 UTC (rev 1917)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveFieldAccessor.java 2007-01-11 08:28:06 UTC (rev 1918)
@@ -0,0 +1,128 @@
+/*
+ * 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.ws.metadata.acessor;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+
+import org.jboss.ws.WSException;
+import org.jboss.ws.metadata.umdm.Accessor;
+import org.jboss.ws.metadata.umdm.AccessorFactory;
+import org.jboss.ws.metadata.umdm.AccessorFactoryCreator;
+import org.jboss.ws.metadata.umdm.FaultMetaData;
+import org.jboss.ws.metadata.umdm.ParameterMetaData;
+import org.jboss.ws.metadata.umdm.WrappedParameter;
+
+/**
+ * A simple Java field accessor that uses ordinary reflection.
+ *
+ * @author <a href="jason.greene(a)jboss.com">Jason T. Greene</a>
+ * @version $Revision: 1760 $
+ */
+@SuppressWarnings("unchecked")
+public class ReflectiveFieldAccessor implements Accessor
+{
+ private Field field;
+
+ public static AccessorFactoryCreator FACTORY_CREATOR = new AccessorFactoryCreator()
+ {
+ public AccessorFactory create(ParameterMetaData parameter)
+ {
+ return create(parameter.getJavaType());
+ }
+
+ public AccessorFactory create(FaultMetaData fault)
+ {
+ return create(fault.getFaultBean());
+ }
+
+ private AccessorFactory create(final Class clazz)
+ {
+ return new AccessorFactory()
+ {
+ public Accessor create(WrappedParameter parameter)
+ {
+ String fieldName = parameter.getVariable();
+ try
+ {
+ Field field;
+
+ try
+ {
+ field = clazz.getField(fieldName);
+ }
+ catch (NoSuchFieldException e)
+ {
+ // Search for a private field
+ field = clazz.getDeclaredField(fieldName);
+ field.setAccessible(true);
+ }
+
+ if (Modifier.isStatic(field.getModifiers()))
+ throw new WSException("Field can not be static: " + fieldName);
+
+ return new ReflectiveFieldAccessor(field);
+ }
+ catch (Throwable t)
+ {
+ WSException ex = new WSException("Error accessing field: " + fieldName + t.getClass().getSimpleName() + ": " + t.getMessage());
+ ex.setStackTrace(t.getStackTrace());
+ throw ex;
+ }
+ }
+ };
+ }
+ };
+
+ private ReflectiveFieldAccessor(Field field)
+ {
+ this.field = field;
+ }
+
+ public Object get(Object bean)
+ {
+ try
+ {
+ return field.get(bean);
+ }
+ catch (Throwable e)
+ {
+ WSException ex = new WSException(e.getMessage());
+ ex.setStackTrace(ex.getStackTrace());
+ throw ex;
+ }
+ }
+
+ public void set(Object bean, Object value)
+ {
+ try
+ {
+ field.set(bean, value);
+ }
+ catch (Throwable e)
+ {
+ WSException ex = new WSException(e.getMessage());
+ ex.setStackTrace(ex.getStackTrace());
+ throw ex;
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveFieldAccessor.java
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-10 23:14:18 UTC (rev 1917)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-01-11 08:28:06 UTC (rev 1918)
@@ -94,7 +94,7 @@
* @author Thomas.Diesler(a)jboss.org
* @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a>
* @author Heiko.Braun(a)jboss.org
- *
+ *
* @since 15-Oct-2005
*/
@SuppressWarnings("deprecation")
@@ -167,7 +167,6 @@
FaultMetaData fmd = new FaultMetaData(omd, xmlName, xmlType, exception.getName());
fmd.setFaultBeanName(faultBeanName);
- fmd.setAccessorFactoryCreator(JAXBAccessor.FACTORY_CREATOR);
if (generate)
wrapperGenerator.generate(fmd);
@@ -670,7 +669,7 @@
throw new WSException("@WebService[portName,serviceName,endpointInterface] MUST NOT be defined on: " + seiName);
// @WebService[name] is allowed, but what should we do with it?
-
+
interfaceNS = anWebService.targetNamespace();
if (interfaceNS.length() == 0)
interfaceNS = wsdlUtils.getTypeNamespace(seiClass);
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-01-10 23:14:18 UTC (rev 1917)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/FaultMetaData.java 2007-01-11 08:28:06 UTC (rev 1918)
@@ -26,13 +26,12 @@
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
import javax.xml.ws.WebServiceException;
@@ -41,6 +40,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.core.jaxws.DynamicWrapperGenerator;
import org.jboss.ws.core.utils.JavaUtils;
+import org.jboss.ws.metadata.acessor.ReflectiveFieldAccessor;
import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor;
/**
@@ -67,11 +67,12 @@
private Method getFaultInfoMethod;
private Constructor<? extends Exception> serviceExceptionConstructor;
- private PropertyDescriptor[] serviceExceptionProperties;
+ private Method[] serviceExceptionGetters;
private WrappedParameter[] faultBeanProperties;
- private AccessorFactoryCreator accessorFactoryCreator = ReflectiveMethodAccessor.FACTORY_CREATOR;
+ private Class<?>[] propertyTypes;
+
public FaultMetaData(OperationMetaData operation, QName xmlName, QName xmlType, String javaTypeName)
{
this(operation, xmlName, javaTypeName);
@@ -202,8 +203,8 @@
{
/* JAX-WS 2.5: A wsdl:fault element refers to a wsdl:message that contains
* a single part. The global element declaration referred to by that part
- * is mapped to a Java bean. A wrapper exception class contains the
- * following methods:
+ * is mapped to a Java bean. A wrapper exception class contains the
+ * following methods:
* . WrapperException(String message, FaultBean faultInfo)
* . WrapperException(String message, FaultBean faultInfo, Throwable cause)
* . FaultBean getFaultInfo() */
@@ -221,14 +222,13 @@
if (xmlType == null)
throw new WebServiceException("@XmlType missing from fault bean: " + faultBeanName);
- AccessorFactory accessorFactory = accessorFactoryCreator.create(this);
+ AccessorFactory accessorFactory = getAccessorFactory(faultBean);
String[] propertyNames = xmlType.propOrder();
int propertyCount = propertyNames.length;
- Class<?>[] propertyTypes = new Class<?>[propertyCount];
-
+ propertyTypes = new Class<?>[propertyCount];
faultBeanProperties = new WrappedParameter[propertyCount];
- serviceExceptionProperties = new PropertyDescriptor[propertyCount];
+ serviceExceptionGetters = new Method[propertyCount];
for (int i = 0; i < propertyCount; i++)
{
@@ -237,10 +237,9 @@
try
{
PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyName, faultBean);
- QName propertyXmlName = getPropertyXmlName(propertyDescriptor);
Class<?> propertyType = propertyDescriptor.getPropertyType();
- WrappedParameter faultBeanProperty = new WrappedParameter(propertyXmlName, propertyType.getName(), propertyName, i);
+ WrappedParameter faultBeanProperty = new WrappedParameter(null, propertyType.getName(), propertyName, i);
faultBeanProperty.setAccessor(accessorFactory.create(faultBeanProperty));
faultBeanProperties[i] = faultBeanProperty;
@@ -258,7 +257,7 @@
* of PropertyDescriptor(String, Class) because the latter fails
* with an IntrospectionException: Method not found: setXXX */
PropertyDescriptor propertyDescriptor = new PropertyDescriptor(propertyName, javaType, "is" + JavaUtils.capitalize(propertyName), null);
- serviceExceptionProperties[i] = propertyDescriptor;
+ serviceExceptionGetters[i] = propertyDescriptor.getReadMethod();
}
catch (IntrospectionException ie)
{
@@ -268,92 +267,34 @@
try
{
+ // Attempt to locate a usable constructor
serviceExceptionConstructor = javaType.asSubclass(Exception.class).getConstructor(propertyTypes);
}
catch (NoSuchMethodException e)
{
- throw new WSException("Service exception has no constructor for parameter types: " + Arrays.toString(propertyTypes));
+ // Only needed for client side. The spec does not clarify this, and the TCK makes use of non matching constructors,
+ // so we allow them for server side usage and only fail when used by the client.
}
}
}
- private QName getPropertyXmlName(PropertyDescriptor propertyDescriptor)
+ private AccessorFactory getAccessorFactory(Class<?> faultBean)
{
- QName propertyXmlName;
+ // This should catch all cases due to the constraints that JAX-WS puts on the fault bean
+ // However, if issues arrise then switch this to a full jaxb reflection library
+ XmlAccessorType type = faultBean.getAnnotation(XmlAccessorType.class);
+ if (type != null && type.value() == XmlAccessType.FIELD)
+ return ReflectiveFieldAccessor.FACTORY_CREATOR.create(this);
- // examine the underlying field, if any
- try
- {
- Field propertyField = faultBean.getDeclaredField(propertyDescriptor.getName());
- propertyXmlName = getPropertyXmlName(propertyField);
- if (propertyXmlName != null)
- return propertyXmlName;
- }
- catch (NoSuchFieldException e)
- {
- // proceed to examine the accessor methods
- }
-
- // examine the getter
- Method propertyGetter = propertyDescriptor.getReadMethod();
- propertyXmlName = getPropertyXmlName(propertyGetter);
- if (propertyXmlName != null)
- return propertyXmlName;
-
- // examine the setter
- Method propertySetter = propertyDescriptor.getWriteMethod();
- return getPropertyXmlName(propertySetter);
+ return ReflectiveMethodAccessor.FACTORY_CREATOR.create(this);
}
- // [JBBUILD-330] Add support for java.lang.reflect.AnnotatedElement
- // private QName getPropertyXmlName(AnnotatedElement propertyMember)
- private QName getPropertyXmlName(Field propertyMember)
- {
- QName propertyXmlName = null;
-
- XmlElement xmlElement = propertyMember.getAnnotation(XmlElement.class);
- if (xmlElement != null)
- propertyXmlName = new QName(xmlElement.namespace(), xmlElement.name());
- else
- {
- XmlAttribute xmlAttribute = propertyMember.getAnnotation(XmlAttribute.class);
- if (xmlAttribute != null)
- propertyXmlName = new QName(xmlAttribute.namespace(), xmlAttribute.name());
- // TODO should any other annotation be examined?
- }
- return propertyXmlName;
- }
-
- // [JBBUILD-330] Add support for java.lang.reflect.AnnotatedElement
- // private QName getPropertyXmlName(AnnotatedElement propertyMember)
- private QName getPropertyXmlName(Method propertyMember)
- {
- QName propertyXmlName = null;
-
- XmlElement xmlElement = propertyMember.getAnnotation(XmlElement.class);
- if (xmlElement != null)
- propertyXmlName = new QName(xmlElement.namespace(), xmlElement.name());
- else
- {
- XmlAttribute xmlAttribute = propertyMember.getAnnotation(XmlAttribute.class);
- if (xmlAttribute != null)
- propertyXmlName = new QName(xmlAttribute.namespace(), xmlAttribute.name());
- // TODO should any other annotation be examined?
- }
- return propertyXmlName;
- }
-
- public void setAccessorFactoryCreator(AccessorFactoryCreator accessorFactoryCreator)
- {
- this.accessorFactoryCreator = accessorFactoryCreator;
- }
-
public Object toFaultBean(Exception serviceException)
{
Object faultBeanInstance;
try
{
- /* is the service exception a wrapper
+ /* is the service exception a wrapper
* (i.e. does it match the pattern in JAX-WS 2.5)? */
if (getFaultInfoMethod != null)
{
@@ -373,13 +314,13 @@
}
// copy the properties from the service exception to the fault bean
- for (int i = 0, n = serviceExceptionProperties.length; i < n; i++)
+ for (int i = 0; i < serviceExceptionGetters.length; i++)
{
- PropertyDescriptor serviceExceptionProperty = serviceExceptionProperties[i];
- Object propertyValue = serviceExceptionProperty.getReadMethod().invoke(serviceException);
+ Object propertyValue = serviceExceptionGetters[i].invoke(serviceException);
WrappedParameter faultBeanProperty = faultBeanProperties[i];
- log.debug("copying from " + javaType.getSimpleName() + '.' + serviceExceptionProperty.getName()
+ if (log.isTraceEnabled())
+ log.trace("copying from " + javaType.getSimpleName() + '.' + serviceExceptionGetters[i].getName()
+ " to " + faultBean.getSimpleName() + '.' + faultBeanProperty.getVariable() + "<->" + faultBeanProperty.getName()
+ ": " + propertyValue);
faultBeanProperty.accessor().set(faultBeanInstance, propertyValue);
@@ -403,7 +344,7 @@
try
{
- /* is the service exception a wrapper
+ /* is the service exception a wrapper
* (i.e. does it match the pattern in JAX-WS 2.5)? */
if (getFaultInfoMethod != null)
{
@@ -411,6 +352,9 @@
}
else
{
+ if (serviceExceptionConstructor == null)
+ throw new WSException("Could not instantiate service exception (" + javaType.getSimpleName() +"), since neither a faultInfo nor sorted constructor is present: " + Arrays.toString(propertyTypes));
+
// extract the properties from the fault bean
int propertyCount = faultBeanProperties.length;
Object[] propertyValues = new Object[propertyCount];
18 years
- 1
- 0
JBossWS SVN: r1917 - trunk/build/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-10 18:14:18 -0500 (Wed, 10 Jan 2007)
New Revision: 1917
Modified:
trunk/build/ant-import/build-release.xml
Log:
[JBWS-1396] - Now jbossws-beans is exploded jbossws.sar must be exploded
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-01-10 23:11:28 UTC (rev 1916)
+++ trunk/build/ant-import/build-release.xml 2007-01-10 23:14:18 UTC (rev 1917)
@@ -174,17 +174,15 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
- <fileset dir="${jboss50.output.lib.dir}">
- <include name="jbossws50.sar"/>
- <include name="jbossws50-deployer.zip"/>
- </fileset>
- <fileset dir="${jboss42.output.lib.dir}">
- <include name="jbossws42.sar"/>
- </fileset>
- <fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws40.sar"/>
- </fileset>
</copy>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar"/>
+ <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws50.sar" src="${jboss50.output.lib.dir}/jbossws50.sar"/>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws50-deployer"/>
+ <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws50-deployer" src="${jboss50.output.lib.dir}/jbossws50-deployer.zip"/>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws42.sar"/>
+ <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws42.sar" src="${jboss42.output.lib.dir}/jbossws42.sar"/>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk15/jbossws40.sar"/>
+ <unzip dest="${build.bin.dist}/lib/jboss-jdk15/jbossws40.sar" src="${jboss40.output.lib.dir}/jbossws40.sar"/>
<!-- lib/jboss-jdk14 -->
<copy todir="${build.bin.dist}/lib/jboss-jdk14" overwrite="true">
@@ -193,11 +191,12 @@
<include name="jboss-saaj.jar"/>
</fileset>
<fileset dir="${jboss40.output.lib.dir}">
- <include name="jbossws40-jdk14.sar"/>
<include name="jbossws14-client.jar"/>
<include name="jboss-jaxws14.jar"/>
</fileset>
</copy>
+ <mkdir dir="${build.bin.dist}/lib/jboss-jdk14/jbossws40-jdk14.sar"/>
+ <unzip dest="${build.bin.dist}/lib/jboss-jdk14/jbossws40-jdk14.sar" src="${jboss40.output.lib.dir}/jbossws40-jdk14.sar"/>
<!-- lib/tomcat -->
<copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true">
18 years
- 1
- 0