[jbossws-commits] JBossWS SVN: r1344 - in branches/JEE5_TCK/src: main/java/org/jboss/ws/binding main/java/org/jboss/ws/deployment main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/jaxws main/java/org/jboss/ws/metadata main/java/org/jboss/ws/metadata/acessor main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/helpers main/java/org/jboss/ws/tools/metadata test/ant test/java/org/jboss/test/ws/jaxws test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding test/java/org/jboss/test/ws/jaxws/logicalhandler te

Author: jason.greene(a)jboss.com Date: 2006-11-02 11:50:38 -0500 (Thu, 02 Nov 2006) New Revision: 1344 Added: branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/WrappedParameter.java branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/ branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java branches/JEE5_TCK/src/test/resources/jaxws/wrapped/ branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor/ branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor/WEB-INF/ branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/binding/EndpointInvocation.java branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java branches/JEE5_TCK/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java branches/JEE5_TCK/src/main/java/org/jboss/ws/jaxws/DynamicWrapperGenerator.java branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java branches/JEE5_TCK/src/test/ant/build-jars-jaxws.xml branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java Log: JBWS-1320 Refactor WrappedParameters to use accessors Also fix namespace usage with doc wrapped Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/binding/EndpointInvocation.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/binding/EndpointInvocation.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -42,7 +42,7 @@ import org.jboss.ws.jaxrpc.ParameterWrapping; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.soap.SOAPContentElement; import org.jboss.ws.utils.HolderUtils; import org.jboss.ws.utils.JavaUtils; @@ -337,12 +337,12 @@ { try { - if (param.index >= 0) - outParameters.put(param.index, targetParameterTypes[param.index].newInstance()); + if (param.getIndex() >= 0) + outParameters.put(param.getIndex(), targetParameterTypes[param.getIndex()].newInstance()); } catch (Exception e) { - throw new WSException("Could not add output param: " + param.name, e); + throw new WSException("Could not add output param: " + param.getName(), e); } } Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -50,7 +50,7 @@ import org.jboss.ws.metadata.ServiceMetaData; import org.jboss.ws.metadata.TypeMappingMetaData; import org.jboss.ws.metadata.TypesMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -78,8 +78,9 @@ import org.jboss.ws.metadata.TypeMappingMetaData; import org.jboss.ws.metadata.TypesMetaData; import org.jboss.ws.metadata.UnifiedMetaData; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.metadata.HandlerMetaData.HandlerType; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.acessor.JAXBAccessor; import org.jboss.ws.metadata.config.jaxws.WSEndpointConfigJAXWS; import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; @@ -451,14 +452,14 @@ String variable = convertToVariable(wrappedElementName.getLocalPart()); WrappedParameter wrappedParameter = new WrappedParameter(wrappedElementName, javaTypeName, variable, i); - wrappedParameter.typeArguments = convertTypeArguments(javaType, genericType); + wrappedParameter.setTypeArguments(convertTypeArguments(javaType, genericType)); if (mode != ParameterMode.OUT) wrappedParameters.add(wrappedParameter); if (mode != ParameterMode.IN) { wrappedOutputParameters.add(wrappedParameter); - wrappedParameter.holder = true; + wrappedParameter.setHolder(true); } } else @@ -493,7 +494,7 @@ if (isWrapped) { WrappedParameter wrapped = new WrappedParameter(xmlName, returnTypeName, convertToVariable(xmlName.getLocalPart()), -1); - wrapped.typeArguments = convertTypeArguments(returnType, genericReturnType); + wrapped.setTypeArguments(convertTypeArguments(returnType, genericReturnType)); // insert at the beginning just for prettiness wrappedOutputParameters.add(0, wrapped); @@ -575,6 +576,7 @@ } ParameterMetaData retMetaData = new ParameterMetaData(operation, xmlName, xmlType, responseWrapperType); + retMetaData.setAccessorFactoryCreator(JAXBAccessor.FACTORY_CREATOR); operation.setReturnParameter(retMetaData); return retMetaData; @@ -606,6 +608,7 @@ // JAX-WS p.37 pg.1, the annotation only affects the element name, not the type name ParameterMetaData wrapperParameter = new ParameterMetaData(operation, xmlName, xmlType, requestWrapperType); + wrapperParameter.setAccessorFactoryCreator(JAXBAccessor.FACTORY_CREATOR); operation.addParameter(wrapperParameter); return wrapperParameter; @@ -717,54 +720,66 @@ private QName getWebParamName(OperationMetaData opMetaData, int index, Class javaType, WebParam webParam) { - QName xmlName = null; - String namespaceURI = opMetaData.getQName().getNamespaceURI(); + String namespace = null ; + String name = null; + boolean header = false; + if (webParam != null) { if (webParam.targetNamespace().length() > 0) - namespaceURI = webParam.targetNamespace(); + namespace = webParam.targetNamespace(); if (webParam.name().length() > 0) - { - if (opMetaData.getStyle() != Style.RPC || webParam.header()) - xmlName = new QName(namespaceURI, webParam.name()); - else xmlName = new QName(webParam.name()); - } + name = webParam.name(); + + header = webParam.header(); } - if (xmlName == null && opMetaData.isDocumentBare()) - xmlName = new QName(namespaceURI, opMetaData.getQName().getLocalPart()); + // Bare and headers must be qualified + if (namespace == null && (opMetaData.isDocumentBare() || header)) + namespace = opMetaData.getQName().getNamespaceURI(); - if (xmlName == null) - xmlName = (opMetaData.isDocumentWrapped()) ? new QName(namespaceURI, "arg" + index) : new QName("arg" + index); + // RPC body parts must have no namespace + else if (opMetaData.isRPCLiteral() && !header) + namespace = null; - return xmlName; + // Bare uses the operation name as the default, everything else is generated + if (name == null) + name = opMetaData.isDocumentBare() && !header ? opMetaData.getQName().getLocalPart() : "arg" + index; + + return (namespace != null) ? new QName(namespace, name) : new QName(name); } private QName getWebResultName(OperationMetaData opMetaData, Class javaType, WebResult anWebResult) { - QName xmlName = null; - String namespaceURI = opMetaData.getQName().getNamespaceURI(); + String name = null; + String namespace = null; + boolean header = false; if (anWebResult != null) { if (anWebResult.targetNamespace().length() > 0) - namespaceURI = anWebResult.targetNamespace(); + namespace = anWebResult.targetNamespace(); if (anWebResult.name().length() > 0) - { - if (opMetaData.getStyle() != Style.RPC || anWebResult.header()) - xmlName = new QName(namespaceURI, anWebResult.name()); - else xmlName = new QName(anWebResult.name()); - } + name = anWebResult.name(); + + header = anWebResult.header(); } - if (xmlName == null && opMetaData.isDocumentBare()) - xmlName = new QName(namespaceURI, opMetaData.getResponseName().getLocalPart()); - if (xmlName == null) - xmlName = (opMetaData.isDocumentWrapped() ? new QName(namespaceURI, "return") : new QName("return")); + // Bare and headers must be qualified + if (namespace == null && (opMetaData.isDocumentBare() || header)) + namespace = opMetaData.getQName().getNamespaceURI(); - return xmlName; + // RPC body parts must have no namespace + else if (opMetaData.isRPCLiteral() && !header) + namespace = null; + + // Bare uses the operation name as the default, everything else is generated + if (name == null) + name = opMetaData.isDocumentBare() && !header ? opMetaData.getResponseName().getLocalPart() : "return"; + + return (namespace != null) ? new QName(namespace, name) : new QName(name); } private void addFault(OperationMetaData omd, Class<?> exception) @@ -921,5 +936,4 @@ } } } - -} +} \ No newline at end of file Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -49,7 +49,7 @@ import org.jboss.ws.metadata.ServiceMetaData; import org.jboss.ws.metadata.TypeMappingMetaData; import org.jboss.ws.metadata.TypesMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.utils.HolderUtils; import org.jboss.ws.utils.JavaUtils; @@ -111,11 +111,8 @@ Object reqStruct = reqStructType.newInstance(); for (WrappedParameter param : wrappedParameters) { - PropertyDescriptor pd = new PropertyDescriptor(param.variable, reqStructType); - Method method = pd.getWriteMethod(); - Object value = holderValue(methodParams[param.index]); - log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null)); - method.invoke(reqStruct, value); + Object value = holderValue(methodParams[param.getIndex()]); + param.accessor().set(reqStruct, value); } return reqStruct; @@ -146,23 +143,19 @@ log.debug("unwrapRequestParameters: " + reqStructType.getName()); try { - for (ParameterMetaData.WrappedParameter param : wrappedParameters) + for (WrappedParameter param : wrappedParameters) { - PropertyDescriptor pd = new PropertyDescriptor(param.variable, reqStructType); - Method method = pd.getReadMethod(); - Class targetType = targetParameterTypes[param.index]; + Class targetType = targetParameterTypes[param.getIndex()]; + Object value = param.accessor().get(reqStruct); - Object value = method.invoke(reqStruct); - // INOUT Parameter if (HolderUtils.isHolderType(targetType)) { value = HolderUtils.createHolderInstance(value, targetType); - outParameters.put(param.index, value); + outParameters.put(param.getIndex(), value); } - log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null)); - methodParams[param.index] = value; + methodParams[param.getIndex()] = value; } } catch (RuntimeException rte) @@ -189,18 +182,15 @@ } log.debug("wrapResponseParameter: " + resStructType.getName()); - List<ParameterMetaData.WrappedParameter> wrappedParameters = returnMetaData.getWrappedParameters(); + List<WrappedParameter> wrappedParameters = returnMetaData.getWrappedParameters(); try { Object resStruct = resStructType.newInstance(); - for (ParameterMetaData.WrappedParameter param : wrappedParameters) + for (WrappedParameter param : wrappedParameters) { - PropertyDescriptor pd = new PropertyDescriptor(param.variable, resStructType); - Method method = pd.getWriteMethod(); - Object value = (param.index < 0) ? returnValue : holderValue(outParameters.get(param.index)); - log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null)); - method.invoke(resStruct, value); + Object value = (param.getIndex() < 0) ? returnValue : holderValue(outParameters.get(param.getIndex())); + param.accessor().set(resStruct, value); } return resStruct; } @@ -231,20 +221,17 @@ { for (WrappedParameter param : wrappedParameters) { - PropertyDescriptor pd = new PropertyDescriptor(param.variable, resStructType); - Method method = pd.getReadMethod(); - Object value = method.invoke(resStruct, new Object[] {}); - log.debug(" " + method.getName() + ": " + (value != null ? value.getClass().getName() : null)); - if (param.index < 0) + Object value = param.accessor().get(resStruct); + if (param.getIndex() < 0) { retValue = value; } else { - Class targetType = targetTypes[param.index]; + Class targetType = targetTypes[param.getIndex()]; if (HolderUtils.isHolderType(targetType)) value = HolderUtils.createHolderInstance(value, targetType); - methodParams[param.index] = value; + methodParams[param.getIndex()] = value; } } } @@ -310,11 +297,11 @@ for (WrappedParameter param : wrappedParameters) { - CtField field = new CtField(pool.get(param.type), param.variable, clazz); + CtField field = new CtField(pool.get(param.getType()), param.getVariable(), clazz); field.setModifiers(Modifier.PRIVATE); clazz.addField(field); - clazz.addMethod(CtNewMethod.getter("get" + JavaUtils.capitalize(param.variable), field)); - clazz.addMethod(CtNewMethod.setter("set" + JavaUtils.capitalize(param.variable), field)); + clazz.addMethod(CtNewMethod.getter("get" + JavaUtils.capitalize(param.getVariable()), field)); + clazz.addMethod(CtNewMethod.setter("set" + JavaUtils.capitalize(param.getVariable()), field)); } wrapperType = (Class)pool.toClass(clazz, loader); Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/jaxws/DynamicWrapperGenerator.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/jaxws/DynamicWrapperGenerator.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/jaxws/DynamicWrapperGenerator.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -47,7 +47,7 @@ import org.jboss.ws.metadata.FaultMetaData; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.utils.JavaUtils; import org.jboss.ws.utils.JavassistUtils; @@ -98,7 +98,7 @@ for (WrappedParameter parameter : wrappedParameters) { - addProperty(clazz, parameter.type, parameter.name, parameter.variable, parameter.typeArguments); + addProperty(clazz, parameter.getType(), parameter.getName(), parameter.getVariable(), parameter.getTypeArguments()); } pool.toClass(clazz, loader); } Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/ParameterMetaData.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -38,8 +38,9 @@ import org.jboss.ws.WSException; import org.jboss.ws.jaxrpc.ParameterWrapping; import org.jboss.ws.jaxws.DynamicWrapperGenerator; +import org.jboss.ws.metadata.WrappedParameter.AccessorFactory; +import org.jboss.ws.metadata.acessor.ReflectiveMethodAccessor; import org.jboss.ws.utils.HolderUtils; -import org.jboss.ws.utils.IOUtils; import org.jboss.ws.utils.JavaUtils; /** @@ -72,7 +73,13 @@ // SOAP-ENC:Array private boolean soapArrayParam; private QName soapArrayCompType; + private AccessorFactoryCreator accessorFactoryCreator = ReflectiveMethodAccessor.FACTORY_CREATOR; + public static interface AccessorFactoryCreator + { + public AccessorFactory create(ParameterMetaData parameter); + } + public ParameterMetaData(OperationMetaData opMetaData, QName xmlName, QName xmlType, String javaTypeName) { this(opMetaData, xmlName, javaTypeName); @@ -95,34 +102,6 @@ this.javaTypeName = javaTypeName; } - public static class WrappedParameter - { - public static final int RETURN = -1; - public QName name; - public String type; - public String[] typeArguments; - public String variable; - public boolean holder = false; - public int index = -2; - - public WrappedParameter() - { - } - - public WrappedParameter(QName name, String type, String variable, int index) - { - this.name = name; - this.type = type; - this.variable = variable; - this.index = index; - } - - public String toString() - { - return "[name = " + name + ", type = " + type + ", typeArgs = " + IOUtils.printArray(typeArguments) + ", variable = " + variable + ", index = " + index + "]"; - } - } - private static boolean matchParameter(Method method, int index, Class expectedType, Set<Integer> matches, boolean exact, boolean holder) { Class returnType = method.getReturnType(); @@ -362,8 +341,15 @@ // At some point we want to make this plugable, hardcoding // references like this is not very flexible. if (opMetaData.isDocumentWrapped()) + { (new DynamicWrapperGenerator(getClassLoader())).generate(this); + // Initialize accessors + AccessorFactory factory = accessorFactoryCreator.create(this); + for (WrappedParameter wrapped : wrappedParameters) + wrapped.setAccessor(factory.create(wrapped)); + } + // Initialize the cache getJavaType(); } @@ -389,15 +375,15 @@ // Wrapped type for (WrappedParameter wrapped : wrappedParameters) { - String typeName = wrapped.type; + String typeName = wrapped.getType(); try { Class type = (typeName != null) ? JavaUtils.loadJavaType(typeName, loader) - : ParameterWrapping.getWrappedType(wrapped.variable, wrapperType); + : ParameterWrapping.getWrappedType(wrapped.getVariable(), wrapperType); if (type == null) return false; - if (! matchParameter(method, wrapped.index, type, matches, exact, wrapped.holder)) + if (! matchParameter(method, wrapped.getIndex(), type, matches, exact, wrapped.isHolder())) return false; } catch (Exception ex) @@ -410,6 +396,11 @@ return true; } + public void setAccessorFactoryCreator(AccessorFactoryCreator accessorFactoryCreator) + { + this.accessorFactoryCreator = accessorFactoryCreator; + } + public String toString() { boolean isReturn = (opMetaData.getReturnParameter() == this); Added: branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/WrappedParameter.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/WrappedParameter.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/WrappedParameter.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -0,0 +1,138 @@ +/* + * 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; + +import javax.xml.namespace.QName; + +import org.jboss.ws.utils.IOUtils; + +/** + * WrappedParameter represents a document/literal wrapped parameter. + * + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> + * @version $Revision$ + */ +public class WrappedParameter +{ + public static final int RETURN = -1; + private QName name; + private String type; + private String[] typeArguments; + private String variable; + private boolean holder = false; + private int index = -2; + private Accessor accessor; + + public static interface AccessorFactory + { + public Accessor create(WrappedParameter parameter); + } + + public static interface Accessor + { + public void set(Object bean, Object value); + public Object get(Object bean); + } + + public WrappedParameter(QName name, String type, String variable, int index) + { + this.setName(name); + this.setType(type); + this.setVariable(variable); + this.setIndex(index); + } + + public Accessor accessor() + { + return accessor; + } + + public void setName(QName name) + { + this.name = name; + } + + public QName getName() + { + return name; + } + + public void setType(String type) + { + this.type = type; + } + + public String getType() + { + return type; + } + + public void setTypeArguments(String[] typeArguments) + { + this.typeArguments = typeArguments; + } + + public String[] getTypeArguments() + { + return typeArguments; + } + + public void setVariable(String variable) + { + this.variable = variable; + } + + public String getVariable() + { + return variable; + } + + public void setHolder(boolean holder) + { + this.holder = holder; + } + + public boolean isHolder() + { + return holder; + } + + public void setIndex(int index) + { + this.index = index; + } + + public int getIndex() + { + return index; + } + + void setAccessor(Accessor accessor) + { + this.accessor = accessor; + } + + public String toString() + { + return "[name = " + getName() + ", type = " + getType() + ", typeArgs = " + IOUtils.printArray(getTypeArguments()) + ", variable = " + getVariable() + ", index = " + getIndex() + "]"; + } +} \ No newline at end of file Property changes on: branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/WrappedParameter.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -0,0 +1,125 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.ws.metadata.acessor; + +import javax.xml.bind.JAXBException; +import javax.xml.namespace.QName; + +import org.jboss.ws.WSException; +import org.jboss.ws.metadata.ParameterMetaData; +import org.jboss.ws.metadata.WrappedParameter; +import org.jboss.ws.metadata.ParameterMetaData.AccessorFactoryCreator; +import org.jboss.ws.metadata.WrappedParameter.Accessor; +import org.jboss.ws.metadata.WrappedParameter.AccessorFactory; + +import com.sun.xml.bind.api.AccessorException; +import com.sun.xml.bind.api.JAXBRIContext; +import com.sun.xml.bind.api.RawAccessor; + +/** + * A JAXB object accessor. + * + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> + * @version $Revision$ + */ +@SuppressWarnings("unchecked") +public class JAXBAccessor implements Accessor +{ + private RawAccessor accessor; + + public static AccessorFactoryCreator FACTORY_CREATOR = new AccessorFactoryCreator() + { + public AccessorFactory create(ParameterMetaData parameter) + { + final Class clazz = parameter.getJavaType(); + final JAXBRIContext ctx; + + try + { + ctx = (JAXBRIContext) JAXBRIContext.newInstance(new Class[]{clazz}); + } + catch (JAXBException e) + { + WSException ex = new WSException(e.getMessage()); + ex.setStackTrace(e.getStackTrace()); + throw ex; + } + + return new AccessorFactory() + { + public Accessor create(WrappedParameter parameter) + { + RawAccessor<Object,Object> accessor; + try + { + QName name = parameter.getName(); + accessor = ctx.getElementPropertyAccessor(clazz, name.getNamespaceURI(), name.getLocalPart()); + } + catch (Throwable t) + { + WSException ex = new WSException(t.getMessage()); + ex.setStackTrace(t.getStackTrace()); + throw ex; + } + + if (accessor == null) + throw new IllegalStateException("Could not obtain accessor for parameter: " + parameter); + + return new JAXBAccessor(accessor); + } + }; + } + }; + + private JAXBAccessor(RawAccessor accessor) + { + this.accessor = accessor; + } + + public Object get(Object bean) + { + try + { + return accessor.get(bean); + } + catch (AccessorException a) + { + WSException ex = new WSException(a.getMessage()); + ex.setStackTrace(a.getStackTrace()); + throw ex; + } + } + + public void set(Object bean, Object value) + { + try + { + accessor.set(bean, value); + } + catch (AccessorException a) + { + WSException ex = new WSException(a.getMessage()); + ex.setStackTrace(a.getStackTrace()); + throw ex; + } + } +} \ No newline at end of file Property changes on: branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/JAXBAccessor.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -0,0 +1,105 @@ +/* + * 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.beans.PropertyDescriptor; +import java.lang.reflect.Method; + +import org.jboss.ws.WSException; +import org.jboss.ws.metadata.ParameterMetaData; +import org.jboss.ws.metadata.WrappedParameter; +import org.jboss.ws.metadata.ParameterMetaData.AccessorFactoryCreator; +import org.jboss.ws.metadata.WrappedParameter.Accessor; +import org.jboss.ws.metadata.WrappedParameter.AccessorFactory; + +/** + * A simple JavaBean accessor that uses ordinary reflection. + * + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> + * @version $Revision$ + */ +@SuppressWarnings("unchecked") +public class ReflectiveMethodAccessor implements Accessor +{ + private Method getter; + private Method setter; + + public static AccessorFactoryCreator FACTORY_CREATOR = new AccessorFactoryCreator() + { + public AccessorFactory create(ParameterMetaData parameter) + { + final Class clazz = parameter.getJavaType(); + + return new AccessorFactory() + { + public Accessor create(WrappedParameter parameter) + { + try + { + PropertyDescriptor pd = new PropertyDescriptor(parameter.getVariable(), clazz); + return new ReflectiveMethodAccessor(pd.getReadMethod(), pd.getWriteMethod()); + } + catch (Throwable t) + { + WSException ex = new WSException(t.getMessage()); + ex.setStackTrace(t.getStackTrace()); + throw ex; + } + } + }; + } + }; + + private ReflectiveMethodAccessor(Method getter, Method setter) + { + this.getter = getter; + this.setter = setter; + } + + public Object get(Object bean) + { + try + { + return getter.invoke(bean); + } + catch (Throwable e) + { + WSException ex = new WSException(e.getMessage()); + ex.setStackTrace(ex.getStackTrace()); + throw ex; + } + } + + public void set(Object bean, Object value) + { + try + { + setter.invoke(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: branches/JEE5_TCK/src/main/java/org/jboss/ws/metadata/acessor/ReflectiveMethodAccessor.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/SourceWrapperGenerator.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -37,7 +37,7 @@ import org.jboss.ws.metadata.FaultMetaData; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.utils.JavaUtils; import com.sun.codemodel.JAnnotationArrayMember; @@ -88,7 +88,7 @@ addClassAnnotations(clazz, pmd.getXmlName(), pmd.getXmlType(), null); for (WrappedParameter wrapped : wrappedParameters) { - addProperty(clazz, wrapped.type, wrapped.name, wrapped.variable); + addProperty(clazz, wrapped.getType(), wrapped.getName(), wrapped.getVariable()); } } catch (Exception e) Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -48,7 +48,7 @@ import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; import org.jboss.ws.metadata.ServerEndpointMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; @@ -166,7 +166,7 @@ Map<String, QName> map = new LinkedHashMap<String, QName>(wrappedParameters.size()); for (WrappedParameter param : wrappedParameters) - map.put(param.variable, param.name); + map.put(param.getVariable(), param.getName()); return map; } @@ -231,8 +231,8 @@ List<WrappedParameter> wrappedParameters = param.getWrappedParameters(); for (WrappedParameter wrapped : wrappedParameters) { - String type = JavaUtils.convertJVMNameToSourceName(wrapped.type, endpoint.getClassLoader()); - String name = wrapped.name.getLocalPart(); + String type = JavaUtils.convertJVMNameToSourceName(wrapped.getType(), endpoint.getClassLoader()); + String name = wrapped.getName().getLocalPart(); buildParamMapping(methodMapping, interfaceName, operation, name, type, "IN", false, i++); } @@ -252,8 +252,8 @@ if (isWrapped) { WrappedParameter wrappedParameter = returnParam.getWrappedParameters().get(0); - name = wrappedParameter.name.getLocalPart(); - type = wrappedParameter.type; + name = wrappedParameter.getName().getLocalPart(); + type = wrappedParameter.getType(); } else { Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -47,7 +47,7 @@ import org.jboss.ws.metadata.ParameterMetaData; import org.jboss.ws.metadata.ServiceMetaData; import org.jboss.ws.metadata.UnifiedMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; import org.jboss.ws.metadata.wsdl.NCName; @@ -244,8 +244,8 @@ List<VAR> vars = new ArrayList<VAR>(); for (WrappedParameter wrapped : wrappedParameters) { - String typeName = JavaUtils.convertJVMNameToSourceName(wrapped.type, classLoader); - vars.add(new VAR(wrapped.variable, typeName, false)); + String typeName = JavaUtils.convertJVMNameToSourceName(wrapped.getType(), classLoader); + vars.add(new VAR(wrapped.getVariable(), typeName, false)); } JavaWriter writer = new JavaWriter(); Modified: branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java =================================================================== --- branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/main/java/org/jboss/ws/tools/metadata/ReflectiveMetaDataBuilder.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -39,7 +39,7 @@ import org.jboss.ws.metadata.FaultMetaData; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; -import org.jboss.ws.metadata.ParameterMetaData.WrappedParameter; +import org.jboss.ws.metadata.WrappedParameter; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.Configuration.OperationConfig; Modified: branches/JEE5_TCK/src/test/ant/build-jars-jaxws.xml =================================================================== --- branches/JEE5_TCK/src/test/ant/build-jars-jaxws.xml 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/ant/build-jars-jaxws.xml 2006-11-02 16:50:38 UTC (rev 1344) @@ -415,6 +415,7 @@ <war warfile="${build.test.dir}/libs/jaxws-webserviceref.war" webxml="${build.test.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </classes> </war> <jar destfile="${build.test.dir}/libs/jaxws-webserviceref-client.jar"> @@ -462,6 +463,15 @@ </metainf> </jar> + <!-- jaxws-wrapped-accessor --> + <war warfile="${build.test.dir}/libs/jaxws-wrapped-accessor.war" webxml="${build.test.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/> + <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/> + </classes> + </war> + <!-- jaxws-wsaddressing-action --> <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/jsr181/soapbinding/JSR181SOAPBindingTestCase.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -165,9 +165,9 @@ " <env:Header/>" + " <env:Body>" + " <ns1:SubmitPO xmlns:ns1='" + targetNS + "'>" + - " <ns1:PurchaseOrder>" + + " <PurchaseOrder>" + " <ns1:product>Ferrari</ns1:product>" + - " </ns1:PurchaseOrder>" + + " </PurchaseOrder>" + " </ns1:SubmitPO>" + " </env:Body>" + "</env:Envelope>"; @@ -183,7 +183,7 @@ 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("PurchaseOrderAck"))).next(); soapElement = (SOAPElement)soapElement.getChildElements(new NameImpl(new QName(targetNS, "product"))).next(); assertEquals("Ferrari", soapElement.getValue()); } Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -37,9 +37,9 @@ { @WebMethod - @WebResult(name = "result") + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name = "result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(@WebParam(name="String_1") String string1); + public String echo(@WebParam(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name="String_1") String string1); } Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -40,10 +40,10 @@ private static Logger log = Logger.getLogger(SOAPEndpointJAXBImpl.class); @WebMethod - @WebResult(name = "result") + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name = "result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(@WebParam(name="String_1") String msg) + public String echo(@WebParam(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name="String_1") String msg) { log.info("echo: " + msg); return msg + ":endpoint"; Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -37,9 +37,9 @@ { @WebMethod - @WebResult(name = "result") + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name = "result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(@WebParam(name = "String_1") String string1); + public String echo(@WebParam(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name = "String_1") String string1); } Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -40,10 +40,10 @@ private static Logger log = Logger.getLogger(SOAPEndpointSourceImpl.class); @WebMethod - @WebResult(name="result") + @WebResult(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name="result") @RequestWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.Echo") @ResponseWrapper(className = "org.jboss.test.ws.jaxws.logicalhandler.EchoResponse") - public String echo(@WebParam(name="String_1")String msg) + public String echo(@WebParam(targetNamespace = "http://org.jboss.ws/jaxws/logicalhandler", name="String_1")String msg) { log.info("echo: " + msg); return msg + ":endpoint"; Modified: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.webserviceref; -import javax.jws.WebMethod; import javax.jws.WebService; import org.jboss.logging.Logger; @@ -32,13 +31,12 @@ * @author Thomas.Diesler(a)jboss.org * @since 23-Oct-2006 */ -@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref") -public class TestEndpointImpl +(a)WebService(endpointInterface=&quot;org.jboss.test.ws.jaxws.webserviceref.TestEndpoint&quot;) +public class TestEndpointImpl implements TestEndpoint { // Provide logging private static Logger log = Logger.getLogger(TestEndpointImpl.class); - - @WebMethod + public String echo(String input) { log.info(input); Added: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -0,0 +1,30 @@ +/* + * 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.wrapped.accessor; +import javax.jws.WebService; + +@WebService +public interface Accessor +{ + public String fieldAccessor(String one, int two); + public String methodAccessor(String one, int two); +} \ No newline at end of file Property changes on: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -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.jaxws.wrapped.accessor; + +import javax.jws.WebService; + +(a)WebService(endpointInterface=&quot;org.jboss.test.ws.jaxws.wrapped.accessor.Accessor&quot;) +public class AccessorImpl implements Accessor +{ + public String fieldAccessor(String one, int two) + { + return one + two; + } + + public String methodAccessor(String one, int two) + { + return one + two; + } +} Property changes on: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -0,0 +1,72 @@ +/* + * 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.wrapped.accessor; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * Test different JAXB accesor types. + * + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> + * @version $Revision$ + */ +public class AccessorTestCase extends JBossWSTest +{ + private String targetNS = "http://accessor.wrapped.jaxws.ws.test.jboss.org/jaws"; + private Accessor proxy; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(AccessorTestCase.class, "jaxws-wrapped-accessor.war"); + } + + @Override + protected void setUp() throws Exception + { + super.setUp(); + + QName serviceName = new QName(targetNS, "AccessorService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-wrapped-accessor/AccessorService?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + proxy = (Accessor) service.getPort(Accessor.class); + } + + + public void testFieldAccessor() throws Exception + { + assertEquals("testing123", proxy.fieldAccessor("testing", 123)); + } + + public void testMethodAccessor() throws Exception + { + assertEquals("moretesting456", proxy.fieldAccessor("moretesting", 456)); + } +} \ No newline at end of file Property changes on: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/AccessorTestCase.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -0,0 +1,42 @@ +/* + * 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.wrapped.accessor.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "fieldAccessor", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "fieldAccessor", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/", propOrder = { + "arg0", + "arg1" +}) +public class FieldAccessor { + + @XmlElement(name = "arg0", namespace = "") + private String arg0; + @XmlElement(name = "arg1", namespace = "") + private int arg1; +} Property changes on: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessor.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -0,0 +1,37 @@ +/* + * 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.wrapped.accessor.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "fieldAccessorResponse", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "fieldAccessorResponse", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") +public class FieldAccessorResponse { + + @XmlElement(name = "return", namespace = "") + private String _return; +} Property changes on: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/FieldAccessorResponse.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -0,0 +1,79 @@ +/* + * 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.wrapped.accessor.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "methodAccessor", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") +(a)XmlAccessorType(XmlAccessType.PROPERTY) +@XmlType(name = "methodAccessor", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/", propOrder = { "arg0", "arg1" }) +public class MethodAccessor +{ + private String renamed0; + private int renamed1; + + /** + * + * @return + * returns String + */ + @XmlElement(name = "arg0", namespace = "") + public String getArg0() + { + return this.renamed0; + } + + /** + * + * @param arg0 + * the value for the arg0 property + */ + public void setArg0(String arg0) + { + this.renamed0 = arg0; + } + + /** + * + * @return + * returns int + */ + @XmlElement(name = "arg1", namespace = "") + public int getArg1() + { + return this.renamed1; + } + + /** + * + * @param arg1 + * the value for the arg1 property + */ + public void setArg1(int arg1) + { + this.renamed1 = arg1; + } +} \ No newline at end of file Property changes on: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessor.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java =================================================================== --- branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java 2006-11-02 16:50:38 UTC (rev 1344) @@ -0,0 +1,55 @@ +/* + * 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.wrapped.accessor.jaxws; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement(name = "methodAccessorResponse", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") +(a)XmlAccessorType(XmlAccessType.PROPERTY) +@XmlType(name = "methodAccessorResponse", namespace = "http://accessor.wrapped.jaxws.ws.test.jboss.org/") +public class MethodAccessorResponse { + + private String renamed; + + /** + * + * @return + * returns String + */ + @XmlElement(name = "return", namespace = "") + public String get_return() { + return this.renamed; + } + + /** + * + * @param _return + * the value for the _return property + */ + public void set_return(String _return) { + this.renamed = _return; + } +} Property changes on: branches/JEE5_TCK/src/test/java/org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/MethodAccessorResponse.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml =================================================================== --- branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml 2006-11-02 15:17:07 UTC (rev 1343) +++ branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml 2006-11-02 16:50:38 UTC (rev 1344) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>AccessorService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.wrapped.accessor.AccessorImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>AccessorService</servlet-name> + <url-pattern>/AccessorService</url-pattern> + </servlet-mapping> +</web-app> Property changes on: branches/JEE5_TCK/src/test/resources/jaxws/wrapped/accessor/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF