[jboss-svn-commits] JBossWS SVN: r1175 - in trunk/src: main/java/org/jboss/ws/deployment main/java/org/jboss/ws/metadata main/java/org/jboss/ws/tools/jaxws main/java/org/jboss/ws/utils test/ant test/java/org/jboss/test/ws/jaxrpc/anonymous test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding test/resources/jaxrpc/anonymous/WEB-INF test/resources/jaxrpc/anonymous/WEB-INF/wsdl
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 9 18:54:58 EDT 2006
Author: jason.greene at jboss.com
Date: 2006-10-09 18:54:50 -0400 (Mon, 09 Oct 2006)
New Revision: 1175
Added:
trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrapped.java
Removed:
trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitNamespacedPO_RequestStruct.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitNamespacedPO_ResponseStruct.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitPO_RequestStruct.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitPO_ResponseStruct.java
Modified:
trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java
trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java
trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/FaultMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java
trunk/src/main/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java
trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java
trunk/src/main/java/org/jboss/ws/utils/JavassistUtils.java
trunk/src/test/ant/build-jars-jaxws.xml
trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedServiceImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleSEI.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleServiceImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java
trunk/src/test/resources/jaxrpc/anonymous/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jaxrpc/anonymous/WEB-INF/wsdl/TestService.wsdl
Log:
Remove bogus anonymous test
Fix a number of JAX-WS deployment bugs
Fix JAX-WS soap binding test case
Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -703,13 +703,6 @@
QName xmlName = opOutput.getElement();
QName xmlType = opOutput.getXMLType();
- ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName);
- if (paramMetaData != null)
- {
- paramMetaData.setMode(ParameterMode.INOUT);
- return wsdlPosition;
- }
-
String javaTypeName = typeMapping.getJavaTypeName(xmlType);
TypesMetaData typesMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getTypesMetaData();
@@ -761,9 +754,19 @@
WsdlMessageMapping wsdlMessageMapping = part.getWsdlMessageMapping();
mode = wsdlMessageMapping.getParameterMode();
}
+ if ("INOUT".equals(mode))
+ {
+ ParameterMetaData inMetaData = opMetaData.getParameter(xmlName);
+ if (inMetaData != null)
+ {
+ inMetaData.setMode(ParameterMode.INOUT);
+ return wsdlPosition;
+ }
+ throw new WSException("Could not update IN parameter to be INOUT, as indicated in the mapping: " + opOutput.getPartName());
+ }
// It's potentialy possible that an input parameter could exist with the same part name
- if (mode != null && mode.equals("OUT"))
+ else if ("OUT".equals(mode))
{
hasReturnMapping = false;
javaTypeName = part.getParamType();
Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/main/java/org/jboss/ws/deployment/JSR181ClientMetaDataBuilder.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -45,6 +45,8 @@
{
log.debug("START: rebuildMetaData");
+ initialize(epMetaData.getClassLoader());
+
// Process @SOAPBinding
if (wsClass.isAnnotationPresent(SOAPBinding.class))
processSOAPBinding(epMetaData, wsClass);
Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -145,7 +145,7 @@
WSDLUtils wsdlUtils = WSDLUtils.getInstance();
- wrapperGenerator = new DynamicWrapperGenerator(udi.annotationsCl);
+ initialize(udi.annotationsCl);
String name = anWebService.name();
if (name.length() == 0)
@@ -243,6 +243,13 @@
}
}
+ protected void initialize(ClassLoader loader)
+ {
+ wrapperGenerator = new DynamicWrapperGenerator(loader);
+ javaTypes.clear();
+ typeRefs.clear();
+ }
+
protected void createJAXBContext()
{
try
@@ -251,7 +258,7 @@
}
catch (JAXBException ex)
{
- throw new WSException("Could not create JAXB Context: e.getMessage()", ex);
+ throw new WSException("Could not create JAXB Context: " + ex.getMessage(), ex);
}
}
@@ -470,7 +477,7 @@
if (isWrapped)
{
- WrappedParameter wrapped = new WrappedParameter(xmlName, convertToProperty(xmlName.getLocalPart()), returnTypeName, -1);
+ WrappedParameter wrapped = new WrappedParameter(xmlName, returnTypeName, convertToProperty(xmlName.getLocalPart()), -1);
wrapped.typeArguments = convertTypeArguments(returnType, genericReturnType);
// insert at the beginning just for prettiness
@@ -493,13 +500,13 @@
wrapperGenerator.generate(wrapperParameter);
Class wrapperClass = wrapperParameter.getJavaType();
javaTypes.add(wrapperClass);
- typeRefs.add(new TypeReference(wrapperParameter.getXmlName(), wrapperClass));
+ // typeRefs.add(new TypeReference(wrapperParameter.getXmlName(), wrapperClass));
if (!opMetaData.isOneWay())
{
wrapperGenerator.generate(wrapperOutputParameter);
wrapperClass = wrapperOutputParameter.getJavaType();
- javaTypes.add(wrapperParameter.getJavaType());
- typeRefs.add(new TypeReference(wrapperOutputParameter.getXmlName(), wrapperClass));
+ javaTypes.add(wrapperClass);
+ // typeRefs.add(new TypeReference(wrapperOutputParameter.getXmlName(), wrapperClass));
}
}
@@ -530,6 +537,7 @@
{
QName operationQName = operation.getQName();
QName xmlName = new QName(operationQName.getNamespaceURI(), operationQName.getLocalPart() + "Response");
+ QName xmlType = xmlName;
String responseWrapperType = null;
if (method.isAnnotationPresent(ResponseWrapper.class))
@@ -545,14 +553,14 @@
}
if (responseWrapperType == null)
- responseWrapperType = JavaUtils.capitalize(method.getName() + "Response");
+ {
+ String packageName = JavaUtils.getPackageName(method.getDeclaringClass()) + ".jaxws";
+ responseWrapperType = packageName + "." + JavaUtils.capitalize(method.getName()) + "Response";
+ }
- ParameterMetaData retMetaData = new ParameterMetaData(operation, xmlName, operationQName, responseWrapperType);
+ ParameterMetaData retMetaData = new ParameterMetaData(operation, xmlName, xmlType, responseWrapperType);
operation.setReturnParameter(retMetaData);
- wrapperGenerator.generate(retMetaData);
- javaTypes.add(retMetaData.getJavaType());
-
return retMetaData;
}
@@ -560,6 +568,7 @@
{
String requestWrapperType = null;
QName xmlName = operation.getQName();
+ QName xmlType = xmlName;
if (method.isAnnotationPresent(RequestWrapper.class))
{
RequestWrapper anReqWrapper = method.getAnnotation(RequestWrapper.class);
@@ -575,10 +584,13 @@
// Conformance 3.18, the default value must be the same as the method name
if (requestWrapperType == null)
- requestWrapperType = JavaUtils.capitalize(method.getName());
+ {
+ String packageName = JavaUtils.getPackageName(method.getDeclaringClass()) + ".jaxws";
+ requestWrapperType = packageName + "." + JavaUtils.capitalize(method.getName());
+ }
// JAX-WS p.37 pg.1, the annotation only affects the element name, not the type name
- ParameterMetaData wrapperParameter = new ParameterMetaData(operation, xmlName, operation.getQName(), requestWrapperType);
+ ParameterMetaData wrapperParameter = new ParameterMetaData(operation, xmlName, xmlType, requestWrapperType);
operation.addParameter(wrapperParameter);
return wrapperParameter;
Modified: trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/main/java/org/jboss/ws/metadata/EndpointMetaData.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -160,7 +160,7 @@
}
public abstract Object getEndpointConfig();
-
+
public String getEndpointAddress()
{
return endpointAddress;
@@ -459,15 +459,18 @@
*/
public void eagerInitialize()
{
+ for (OperationMetaData operation : operations)
+ operation.eagerInitialize();
+
TypeMappingImpl typeMapping = service.getTypeMapping();
for (TypeMappingMetaData tmMetaData : service.getTypesMetaData().getTypeMappings())
{
String javaTypeName = tmMetaData.getJavaTypeName();
QName xmlType = tmMetaData.getXmlType();
if (xmlType != null)
- {
+ {
List<Class> classes = typeMapping.getJavaTypes(xmlType);
-
+
boolean registered = false;
for (Class current : classes) {
if (current.getName().equals(javaTypeName))
@@ -476,13 +479,13 @@
break;
}
}
-
+
if (registered == false)
{
ClassLoader classLoader = service.getUnifiedMetaData().getClassLoader();
if (classLoader == null)
throw new WSException("ClassLoader not available in meta data");
-
+
try
{
Class javaType = JavaUtils.loadJavaType(javaTypeName, classLoader);
@@ -512,8 +515,5 @@
}
}
}
-
- for (OperationMetaData operation : operations)
- operation.eagerInitialize();
}
}
Modified: trunk/src/main/java/org/jboss/ws/metadata/FaultMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/FaultMetaData.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/main/java/org/jboss/ws/metadata/FaultMetaData.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -27,6 +27,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.ParameterWrapping;
+import org.jboss.ws.jaxws.DynamicWrapperGenerator;
import org.jboss.ws.utils.JavaUtils;
/**
@@ -96,10 +97,7 @@
public Class getJavaType()
{
- // If the class loader has changed, make sure we reload the class
- ClassLoader loader = operation.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().getClassLoader();
- if (loader == null)
- throw new WSException("ClassLoader not available");
+ ClassLoader loader = getClassLoader();
if (javaTypeName == null)
return null;
@@ -123,13 +121,9 @@
{
if (faultBean == null && faultBeanName != null)
{
- ClassLoader loader = operation.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().getClassLoader();
- if (loader == null)
- throw new WSException("ClassLoader not available");
-
try
{
- faultBean = JavaUtils.loadJavaType(faultBeanName);
+ faultBean = JavaUtils.loadJavaType(faultBeanName, getClassLoader());
}
catch (ClassNotFoundException ex)
{
@@ -140,6 +134,15 @@
return faultBean;
}
+ private ClassLoader getClassLoader()
+ {
+ ClassLoader loader = operation.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().getClassLoader();
+ if (loader == null)
+ throw new WSException("ClassLoader not available");
+
+ return loader;
+ }
+
public String getFaultBeanName()
{
return faultBeanName;
@@ -152,6 +155,7 @@
public void eagerInitialize()
{
+ (new DynamicWrapperGenerator(getClassLoader())).generate(this);
// Initialize the cache
getJavaType();
getFaultBean();
Modified: trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/main/java/org/jboss/ws/metadata/OperationMetaData.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -543,6 +543,10 @@
return false;
}
+ // We should have an entry for every parameter index if we match
+ if (matches.size() != paramTypes.length)
+ return false;
+
ParameterMetaData returnMetaData = getReturnParameter();
if (returnMetaData != null)
{
Modified: trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -36,6 +36,7 @@
import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.jaxrpc.ParameterWrapping;
+import org.jboss.ws.jaxws.DynamicWrapperGenerator;
import org.jboss.ws.utils.HolderUtils;
import org.jboss.ws.utils.IOUtils;
import org.jboss.ws.utils.JavaUtils;
@@ -202,10 +203,7 @@
public Class getJavaType()
{
- // If the class loader has changed, make sure we reload the class
- ClassLoader loader = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().getClassLoader();
- if (loader == null)
- throw new WSException("ClassLoader not available");
+ ClassLoader loader = getClassLoader();
if (javaTypeName == null)
return null;
@@ -359,16 +357,22 @@
*/
public void eagerInitialize()
{
- TypesMetaData typesMetaData = getOperationMetaData().getEndpointMetaData().getServiceMetaData().getTypesMetaData();
- if (getOperationMetaData().isDocumentWrapped() && typesMetaData.getTypeMappingByXMLType(xmlType) == null)
- {
- ParameterWrapping.generateWrapper(this, true);
- }
+ // At some point we want to make this plugable, hardcoding
+ // references like this is not very flexible.
+ (new DynamicWrapperGenerator(getClassLoader())).generate(this);
// Initialize the cache
getJavaType();
}
+ private ClassLoader getClassLoader()
+ {
+ ClassLoader loader = opMetaData.getEndpointMetaData().getServiceMetaData().getUnifiedMetaData().getClassLoader();
+ if (loader == null)
+ throw new WSException("ClassLoader not available");
+ return loader;
+ }
+
public boolean matchParameter(Method method, Set<Integer> matches, boolean exact)
{
ClassLoader loader = getOperationMetaData().getEndpointMetaData().getClassLoader();
Modified: trunk/src/main/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/main/java/org/jboss/ws/tools/jaxws/JAXBWSDLGenerator.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -29,8 +29,10 @@
import javax.xml.transform.Result;
import javax.xml.transform.dom.DOMResult;
+import org.jboss.ws.Constants;
import org.jboss.ws.WSException;
import org.jboss.ws.metadata.wsdl.DOMTypes;
+import org.jboss.ws.wsse.Util;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -60,6 +62,7 @@
Document doc = builder.newDocument();
DOMTypes types = new DOMTypes(doc);
final Element element = types.getElement();
+ final Element throwAway = doc.createElement("throw-away");
ctx.generateSchema(new SchemaOutputResolver()
{
@@ -67,15 +70,15 @@
public Result createOutput(String namespace, String file) throws IOException
{
// JAXB creates an empty namespace due to type references, ignore it
- if (namespace == null || namespace.length() == 0)
- return null;
-
- DOMResult result = new DOMResult(element);
- result.setSystemId(namespace);
+ DOMResult result = new DOMResult((namespace == null || namespace.length() == 0) ? throwAway : element);
+ result.setSystemId("replace-me");
return result;
}
});
+ // Until we stop inlining schema, we will need to filter schemaLocations since JAXB requires them
+ removeSchemaLocations(element);
+
wsdl.setWsdlTypes(types);
}
catch (Exception exception)
@@ -83,4 +86,19 @@
throw new WSException("Could not generate schema: " + exception.getMessage(), exception);
}
}
-}
+
+ private void removeSchemaLocations(Element element)
+ {
+ for (Element child = Util.getFirstChildElement(element); child != null; child = Util.getNextSiblingElement(child))
+ {
+ if ("import".equals(child.getLocalName()) && Constants.NS_SCHEMA_XSD.equals(child.getNamespaceURI()) && "replace-me".equals(child.getAttribute("schemaLocation")))
+ {
+ child.removeAttribute("schemaLocation");
+ }
+ else
+ {
+ removeSchemaLocations(child);
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -59,7 +59,7 @@
* Generates a WSDL object model.
*
* @author <a href="mailto:jason.greene at jboss.com">Jason T. Greene</a>
- * @version $Revision:$
+ * @version $Revision$
*/
public abstract class WSDLGenerator
{
@@ -176,6 +176,7 @@
if (returnParameter != null)
{
output.setElement(returnParameter.getXmlName());
+ output.setPartName(returnParameter.getPartName());
addSignatureItem(interfaceOperation, returnParameter, true);
}
Modified: trunk/src/main/java/org/jboss/ws/utils/JavassistUtils.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/utils/JavassistUtils.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/main/java/org/jboss/ws/utils/JavassistUtils.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -38,23 +38,27 @@
* Utility functions that simplify Javassist.
*
* @author <a href="mailto:jason.greene at jboss.com">Jason T. Greene</a>
- * @version $Revision:$
+ * @version $Revision$
*/
public class JavassistUtils
{
public static void addFieldAnnotation(CtField field, javassist.bytecode.annotation.Annotation annotation)
{
FieldInfo fieldInfo = field.getFieldInfo();
- AnnotationsAttribute attribute = new AnnotationsAttribute(fieldInfo.getConstPool(), AnnotationsAttribute.visibleTag);
- attribute.setAnnotation(annotation);
+ AnnotationsAttribute attribute = (AnnotationsAttribute) fieldInfo.getAttribute(AnnotationsAttribute.visibleTag);
+ if (attribute == null)
+ attribute = new AnnotationsAttribute(fieldInfo.getConstPool(), AnnotationsAttribute.visibleTag);
+ attribute.addAnnotation(annotation);
fieldInfo.addAttribute(attribute);
}
public static void addClassAnnotation(CtClass clazz, javassist.bytecode.annotation.Annotation annotation)
{
ClassFile classFile = clazz.getClassFile();
- AnnotationsAttribute attribute = new AnnotationsAttribute(classFile.getConstPool(), AnnotationsAttribute.visibleTag);
- attribute.setAnnotation(annotation);
+ AnnotationsAttribute attribute = (AnnotationsAttribute) classFile.getAttribute(AnnotationsAttribute.visibleTag);
+ if (attribute == null)
+ attribute = new AnnotationsAttribute(classFile.getConstPool(), AnnotationsAttribute.visibleTag);
+ attribute.addAnnotation(annotation);
classFile.addAttribute(attribute);
}
Modified: trunk/src/test/ant/build-jars-jaxws.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxws.xml 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/ant/build-jars-jaxws.xml 2006-10-09 22:54:50 UTC (rev 1175)
@@ -151,6 +151,8 @@
<!-- jaxws-jsr181-soapbinding -->
<war warfile="${build.test.dir}/libs/jaxws-jsr181-soapbinding.war" webxml="${build.test.dir}/resources/jaxws/jsr181/soapbinding/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrapped.class"/>
+ <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleSEI.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocBareServiceImpl.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedServiceImpl.class"/>
<include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleServiceImpl.class"/>
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -34,12 +34,6 @@
// provide logging
protected static Logger log = Logger.getLogger(AnonymousTypesTestBean.class);
- public ComplexTypeRoot testComplexTypeRoot(ComplexTypeRoot param)
- {
- log.info("testComplexTypeRoot: " + param);
- return param;
- }
-
public ElementTypeRoot testElementTypeRoot(ElementTypeRoot param)
{
log.info("testElementTypeRoot: " + param);
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestCase.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -56,13 +56,6 @@
}
}
- public void testComplexTypeRoot() throws Exception
- {
- ComplexTypeRoot param = new ComplexTypeRoot("HelloWorld!");
- ComplexTypeRoot res = endpoint.testComplexTypeRoot(param);
- assertEquals(param, res);
- }
-
public void testElementTypeRoot() throws Exception
{
ElementTypeInside ins1 = new ElementTypeInside("ins1");
Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -32,8 +32,6 @@
*/
public interface AnonymousTypesTestService extends Remote
{
- ComplexTypeRoot testComplexTypeRoot(ComplexTypeRoot param) throws RemoteException;
-
ElementTypeRoot testElementTypeRoot(ElementTypeRoot param) throws RemoteException;
int testElementSomeOtherElement(int param) throws RemoteException;
Added: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrapped.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrapped.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrapped.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jsr181.soapbinding;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+ at WebService(name = "DocWrapped")
+ at SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public interface DocWrapped
+{
+ @WebMethod(operationName = "SubmitPO")
+ @WebResult(name = "PurchaseOrderAck")
+ public PurchaseOrderAck submitPO(@WebParam(name = "PurchaseOrder")
+ PurchaseOrder purchaseOrder);
+
+ @WebMethod(operationName = "SubmitNamespacedPO")
+ @WebResult(name = "NamespacedPurchaseOrderAck", targetNamespace = "http://namespace/result")
+ public PurchaseOrderAck submitNamespacedPO(
+ @WebParam(name = "NamespacedPurchaseOrder", targetNamespace = "http://namespace/purchase")
+ PurchaseOrder purchaseOrder, @WebParam(name = "NamespacedString", targetNamespace = "http://namespace/string")
+ String string);
+}
\ No newline at end of file
Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrapped.java
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedServiceImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedServiceImpl.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedServiceImpl.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -36,28 +36,21 @@
* @author <a href="mailto:jason.greene at jboss.com">Jason T. Greene</a>
* @since 16-Oct-2005
*/
- at WebService(name = "DocWrapped")
- at SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
-public class DocWrappedServiceImpl
+
+ at WebService(endpointInterface = "org.jboss.test.ws.jaxws.jsr181.soapbinding.DocWrapped")
+public class DocWrappedServiceImpl implements DocWrapped
{
// Provide logging
private static Logger log = Logger.getLogger(ExampleServiceImpl.class);
- @WebMethod(operationName = "SubmitPO")
- @WebResult(name = "PurchaseOrderAck")
- public PurchaseOrderAck submitPO(@WebParam(name = "PurchaseOrder") PurchaseOrder purchaseOrder)
+ public PurchaseOrderAck submitPO(PurchaseOrder purchaseOrder)
{
log.info("submitPO: " + purchaseOrder);
PurchaseOrderAck poAck = new PurchaseOrderAck(purchaseOrder.getProduct());
return poAck;
}
- @WebMethod(operationName = "SubmitNamespacedPO")
- @WebResult(name = "NamespacedPurchaseOrderAck", targetNamespace = "http://namespace/result")
- public PurchaseOrderAck submitNamespacedPO(
- @WebParam(name = "NamespacedPurchaseOrder", targetNamespace = "http://namespace/purchase") PurchaseOrder purchaseOrder,
- @WebParam(name = "NamespacedString", targetNamespace = "http://namespace/string") String string
- )
+ public PurchaseOrderAck submitNamespacedPO(PurchaseOrder purchaseOrder, String string)
{
log.info("submitNamespacedPO: " + purchaseOrder + ", " + string);
PurchaseOrderAck poAck = new PurchaseOrderAck(purchaseOrder.getProduct());
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitNamespacedPO_RequestStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitNamespacedPO_RequestStruct.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitNamespacedPO_RequestStruct.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -1,59 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jsr181.soapbinding;
-
-
-public class DocWrappedService_SubmitNamespacedPO_RequestStruct
-{
- private PurchaseOrder namespacedPurchaseOrder;
- private String namespacedString;
-
- public DocWrappedService_SubmitNamespacedPO_RequestStruct()
- {
- }
-
- public DocWrappedService_SubmitNamespacedPO_RequestStruct(PurchaseOrder purchaseOrder)
- {
- this.namespacedPurchaseOrder = purchaseOrder;
- }
-
- public PurchaseOrder getNamespacedPurchaseOrder()
- {
- return namespacedPurchaseOrder;
- }
-
- public void setNamespacedPurchaseOrder(PurchaseOrder purchaseOrder)
- {
- this.namespacedPurchaseOrder = purchaseOrder;
- }
-
- public String getNamespacedString()
- {
- return namespacedString;
- }
-
- public void setNamespacedString(String string)
- {
- this.namespacedString = string;
- }
-
-}
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitNamespacedPO_ResponseStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitNamespacedPO_ResponseStruct.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitNamespacedPO_ResponseStruct.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jsr181.soapbinding;
-
-
-public class DocWrappedService_SubmitNamespacedPO_ResponseStruct
-{
- private PurchaseOrderAck namespacedPurchaseOrderAck;
-
- public DocWrappedService_SubmitNamespacedPO_ResponseStruct()
- {
- }
-
- public DocWrappedService_SubmitNamespacedPO_ResponseStruct(PurchaseOrderAck poAck)
- {
- this.namespacedPurchaseOrderAck = poAck;
- }
-
- public PurchaseOrderAck getNamespacedPurchaseOrderAck()
- {
- return namespacedPurchaseOrderAck;
- }
-
- public void setNamespacedPurchaseOrderAck(PurchaseOrderAck poAck)
- {
- this.namespacedPurchaseOrderAck = poAck;
- }
-
-}
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitPO_RequestStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitPO_RequestStruct.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitPO_RequestStruct.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jsr181.soapbinding;
-
-
-public class DocWrappedService_SubmitPO_RequestStruct
-{
- private PurchaseOrder purchaseOrder;
-
- public DocWrappedService_SubmitPO_RequestStruct()
- {
- }
-
- public DocWrappedService_SubmitPO_RequestStruct(PurchaseOrder purchaseOrder)
- {
- this.purchaseOrder = purchaseOrder;
- }
-
- public PurchaseOrder getPurchaseOrder()
- {
- return purchaseOrder;
- }
-
- public void setPurchaseOrder(PurchaseOrder purchaseOrder)
- {
- this.purchaseOrder = purchaseOrder;
- }
-
-}
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitPO_ResponseStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitPO_ResponseStruct.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrappedService_SubmitPO_ResponseStruct.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jsr181.soapbinding;
-
-
-public class DocWrappedService_SubmitPO_ResponseStruct
-{
- private PurchaseOrderAck purchaseOrderAck;
-
- public DocWrappedService_SubmitPO_ResponseStruct()
- {
- }
-
- public DocWrappedService_SubmitPO_ResponseStruct(PurchaseOrderAck poAck)
- {
- this.purchaseOrderAck = poAck;
- }
-
- public PurchaseOrderAck getPurchaseOrderAck()
- {
- return purchaseOrderAck;
- }
-
- public void setPurchaseOrderAck(PurchaseOrderAck poAck)
- {
- this.purchaseOrderAck = poAck;
- }
-
-}
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleSEI.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleSEI.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleSEI.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -24,6 +24,11 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+ at WebService(name = "Example")
+ at SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL)
public interface ExampleSEI extends Remote
{
String concat(String first, String second, String third) throws RemoteException;
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleServiceImpl.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleServiceImpl.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleServiceImpl.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -33,14 +33,13 @@
* @author Thomas.Diesler at jboss.org
* @since 16-Oct-2005
*/
- at WebService(name = "Example")
- at SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL)
+
+ at WebService(endpointInterface="org.jboss.test.ws.jaxws.jsr181.soapbinding.ExampleSEI")
public class ExampleServiceImpl
{
// Provide logging
private static Logger log = Logger.getLogger(ExampleServiceImpl.class);
- @WebMethod
public String concat(String first, String second, String third)
{
String retStr = first + "|" + second + "|" + third;
Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-10-09 22:54:50 UTC (rev 1175)
@@ -78,7 +78,7 @@
Service service = Service.create(wsdlURL, serviceName);
JAXBContext jbc = JAXBContext.newInstance(new Class[] { SubmitBareRequest.class, SubmitBareResponse.class });
Dispatch dispatch = service.createDispatch(portName, jbc, Mode.PAYLOAD);
-
+
SubmitBareRequest poReq = new SubmitBareRequest("Ferrari");
SubmitBareResponse poRes = (SubmitBareResponse)dispatch.invoke(poReq);
assertEquals("Ferrari", poRes.getProduct());
@@ -102,7 +102,7 @@
" </ns1:SubmitPO>" +
" </env:Body>" +
"</env:Envelope>";
-
+
SOAPMessage reqMsg = MessageFactory.newInstance().createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
SOAPMessage resMsg = (SOAPMessage)dispatch.invoke(reqMsg);
@@ -146,31 +146,19 @@
public void testDocWrappedService() throws Exception
{
QName serviceName = new QName(targetNS, "DocWrappedService");
- QName portName = new QName(targetNS, "DocWrappedPort");
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jsr181-soapbinding/DocWrappedService?wsdl");
- System.out.println("FIXME: JBWS-1033");
- /*
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- Service service = factory.createService(wsdlURL, serviceName, mappingFile.toURL());
- CallImpl call = (CallImpl)service.createCall(portName, "SubmitPO");
+ Service service = Service.create(wsdlURL, serviceName);
+ DocWrapped port = (DocWrapped)service.getPort(DocWrapped.class);
- OperationMetaData opMetaData = call.getOperationMetaData();
- assertEquals(Style.DOCUMENT, opMetaData.getStyle());
- assertEquals(Use.LITERAL, opMetaData.getUse());
- assertEquals(ParameterStyle.WRAPPED, opMetaData.getParameterStyle());
+ PurchaseOrderAck poRes = port.submitPO(new PurchaseOrder("Ferarri"));
- PurchaseOrder poReq = new PurchaseOrder("Ferarri");
-
- PurchaseOrderAck poRes = (PurchaseOrderAck)call.invoke(new Object[]{poReq});
assertEquals("Ferarri", poRes.getProduct());
- */
}
public void testDocWrappedServiceMessageAccess() throws Exception
{
MessageFactory msgFactory = MessageFactory.newInstance();
- SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
String reqEnv =
"<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
@@ -185,18 +173,19 @@
"</env:Envelope>";
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
- URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-jsr181-soapbinding/DocWrappedService");
-
- System.out.println("FIXME: JBWS-1033");
- /*
- SOAPMessage resMsg = con.call(reqMsg, epURL);
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jsr181-soapbinding/DocWrappedService?wsdl");
+ QName serviceName = new QName(targetNS, "DocWrappedService");
+ QName portName = new QName(targetNS, "DocWrappedPort");
+ Service service = Service.create(wsdlURL, serviceName);
+ Dispatch dispatch = service.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE);
+ SOAPMessage resMsg = (SOAPMessage) dispatch.invoke(reqMsg);
+
NameImpl name = new NameImpl(new QName(targetNS, "SubmitPOResponse"));
SOAPElement soapElement = (SOAPElement)resMsg.getSOAPBody().getChildElements(name).next();
soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(targetNS, "PurchaseOrderAck"))).next();
soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(targetNS, "product"))).next();
assertEquals("Ferrari", soapElement.getValue());
- */
}
public void testNamespacedDocWrappedServiceMessageAccess() throws Exception
@@ -221,11 +210,8 @@
" </env:Body>" +
"</env:Envelope>";
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
-
URL epURL = new URL("http://" + getServerHost() + ":8080/jaxws-jsr181-soapbinding/DocWrappedService");
-
- System.out.println("FIXME: JBWS-1033");
- /*
+
SOAPMessage resMsg = con.call(reqMsg, epURL);
NameImpl name = new NameImpl(new QName(targetNS, "SubmitNamespacedPOResponse"));
@@ -233,6 +219,5 @@
soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(resultNamespace, "NamespacedPurchaseOrderAck"))).next();
soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(targetNS, "product"))).next();
assertEquals("Ferrari", soapElement.getValue());
- */
}
}
Modified: trunk/src/test/resources/jaxrpc/anonymous/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/jaxrpc/anonymous/WEB-INF/jaxrpc-mapping.xml 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/resources/jaxrpc/anonymous/WEB-INF/jaxrpc-mapping.xml 2006-10-09 22:54:50 UTC (rev 1175)
@@ -94,24 +94,6 @@
<wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws/anonymous">portTypeNS:AnonymousTestService</wsdl-port-type>
<wsdl-binding xmlns:bindingNS="http://org.jboss.ws/anonymous">bindingNS:AnonymousTestServiceBinding</wsdl-binding>
<service-endpoint-method-mapping>
- <java-method-name>testComplexTypeRoot</java-method-name>
- <wsdl-operation>testComplexTypeRoot</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.anonymous.ComplexTypeRoot</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/anonymous">wsdlMsgNS:AnonymousTestService_testComplexTypeRoot</wsdl-message>
- <wsdl-message-part-name>ComplexTypeRoot_1</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.jaxrpc.anonymous.ComplexTypeRoot</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/anonymous">wsdlMsgNS:AnonymousTestService_testComplexTypeRootResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
<java-method-name>testElementSomeOtherElement</java-method-name>
<wsdl-operation>testElementSomeOtherElement</wsdl-operation>
<method-param-parts-mapping>
Modified: trunk/src/test/resources/jaxrpc/anonymous/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- trunk/src/test/resources/jaxrpc/anonymous/WEB-INF/wsdl/TestService.wsdl 2006-10-09 21:28:11 UTC (rev 1174)
+++ trunk/src/test/resources/jaxrpc/anonymous/WEB-INF/wsdl/TestService.wsdl 2006-10-09 22:54:50 UTC (rev 1175)
@@ -27,12 +27,6 @@
<element name="someOtherElement" type="xsd:int"/>
</schema>
</types>
- <message name="AnonymousTestService_testComplexTypeRoot">
- <part name="ComplexTypeRoot_1" type="ns2:root"/>
- </message>
- <message name="AnonymousTestService_testComplexTypeRootResponse">
- <part name="result" type="ns2:root"/>
- </message>
<message name="AnonymousTestService_testElementSomeOtherElement">
<part name="int_1" element="ns2:someOtherElement"/>
</message>
@@ -46,10 +40,6 @@
<part name="result" element="ns2:root"/>
</message>
<portType name="AnonymousTestService">
- <operation name="testComplexTypeRoot">
- <input message="tns:AnonymousTestService_testComplexTypeRoot"/>
- <output message="tns:AnonymousTestService_testComplexTypeRootResponse"/>
- </operation>
<operation name="testElementSomeOtherElement">
<input message="tns:AnonymousTestService_testElementSomeOtherElement"/>
<output message="tns:AnonymousTestService_testElementSomeOtherElementResponse"/>
@@ -60,32 +50,23 @@
</operation>
</portType>
<binding name="AnonymousTestServiceBinding" type="tns:AnonymousTestService">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
- <operation name="testComplexTypeRoot">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal" namespace="http://org.jboss.ws/anonymous"/>
- </input>
- <output>
- <soap:body use="literal" namespace="http://org.jboss.ws/anonymous"/>
- </output>
- </operation>
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
<operation name="testElementSomeOtherElement">
<soap:operation soapAction=""/>
<input>
- <soap:body use="literal" namespace="http://org.jboss.ws/anonymous"/>
+ <soap:body use="literal"/>
</input>
<output>
- <soap:body use="literal" namespace="http://org.jboss.ws/anonymous"/>
+ <soap:body use="literal"/>
</output>
</operation>
<operation name="testElementTypeRoot">
<soap:operation soapAction=""/>
<input>
- <soap:body use="literal" namespace="http://org.jboss.ws/anonymous"/>
+ <soap:body use="literal"/>
</input>
<output>
- <soap:body use="literal" namespace="http://org.jboss.ws/anonymous"/>
+ <soap:body use="literal"/>
</output>
</operation>
</binding>
More information about the jboss-svn-commits
mailing list