October 2006 - jbossws-commits - Jboss List Archives

JBossWS SVN: r1296 - in branches/jbossws-1.0/src: main/java/javax/xml/soap main/java/org/jboss/ws/common main/java/org/jboss/ws/jaxrpc main/java/org/jboss/ws/jaxrpc/encoding main/java/org/jboss/ws/jbossxb main/java/org/jboss/ws/soap main/java/org/jboss/ws/soap/attachment main/java/org/jboss/ws/utils main/java/org/jboss/ws/xop main/resources/schema test/ant test/java/org/jboss/test/ws/jaxrpc/jbws1303 test/java/org/jboss/test/ws/jaxrpc/marshall test/java/org/jboss/test/ws/jaxrpc/samples/mtom

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2006-10-24 10:06:00 -0400 (Tue, 24 Oct 2006) New Revision: 1296 Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java Removed: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java Modified: branches/jbossws-1.0/src/main/java/javax/xml/soap/AttachmentPart.java branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ServiceFactoryImpl.java branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/Base64Deserializer.java branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/Base64Serializer.java branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/JBossXBSupport.java branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/JBossXBUnmarshallerImpl.java branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/SchemaBindingBuilder.java branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/attachment/ByteArrayContentHandler.java branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/MimeUtils.java branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPMarshallerImpl.java branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPScanner.java branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPUnmarshallerImpl.java branches/jbossws-1.0/src/main/resources/schema/j2ee_1_4.xsd branches/jbossws-1.0/src/main/resources/schema/javaee_5.xsd branches/jbossws-1.0/src/test/ant/build-interop-jars.xml branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java branches/jbossws-1.0/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/xop/schema.xsd Log: update MTOM to XB CR7. Added support for ContentAdapter Modified: branches/jbossws-1.0/src/main/java/javax/xml/soap/AttachmentPart.java =================================================================== --- branches/jbossws-1.0/src/main/java/javax/xml/soap/AttachmentPart.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/javax/xml/soap/AttachmentPart.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -195,7 +195,7 @@ /** * Sets the given DataHandler object as the data handler for this AttachmentPart object. * Typically, on an incoming message, the data handler is automatically set. - * When a message is being created and populated with content, the setDataHandler method can be used to get data + * When a message is being created and populated with content, the setXopContent method can be used to get data * from various data sources into the message. * @param dataHandler the DataHandler object to be set * @throws IllegalArgumentException if there was a problem with the specified DataHandler object Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonSOAPBinding.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -885,7 +885,7 @@ // When a potential XOP parameter is detected and // the incomming request is actuall XOP encoded we flag // the SOAP message a XOP packaged. - if (paramMetaData.isXOP() && XOPContext.isMultipartXOP()) + if (paramMetaData.isXOP() && XOPContext.isXOPEncodedRequest()) { SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); soapMessage.setXOPMessage(true); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ServiceFactoryImpl.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ServiceFactoryImpl.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/ServiceFactoryImpl.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -38,7 +38,8 @@ * Service class acts as a factory for: * <ul> * <li>Dynamic proxy for the target service endpoint. - * <li>Instance of the type javax.xml.rpc.Call for the dynamic invocation of a remote operation on the target service endpoint. + * <li>Instance of the type javax.xml.rpc.Call for the dynamic invocation of a + * remote operation on the target service endpoint. * <li>Instance of a generated stub class * </ul> * Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/Base64Deserializer.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/Base64Deserializer.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/Base64Deserializer.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -35,6 +35,7 @@ import org.jboss.ws.WSException; import org.jboss.xb.binding.SimpleTypeBindings; import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller; +import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; import org.w3c.dom.Element; import java.io.IOException; @@ -58,7 +59,7 @@ String valueStr = unwrapValueStr(xmlFragment); - if(XOPContext.isXOPPackage()) + if(XOPContext.isXOPMessage()) { try { Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/Base64Serializer.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/Base64Serializer.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxrpc/encoding/Base64Serializer.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -56,7 +56,7 @@ String xmlFragment = null; NamespaceRegistry nsRegistry = serContext.getNamespaceRegistry(); - if(XOPContext.isXOPPackage()) + if(XOPContext.isXOPMessage()) { XOPMarshaller xopMarshaller = new XOPMarshallerImpl(); XOPObject xopObject = new XOPObject(value); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/JBossXBSupport.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/JBossXBSupport.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/JBossXBSupport.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -45,7 +45,7 @@ QName xmlName = (QName)properties.get(JBossXBConstants.JBXB_ROOT_QNAME); QName xmlType = (QName)properties.get(JBossXBConstants.JBXB_TYPE_QNAME); - // Get the eagerly initialized SchameBinding from the ServiceMetaData + // Get the eagerly initialized SchemaBinding from the ServiceMetaData CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext != null) { Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/JBossXBUnmarshallerImpl.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/JBossXBUnmarshallerImpl.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/JBossXBUnmarshallerImpl.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -23,15 +23,15 @@ // $Id$ -import java.io.InputStream; -import java.util.HashMap; - import org.jboss.ws.WSException; import org.jboss.ws.xop.XOPUnmarshallerImpl; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.UnmarshallerFactory; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; +import java.io.InputStream; +import java.util.HashMap; + /** * An implementation of a JAXB Unmarshaller. * @@ -53,7 +53,10 @@ org.jboss.xb.binding.Unmarshaller unm = UnmarshallerFactory.newInstance().newUnmarshaller(); SchemaBinding schemaBinding = JBossXBSupport.getOrCreateSchemaBinding(properties); - schemaBinding.setXopUnmarshaller(new XOPUnmarshallerImpl()); + + XOPUnmarshallerImpl xopUnmarshaller = new XOPUnmarshallerImpl(); + schemaBinding.setXopUnmarshaller(xopUnmarshaller); + try { return unm.unmarshal(is, schemaBinding); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/SchemaBindingBuilder.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/SchemaBindingBuilder.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jbossxb/SchemaBindingBuilder.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -30,6 +30,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.metadata.jaxrpcmapping.*; import org.jboss.ws.utils.JBossWSEntityResolver; +import org.jboss.ws.xop.JBossXBContentAdapter; import org.jboss.xb.binding.metadata.ClassMetaData; import org.jboss.xb.binding.metadata.PackageMetaData; import org.jboss.xb.binding.metadata.PropertyMetaData; @@ -79,7 +80,10 @@ { bindSchemaToJava(schemaBinding, wsdlMapping); } - + + // setup MTOM handler + JBossXBContentAdapter.register(schemaBinding); + return schemaBinding; } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -280,35 +280,7 @@ if (isAssignable == false) { - Object convertedObj = null; - - // XOP value handling: - // xsd:base64Binaries are always turned into a DataHandler - // through the XOPValueAdapter. This is necessary to support - // inlined and optimized transmissions. - // - // TODO: This only works for simple types, what about complex types? - // Within a complex type any bean property would turnout as a DataHandler - if (obj instanceof DataHandler) - { - try - { - convertedObj = ((DataHandler)obj).getContent(); - } - catch (IOException e) - { - throw new WSException("Failed to convert unassignable endpoint parameter", e); - } - } - - if (null == convertedObj || !JavaUtils.isAssignableFrom(javaType, convertedObj.getClass())) // conversion failed - { - throw new WSException("Java type '" + javaType + "' is not assignable from: " + objType.getName()); - } - else - { - obj = convertedObj; - } + throw new WSException("Java type '" + javaType + "' is not assignable from: " + objType.getName()); } } @@ -1022,7 +994,7 @@ // element back to an xop:Include element and create the attachment part log.debug("MTOM enabled: Restore XOP data"); - XOPContext.restoreXOPDataDOM(this); + XOPContext.restoreXOPDataDOM(this); } } Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/attachment/ByteArrayContentHandler.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/attachment/ByteArrayContentHandler.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/attachment/ByteArrayContentHandler.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -22,10 +22,12 @@ package org.jboss.ws.soap.attachment; import org.jboss.ws.utils.MimeUtils; +import org.jboss.ws.utils.IOUtils; import javax.activation.ActivationDataFlavor; import javax.activation.DataContentHandler; import javax.activation.DataSource; +import javax.activation.DataHandler; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; import java.io.ByteArrayInputStream; @@ -57,12 +59,15 @@ } public void writeTo(Object object, String string, OutputStream outputStream) throws IOException { + if(object instanceof byte[]) { - // this actually depends on the SwapableMemoryDataSource - // todo: why is not always a ByteArrayInputStream ? outputStream.write((byte[])object); } + else if(object instanceof DataHandler) + { + IOUtils.copyStream(outputStream, ((DataHandler)object).getInputStream()); + } else { MimeUtils.ByteArrayConverter converter = MimeUtils.getConverterForJavaType(object.getClass()); Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/MimeUtils.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/MimeUtils.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/MimeUtils.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -210,6 +210,7 @@ return converter; } + public static class ImageConverter implements ByteArrayConverter { public Object readFrom(InputStream in) { Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -0,0 +1,212 @@ +/* +* 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.xop; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.Constants; +import org.jboss.ws.soap.attachment.ContentHandlerRegistry; +import org.jboss.ws.soap.attachment.SwapableMemoryDataSource; +import org.jboss.ws.utils.IOUtils; +import org.jboss.ws.utils.MimeUtils; +import org.jboss.xb.binding.sunday.marshalling.MarshallingContext; +import org.jboss.xb.binding.sunday.marshalling.TermBeforeMarshallingCallback; +import org.jboss.xb.binding.sunday.unmarshalling.*; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.xml.namespace.QName; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +/** + * Adopts raw binary contents to java types. + * This class works in conjunction with the <code>XOPUnmarshallerImpl</code> + * and <code>XOPMarshallerImpl</code>. + * + * @see XOPUnmarshallerImpl + * @see XOPMarshallerImpl + * + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Oct 19, 2006 + */ +public class JBossXBContentAdapter implements TermBeforeMarshallingCallback, TermBeforeSetParentCallback { + + private static final Logger log = Logger.getLogger(JBossXBContentAdapter.class); + private static final QName XMIME_BASE_64 = new QName(Constants.NS_XML_MIME, "base64Binary"); + private static final QName XOP_INCLUDE = new QName(Constants.NS_XOP, "Include"); + + static + { + // Load JAF content handlers + ContentHandlerRegistry.register(); + } + + /** + * When XOP is disabled we need to convert java types to byte[] + * before handing off to XB. + */ + public Object beforeMarshalling(Object object, MarshallingContext marshallingContext) { + + boolean mtomDisabled = !XOPContext.isMTOMEnabled(); + boolean convertableType = object!=null && !(object instanceof byte[]); + + if( mtomDisabled && convertableType ) + { + String contentType = MimeUtils.resolveMimeType(object); + log.debug("Adopt " + object.getClass() + " to byte[], contentType " + contentType); + + DataHandler dh = new DataHandler(object, contentType); + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + try + { + IOUtils.copyStream(bout, dh.getInputStream()); + object = bout.toByteArray(); + } + catch (IOException e) + { + throw new WSException("Failed to adopt XOP content type", e); + } + } + + return object; + } + + /** + * When XOP is disabled (inlined request) we receive a byte[] from XB + * that needs to be converted in to java type + */ + public Object beforeSetParent(Object object, UnmarshallingContext ctx) { + + if(null==object) + return object; + + // may be null when it's actually an encoded request ?! + Class targetClass = ctx.resolvePropertyType(); + + boolean isRegularMessage = !XOPContext.isXOPMessage(); + boolean isSimpleType = (object instanceof byte[]); + boolean doTypesMatch = (targetClass!=null && targetClass.equals(object.getClass())); + + // Handle inlined requests. + // In this case XB treats binaries as simple types that are unmarshalled to byte[] + // Still type conversion will be necessary. + if( isRegularMessage && isSimpleType && !doTypesMatch) + { + String contentType = MimeUtils.resolveMimeType(targetClass); + log.debug("Adopt byte[] to " + targetClass +", contentType "+ contentType); + + try + { + DataHandler dh = new DataHandler( + wrapAsDataSource(object, contentType) + ); + + if(targetClass.equals(DataHandler.class)) + object = dh; + else + object = dh.getContent(); + } + catch (IOException e) + { + throw new WSException("Failed to adopt XOP content type", e); + } + } + + // Handle XOP encoded requests. + // XB will use the XOPUnmarshaller callback and receive a DataHandler instance. + // In this case we are be able to instantiate the correct content object + // from the data handler, with the exception of content-type 'application/octet-stream'. + // These attachments will be returned as DataHandler instances. + else if(XOPContext.isXOPMessage() && (object instanceof DataHandler)) + { + try + { + DataHandler attachmentHandle = (DataHandler)object; + if(!attachmentHandle.getContentType().equals("application/octet-stream")) + { + DataHandler dh = new DataHandler(attachmentHandle.getDataSource()); + object = dh.getContent(); + } + } + catch (IOException e) + { + throw new WSException("Failed to adopt XOP content type", e); + } + } + + return object; + } + + private DataSource wrapAsDataSource(Object object, String contentType) throws IOException { + + DataSource ds; + + if(object instanceof byte[]) + { + ds = new SwapableMemoryDataSource(new ByteArrayInputStream((byte[])object), contentType); + } + else + { + throw new IllegalArgumentException("Failed to wrap as data source: "+object.getClass()); + } + + return ds; + } + + /** + * A factory method that registers the XB (un)marshalling adapters with schema binding. + * These adapters convert java types into byte[] and reverse, + * in order to match the jaxrpc-mapping declaration in case we receive or send an inlined request. + */ + public static void register(SchemaBinding schemaBinding) + { + JBossXBContentAdapter contentAdapter = new JBossXBContentAdapter(); + + // base64 simple types + TypeBinding base64Type = schemaBinding.getType(org.jboss.xb.binding.Constants.QNAME_BASE64BINARY); + base64Type.setBeforeMarshallingCallback( contentAdapter ); + base64Type.setBeforeSetParentCallback( contentAdapter ); + + // xmime complex types + TypeBinding xmimeBase64Type = schemaBinding.getType(XMIME_BASE_64); + if(xmimeBase64Type!=null) + { + xmimeBase64Type.setBeforeMarshallingCallback( contentAdapter ); + xmimeBase64Type.setBeforeSetParentCallback( contentAdapter ); + + // xop:Include + ModelGroupBinding modelGroup = (ModelGroupBinding)xmimeBase64Type.getParticle().getTerm(); + ParticleBinding particle = (ParticleBinding)modelGroup.getParticles().iterator().next(); + ElementBinding xopInclude = (ElementBinding)particle.getTerm(); + + if(! xopInclude.getQName().equals(XOP_INCLUDE)) + throw new WSException("Looks like the JBossXB XOP implementation has changed, please open a JIRA issue"); + + xopInclude.setBeforeMarshallingCallback(contentAdapter); + xopInclude.setBeforeSetParentCallback(contentAdapter); + } + } + +} Property changes on: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/JBossXBContentAdapter.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPContext.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -28,8 +28,9 @@ import org.jboss.ws.jaxrpc.StubExt; import org.jboss.ws.soap.MessageContextAssociation; import org.jboss.ws.soap.NameImpl; +import org.jboss.ws.soap.SOAPElementImpl; import org.jboss.ws.soap.SOAPMessageImpl; -import org.jboss.ws.soap.SOAPElementImpl; +import org.jboss.ws.soap.attachment.MimeConstants; import org.jboss.ws.utils.DOMUtils; import org.jboss.ws.utils.JavaUtils; import org.jboss.ws.utils.MimeUtils; @@ -40,9 +41,9 @@ import javax.activation.DataHandler; import javax.xml.namespace.QName; import javax.xml.soap.AttachmentPart; +import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPBody; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.Iterator; @@ -66,11 +67,12 @@ private static final Logger log = Logger.getLogger(XOPContext.class); private static final String NS_XOP_JBOSSWS = "http://org.jboss.ws/xop"; - + /** - * Check if the current soap message flagged as a XOP package? + * Check if the current soap message flagged as a XOP package. + * This may differ from the wire format when jaxrpc handlers are in place. */ - public static boolean isXOPPackage() { + public static boolean isXOPMessage() { boolean isXOP = false; CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if(msgContext!=null) { @@ -83,7 +85,7 @@ /** * Check if the wire format is actually a xop encoded multipart message */ - public static boolean isMultipartXOP() + public static boolean isXOPEncodedRequest() { boolean isMultippartXOP = false; CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); @@ -94,7 +96,7 @@ { for(String value : contentType) { - if(value.indexOf("application/xop+xml") != -1) + if(value.indexOf(MimeConstants.TYPE_APPLICATION_XOP_XML) != -1) { isMultippartXOP = true; break; @@ -180,7 +182,7 @@ { try { - if(!isXOPPackage() && isMTOMEnabled()) + if(!isXOPMessage() && isMTOMEnabled()) { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); SOAPBody body = msgContext.getSOAPMessage().getSOAPBody(); @@ -245,6 +247,8 @@ SOAPElement xopInclude = xopElement.addChildElement(Constants.NAME_XOP_INCLUDE); xopInclude.setAttribute("href", cid); log.debug("Restored xop:Include element on [xmlName="+xopElement.getLocalName()+"]"); + + XOPContext.setXOPMessage(true); } catch (SOAPException e) { @@ -303,8 +307,6 @@ // leave soap object model in a valid state setXOPMessage(false); - //log.warn("Further MTOM processing disabled. The XOP encoding will not be restored."); - //setMTOMEnabled(false); } /** Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPMarshallerImpl.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPMarshallerImpl.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPMarshallerImpl.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -23,14 +23,11 @@ import org.jboss.logging.Logger; import org.jboss.util.NotImplementedException; +import org.jboss.ws.common.CommonMessageContext; import org.jboss.ws.soap.MessageContextAssociation; - import org.jboss.ws.soap.SOAPMessageImpl; -import org.jboss.ws.soap.attachment.MimeConstants; import org.jboss.ws.soap.attachment.ContentHandlerRegistry; -import org.jboss.ws.common.CommonMessageContext; -import org.jboss.ws.utils.IOUtils; -import org.jboss.ws.WSException; +import org.jboss.ws.soap.attachment.MimeConstants; import org.jboss.xb.binding.sunday.xop.XOPMarshaller; import org.jboss.xb.binding.sunday.xop.XOPObject; @@ -39,7 +36,7 @@ import javax.xml.soap.AttachmentPart; /** - * The XOPMarshallerImpl allows callbacks from the binding layer towards the + * The XOPUnmarshallerImpl allows callbacks from the binding layer towards the * soap processing components in order to optimize binary processing. * * @see org.jboss.ws.xop.XOPUnmarshallerImpl @@ -60,7 +57,7 @@ public boolean isXOPPackage() { - return XOPContext.isXOPPackage(); + return XOPContext.isXOPMessage(); } public String addMtomAttachment(XOPObject obj, String elementNamespace, String elementName) Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPScanner.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPScanner.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPScanner.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -23,8 +23,8 @@ import org.apache.xerces.xs.*; +import java.util.ArrayList; import java.util.List; -import java.util.ArrayList; /** * Scans complex type definitions for nested XOP type declarations. Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPUnmarshallerImpl.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPUnmarshallerImpl.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/xop/XOPUnmarshallerImpl.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -22,17 +22,18 @@ package org.jboss.ws.xop; import org.jboss.logging.Logger; +import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.soap.attachment.ContentHandlerRegistry; import org.jboss.xb.binding.sunday.xop.XOPObject; import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller; import javax.activation.DataHandler; +import javax.xml.namespace.QName; import javax.xml.soap.AttachmentPart; import javax.xml.soap.SOAPException; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; /** * The XOPUnmarshallerImpl allows callbacks from the binding layer towards the @@ -47,6 +48,7 @@ public class XOPUnmarshallerImpl implements XOPUnmarshaller { private static final Logger log = Logger.getLogger(XOPUnmarshallerImpl.class); + private static final QName XOP_INCLUDE = new QName(Constants.NS_XOP, "Include"); static { @@ -56,41 +58,27 @@ public boolean isXOPPackage() { - return XOPContext.isXOPPackage(); + return XOPContext.isXOPMessage(); } public XOPObject getAttachmentAsDataHandler(String cid) - { + { try { AttachmentPart part = XOPContext.getAttachmentByCID(cid); - Object content = part.getDataHandler().getContent(); + DataHandler dataHandler = part.getDataHandler(); + String contentType = dataHandler.getContentType(); - // TODO: XB should actually be able to process any content - if(content instanceof InputStream) - { - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - part.getDataHandler().writeTo(bout); - content = bout.toByteArray(); - } - else - { - throw new WSException("Unsupported content type " + content); - } + // Wrapping the DataHandler shields XB from the JAF dependency + XOPObject xopObject = new XOPObject(dataHandler); + xopObject.setContentType(contentType); - XOPObject xopObject = new XOPObject(content); - xopObject.setContentType(part.getDataHandler().getContentType()); - return xopObject; } catch(SOAPException e) { throw new WSException("Failed to access attachment part", e); } - catch(IOException e) - { - throw new WSException("Failed to extract attachment data", e); - } } public byte[] getAttachmentAsByteArray(String cid) Modified: branches/jbossws-1.0/src/main/resources/schema/j2ee_1_4.xsd =================================================================== --- branches/jbossws-1.0/src/main/resources/schema/j2ee_1_4.xsd 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/resources/schema/j2ee_1_4.xsd 2006-10-24 14:06:00 UTC (rev 1296) @@ -59,7 +59,7 @@ application client; web application; enterprise bean; - resource adapter; + resource adapterJBoss; Deployment File may indicate one of the following: ear file; Modified: branches/jbossws-1.0/src/main/resources/schema/javaee_5.xsd =================================================================== --- branches/jbossws-1.0/src/main/resources/schema/javaee_5.xsd 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/main/resources/schema/javaee_5.xsd 2006-10-24 14:06:00 UTC (rev 1296) @@ -61,7 +61,7 @@ application client; web application; enterprise bean; - resource adapter; + resource adapterJBoss; Deployment File may indicate one of the following: ear file; Modified: branches/jbossws-1.0/src/test/ant/build-interop-jars.xml =================================================================== --- branches/jbossws-1.0/src/test/ant/build-interop-jars.xml 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/ant/build-interop-jars.xml 2006-10-24 14:06:00 UTC (rev 1296) @@ -374,7 +374,6 @@ <include name="webservices.xml"/> <include name="wsdl/**.*"/> <include name="jboss-web.xml"/> - <include name="jboss-wsse-server.xml"/> </webinf> <fileset dir="${test.resources.dir}/interop/microsoft/mtom/utf8"> <include name="*.*"/> Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/JBWS1303TestCase.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -1,68 +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.jaxrpc.jbws1303; - -// $Id$ - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * Unmarshall issue with xsi:type specified bean property - * - * http://jira.jboss.org/jira/browse/JBWS-1303 - * - * @author Thomas.Diesler(a)jboss.org - * @since 16-Oct-2006 - */ -public class JBWS1303TestCase extends JBossWSTest -{ - private static LastMod_PortType port; - - public static Test suite() - { - return JBossWSTestSetup.newTestSetup(JBWS1303TestCase.class, "jaxrpc-jbws1303.war, jaxrpc-jbws1303-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (LastMod_PortType)service.getPort(LastMod_PortType.class); - } - } - - public void testEndpoint() throws Exception - { - Lastmod lastmod = new Lastmod("yesterday"); - LastmodResponse lastmodRes = port.lastmod(lastmod); - assertEquals("yesterday", lastmodRes.getTimeChanged()); - } -} Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -1,75 +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.jaxrpc.jbws1303; - -import javax.xml.namespace.QName; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPMessage; - -import org.jboss.ws.Constants; - -public class ServerHandler extends GenericHandler -{ - public QName[] getHeaders() - { - return new QName[] {}; - } - - /** - * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' - * xmlns:xsi='http://www.w3c.org/2001/XMLSchema-instance' - & xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - * <env:Header/> - * <env:Body> - * <lastmodResponse xmlns='http://netid.msu.edu:8080/lastmod.pl'> - * <TimeChanged xsi:type='xsd:string'>yesterday</TimeChanged> - * </lastmodResponse> - * </env:Body> - * </env:Envelope> - */ - public boolean handleResponse(MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(); - SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); - soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSD, Constants.NS_SCHEMA_XSD); - soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSI, Constants.NS_SCHEMA_XSI); - SOAPElement bodyElement = soapMessage.getSOAPBody().addChildElement("lastmodResponse"); - bodyElement.setAttribute("xmlns", "http://netid.msu.edu:8080/lastmod.pl"); - SOAPElement soapElement = bodyElement.addChildElement("TimeChanged"); - soapElement.setAttribute("xsi:type", "xsd:string"); - soapElement.setValue("yesterday"); - ((SOAPMessageContext)msgContext).setMessage(soapMessage); - } - catch (Exception ex) - { - throw new RuntimeException(ex); - } - return true; - } -} Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallDocLitTestCase.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -28,11 +28,13 @@ import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.rpc.Service; +import javax.xml.rpc.Stub; import junit.framework.Test; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.test.ws.jaxrpc.marshall.types.JavaBean; +import org.jboss.ws.jaxrpc.StubExt; /** * Test standard JAX-RPC types. @@ -60,7 +62,7 @@ InitialContext iniCtx = getInitialContext(); Service service = (Service)iniCtx.lookup("java:comp/env/service/StandardTypes"); port = (StandardTypes)service.getPort(StandardTypes.class); - } + } } public BigDecimal bigDecimalTest(BigDecimal param) throws Exception Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/XOPRpcTestCase.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -22,6 +22,7 @@ package org.jboss.test.ws.jaxrpc.samples.mtom; import java.io.File; +import java.io.FileInputStream; import java.net.URL; import javax.activation.DataHandler; @@ -30,6 +31,8 @@ import javax.xml.namespace.QName; import javax.xml.rpc.Service; import javax.xml.rpc.Stub; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; import junit.framework.Test; @@ -83,11 +86,8 @@ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8081/jaxrpc-samples-mtom"); } - /** - * Send a byte[] XOP encoded. - * - */ - public void testSimpleBinary() throws Exception + + /*public void testSimpleBinary() throws Exception { DataHandler dh = new DataHandler( new FileDataSource("resources/jaxrpc/samples/mtom/disguised_jpeg.xcf") @@ -98,9 +98,6 @@ assertTrue("Content length is different", bytesIn.length == bytesOut.length); } - /** - * Send a inlined message and expect a xop encoded response. - */ public void testMTOMDisabledClientside() throws Exception { URL url = new File("resources/jaxrpc/samples/mtom/attach.jpeg").toURL(); @@ -116,34 +113,22 @@ assertEquals(bytesIn, bytesOut); } - /** - * Send a multipart message with a 'image/jpeg' attachment part. - * Uses a DataHandler as endpoint parameter and return type. - */ - /*public void testAbstractParameterTypes() throws Exception + public void testAbstractParameterTypes() throws Exception { URL url = new File("resources/jaxrpc/samples/mtom/attach.jpeg").toURL(); DataHandler value = port.sendMimeImageJPEG("Some text message", new DataHandler(url)); assertNotNull(value); assertTrue("Wrong return content-type returned", value.getContentType().equals("image/jpeg")); - } */ + }*/ - /** - * Send a multipart message with a 'text/plain' attachment part. - * Uses java.lang.String as endpoint parameter and return type. - */ - /*public void testConcreteParameterTypes() throws Exception + public void testConcreteParameterTypes() throws Exception { String xoppart = "This is a plain text attachment."; String value = port.sendMimeTextPlain("Some text message", xoppart); assertNotNull(value); assertEquals("Value mismatch", value, xoppart); - } */ + } - /** - * Send a multipart message with a 'text/xml' attachment part. - * Uses a DataHandler as endpoint parameter, but javax.xml.transform.Source as return value. - */ /*public void testParameterConversion() throws Exception { FileInputStream stream = new FileInputStream("resources/jaxrpc/samples/mtom/attach.xml"); @@ -152,13 +137,8 @@ Source value = port.sendMimeTextXML("Some text message", new DataHandler(source, "text/xml")); assertNotNull(value); assertTrue("Wrong return value type", value instanceof Source); - } */ + } - /** - * Send a multipart message with a application/xml attachment part. - * Uses a javax.xml.transform.Source as endpoint parameter, but javax.activation.DataHandler as return value. - */ - /* public void testParameterConversionReverse() throws Exception { FileInputStream stream = new FileInputStream("resources/jaxrpc/samples/mtom/attach.xml"); @@ -167,5 +147,5 @@ DataHandler value = port.sendMimeApplicationXML("Some text message", source); assertNotNull(value); assertTrue("Wrong return value content-type", value.getContentType().equals("application/xml")); - } */ + }*/ } Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -21,10 +21,12 @@ */ package org.jboss.test.ws.jaxrpc.xop; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.FileInputStream; +import javax.xml.transform.stream.StreamSource; +import javax.activation.DataHandler; +import java.io.*; +import java.awt.*; +import java.net.URL; +import java.net.MalformedURLException; /** * @author Heiko Braun <heiko.braun(a)jboss.com> @@ -49,4 +51,40 @@ is.close(); return bytes; } + + public static Image createTestImage() + { + Image image = null; + try + { + URL url = new File("resources/jaxrpc/xop/shared/attach.jpeg").toURL(); + + image = null; + try + { + image = Toolkit.getDefaultToolkit().createImage(url); + } + catch (Throwable th) + { + //log.warn("Cannot create Image: " + th); + } + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + + return image; + } + + public static StreamSource createTestSource() + { + return new StreamSource( new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); + } + + public static DataHandler createDataHandler() + { + DataHandler dataHandler = new DataHandler("<more><nestedXML/></more>", "application/octet-stream"); + return dataHandler; + } } Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTypeDefTestCase.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -65,6 +65,7 @@ WSSchemaUtils wsUtil = WSSchemaUtils.getInstance(new NamespaceRegistry(), "http://jboss.org/test/ws/xop/doclit"); JBossXSModel schemaModel = wsUtil.getJBossXSModel(xsModel); + // test custom binary declaration XSTypeDefinition xsType = schemaModel.getTypeDefinition(">PingMsg", "http://jboss.org/test/ws/xop/doclit"); assertNotNull("Root type def not found", xsType); @@ -79,6 +80,7 @@ scanner.reset(); + // test the xmime binary declaration xsType = schemaModel.getTypeDefinition(">PingMsgResponse", "http://jboss.org/test/ws/xop/doclit"); assertNotNull("Root type def not found", xsType); if (xsType instanceof XSComplexTypeDefinition) @@ -92,12 +94,6 @@ public void testMSFTElementScan() throws Exception { - if (true) - { - System.out.println("FIXME: JBWS-1293"); - return; - } - SchemaUtils utils = SchemaUtils.getInstance(); File f = new File("resources/jaxrpc/xop/schema.xsd"); assertTrue("Unable to load schema file " + f.getAbsolutePath(), f.exists()); Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -1,19 +1,12 @@ package org.jboss.test.ws.jaxrpc.xop.doclit; -import org.jboss.ws.soap.MessageContextAssociation; -import org.jboss.ws.common.CommonMessageContext; -import org.jboss.ws.jaxrpc.StubExt; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.MTOMServiceBase; +import org.jboss.test.ws.jaxrpc.xop.shared.*; import java.rmi.RemoteException; -import java.util.StringTokenizer; /** * MTOM test service impl. - * The 'message' param value determines wether or not the response - * should be XOP encoded or not. + * The 'message' param value determines wether or not the response should be XOP encoded. * * @author Heiko Braun, <heiko(a)openj.net> * @since 11-Apr-2006 @@ -21,9 +14,22 @@ public class TestServiceImpl extends MTOMServiceBase implements TestService_PortType { public PingMsgResponse ping(PingMsg pingMsg) throws RemoteException { - toggleXOP(pingMsg.getMessage()); return new PingMsgResponse(pingMsg.getXopContent()); - } + + public PingImageResponse pingImage(PingImage pingImage) throws RemoteException { + toggleXOP(pingImage.getMessage()); + return new PingImageResponse(pingImage.getXopContent()); + } + + public PingSourceResponse pingSource(PingSource pingSource) throws RemoteException { + toggleXOP(pingSource.getMessage()); + return new PingSourceResponse(pingSource.getXopContent()); + } + + public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws RemoteException { + toggleXOP(pingDataHandler.getMessage()); + return new PingDataHandlerResponse(pingDataHandler.getXopContent()); + } } Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -5,7 +5,13 @@ //Auto Generated by jbossws - Please do not edit!!! package org.jboss.test.ws.jaxrpc.xop.doclit; + +import org.jboss.test.ws.jaxrpc.xop.shared.*; + public interface TestService_PortType extends java.rmi.Remote { - public org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException; + public PingMsgResponse ping(PingMsg pingMsg) throws java.rmi.RemoteException; + public PingImageResponse pingImage(PingImage pingImage) throws java.rmi.RemoteException; + public PingSourceResponse pingSource(PingSource pingSource) throws java.rmi.RemoteException; + public PingDataHandlerResponse pingDataHandler(PingDataHandler pingDataHandler) throws java.rmi.RemoteException; } Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -22,15 +22,16 @@ package org.jboss.test.ws.jaxrpc.xop.doclit; import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse; -import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg; import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; +import org.jboss.test.ws.jaxrpc.xop.shared.*; +import org.jboss.ws.jaxrpc.StubExt; import org.jboss.ws.utils.IOUtils; -import org.jboss.ws.jaxrpc.StubExt; import javax.activation.DataHandler; import javax.xml.rpc.Stub; +import javax.xml.transform.Source; import java.io.File; +import java.awt.*; /** * @author Heiko Braun <heiko.braun(a)jboss.com> @@ -41,6 +42,7 @@ protected TestService_PortType port; + /* public void testRequestResponseOptimized() throws Exception { DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); @@ -52,6 +54,7 @@ assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); } + public void testResponseOptimized() throws Exception { byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg")); @@ -78,5 +81,100 @@ byte[] bytesOut = value.getXopContent(); assertNotNull("Return xopContent was null", bytesOut); assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); + } */ + + // --------------------------------------------------------------------------------- + // Test the before and after marshalling handlers + + public void testImageResponseOptimized() throws Exception { + + Image image = XOPTestSupport.createTestImage(); + + // disable MTOM + ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingImage pingImage = new PingImage("0|1", image); + PingImageResponse response = port.pingImage(pingImage); + assertNotNull("Return xopContent was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); } + + public void testImageRequestOptimized() throws Exception { + + Image image = XOPTestSupport.createTestImage(); + + // enable MTOM + ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingImage pingImage = new PingImage("1|0", image); + PingImageResponse response = port.pingImage(pingImage); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testSourceResponseOptimized() throws Exception { + + Source source = XOPTestSupport.createTestSource(); + + // disable MTOM + ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("0|1"); + pingSource.setXopContent(source); + + PingSourceResponse response = port.pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testSourceRequestOptimized() throws Exception { + + Source source = XOPTestSupport.createTestSource(); + + // enable MTOM + ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + PingSource pingSource = new PingSource(); + pingSource.setMessage("1|0"); + pingSource.setXopContent(source); + + PingSourceResponse response = port.pingSource(pingSource); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } + + public void testDHResponseOptimized() throws Exception { + + DataHandler dh = XOPTestSupport.createDataHandler(); + + // disable MTOM + ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("0|1"); + + PingDataHandlerResponse response = port.pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + + } + + public void testDHRequestOptimized() throws Exception { + + DataHandler dh = XOPTestSupport.createDataHandler(); + + // enable MTOM + ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); + + + PingDataHandler reqest = new PingDataHandler(dh); + reqest.setMessage("1|0"); + + PingDataHandlerResponse response = port.pingDataHandler(reqest); + assertNotNull("Response was null", response); + assertNotNull("Return xopContent was null", response.getXopContent()); + } } Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -42,7 +42,7 @@ protected TestService_PortType port; - public void testRequestResponseOptimized() throws Exception { + /*public void testRequestResponseOptimized() throws Exception { DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); byte[] bytesIn = IOUtils.convertToBytes(dh); @@ -62,7 +62,7 @@ byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg")); requestComplex(new PingMsg("1|0", bytesIn)); - } + }*/ private void requestComplex(PingMsg payload) throws Exception { Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/MTOMServiceBase.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -24,6 +24,7 @@ import org.jboss.ws.common.CommonMessageContext; import org.jboss.ws.soap.MessageContextAssociation; import org.jboss.ws.jaxrpc.StubExt; +import org.jboss.ws.xop.XOPContext; import java.util.StringTokenizer; @@ -39,6 +40,11 @@ String responseOptimized = tok.nextToken(); System.out.println(requestOptimized+"|"+responseOptimized); + if(requestOptimized.equals("1") && !XOPContext.isXOPEncodedRequest()) + { + throw new RuntimeException("Illegal state: No XOP encoded request found"); + } + if(responseOptimized.equals("0")) { CommonMessageContext ctx = MessageContextAssociation.peekMessageContext(); Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -0,0 +1,57 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import javax.activation.DataHandler; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Oct 23, 2006 + */ +public class PingDataHandler { + String message; + DataHandler xopContent; + + public PingDataHandler() { + } + + public PingDataHandler(DataHandler dataHandler) { + this.xopContent = dataHandler; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public DataHandler getXopContent() { + return xopContent; + } + + public void setXopContent(DataHandler xopContent) { + this.xopContent = xopContent; + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -0,0 +1,48 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import javax.activation.DataHandler; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Oct 23, 2006 + */ +public class PingDataHandlerResponse { + DataHandler xopContent; + + public PingDataHandlerResponse() { + } + + public PingDataHandlerResponse(DataHandler dataHandler) { + this.xopContent = dataHandler; + } + + public DataHandler getXopContent() { + return xopContent; + } + + public void setXopContent(DataHandler xopContent) { + this.xopContent = xopContent; + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingDataHandlerResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -0,0 +1,59 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import java.awt.*; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Oct 17, 2006 + */ +public class PingImage { + + String message; + Image xopContent; + + public PingImage() { + } + + public PingImage(String message, Image xopContent) { + this.message = message; + this.xopContent = xopContent; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Image getXopContent() { + return xopContent; + } + + public void setXopContent(Image xopContent) { + this.xopContent = xopContent; + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImage.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -0,0 +1,49 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import java.awt.*; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Oct 17, 2006 + */ +public class PingImageResponse { + + Image xopContent; + + public PingImageResponse() { + } + + public PingImageResponse(Image xopContent) { + this.xopContent = xopContent; + } + + public Image getXopContent() { + return xopContent; + } + + public void setXopContent(Image xopContent) { + this.xopContent = xopContent; + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingImageResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -0,0 +1,50 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import javax.xml.transform.Source; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Oct 19, 2006 + */ +public class PingSource { + String message; + Source xopContent; + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Source getXopContent() { + return xopContent; + } + + public void setXopContent(Source xopContent) { + this.xopContent = xopContent; + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSource.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java 2006-10-24 14:06:00 UTC (rev 1296) @@ -0,0 +1,49 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2005, JBoss Inc., and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ +package org.jboss.test.ws.jaxrpc.xop.shared; + +import javax.xml.transform.Source; + +/** + * @author Heiko Braun <heiko.braun(a)jboss.com> + * @version $Id$ + * @since Oct 19, 2006 + */ +public class PingSourceResponse { + + Source xopContent; + + public PingSourceResponse() { + } + + public PingSourceResponse(Source source) { + this.xopContent = source; + } + + public Source getXopContent() { + return xopContent; + } + + public void setXopContent(Source xopContent) { + this.xopContent = xopContent; + } +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/shared/PingSourceResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/encoded/marshalltest/META-INF/jboss-client.xml 2006-10-24 14:06:00 UTC (rev 1296) @@ -9,6 +9,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> + <config-name>Standard MTOM disabled client</config-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-encoded-marshalltest/MarshallTest?wsdl</wsdl-override> </service-ref> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml 2006-10-24 14:06:00 UTC (rev 1296) @@ -2,7 +2,12 @@ <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"> - + + <context-param> + <param-name>jbossws-config-name</param-name> + <param-value>Standard MTOM disabled endpoint</param-value> + </context-param> + <servlet> <servlet-name>MarshallTest</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.encoded.marshalltest.MarshallTestImpl</servlet-class> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl 2006-10-24 14:06:00 UTC (rev 1296) @@ -1,33 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name='ConfidentialService' targetNamespace='http://org.jboss.test.ws/jbws1190' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1190' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='ConfidentialEndpoint_helloWorld'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='ConfidentialEndpoint_helloWorldResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='ConfidentialEndpoint'> - <operation name='helloWorld' parameterOrder='String_1'> - <input message='tns:ConfidentialEndpoint_helloWorld'/> - <output message='tns:ConfidentialEndpoint_helloWorldResponse'/> - </operation> - </portType> - <binding name='ConfidentialEndpointBinding' type='tns:ConfidentialEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='helloWorld'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> - </output> - </operation> - </binding> - <service name='ConfidentialService'> - <port binding='tns:ConfidentialEndpointBinding' name='ConfidentialEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> + <types/> + <message name='ConfidentialEndpoint_helloWorld'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='ConfidentialEndpoint_helloWorldResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='ConfidentialEndpoint'> + <operation name='helloWorld' parameterOrder='String_1'> + <input message='tns:ConfidentialEndpoint_helloWorld'/> + <output message='tns:ConfidentialEndpoint_helloWorldResponse'/> + </operation> + </portType> + <binding name='ConfidentialEndpointBinding' type='tns:ConfidentialEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='helloWorld'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> + </output> + </operation> + </binding> + <service name='ConfidentialService'> + <port binding='tns:ConfidentialEndpointBinding' name='ConfidentialEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> </definitions> \ No newline at end of file Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl 2006-10-24 14:06:00 UTC (rev 1296) @@ -1,34 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> <definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1190' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1190' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_testAddress'> - <part name='String_1' type='xsd:string'/> - <part name='String_2' type='xsd:string'/> - <part name='String_3' type='xsd:string'/> - <part name='String_4' type='xsd:string'/> - </message> - <message name='TestEndpoint_testAddressResponse'/> - <portType name='TestEndpoint'> - <operation name='testAddress' parameterOrder='String_1 String_2 String_3 String_4'> - <input message='tns:TestEndpoint_testAddress'/> - <output message='tns:TestEndpoint_testAddressResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='testAddress'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> + <types/> + <message name='TestEndpoint_testAddress'> + <part name='String_1' type='xsd:string'/> + <part name='String_2' type='xsd:string'/> + <part name='String_3' type='xsd:string'/> + <part name='String_4' type='xsd:string'/> + </message> + <message name='TestEndpoint_testAddressResponse'/> + <portType name='TestEndpoint'> + <operation name='testAddress' parameterOrder='String_1 String_2 String_3 String_4'> + <input message='tns:TestEndpoint_testAddress'/> + <output message='tns:TestEndpoint_testAddressResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='testAddress'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> </definitions> \ No newline at end of file Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/META-INF/jboss-client.xml 2006-10-24 14:06:00 UTC (rev 1296) @@ -9,6 +9,7 @@ <service-ref> <service-ref-name>service/StandardTypes</service-ref-name> + <config-name>Standard MTOM disabled client</config-name> <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-marshall-doclit?wsdl</wsdl-override> </service-ref> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml 2006-10-24 14:06:00 UTC (rev 1296) @@ -5,6 +5,11 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> + <context-param> + <param-name>jbossws-config-name</param-name> + <param-value>Standard MTOM disabled endpoint</param-value> + </context-param> + <servlet> <servlet-name>StandardTypes</servlet-name> <servlet-class>org.jboss.test.ws.jaxrpc.marshall.StandardTypesBean</servlet-class> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2006-10-24 14:06:00 UTC (rev 1296) @@ -3,7 +3,7 @@ <package-type>org.jboss.test.ws.jaxrpc.xop.doclit</package-type> <namespaceURI>http://jboss.org/test/ws/xop/doclit</namespaceURI> </package-mapping> - + <java-xml-type-mapping> <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type> <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingMsg</anonymous-type-qname> @@ -28,6 +28,78 @@ </variable-mapping> </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingImage</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingImageResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingSource</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingSourceResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingDataHandler</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>message</java-variable-name> + <xml-element-name>message</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingDataHandlerResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>xopContent</java-variable-name> + <xml-element-name>xopContent</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> <service-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_Service</service-interface> <wsdl-service-name xmlns:serviceNS='http://jboss.org/test/ws/xop/doclit'>serviceNS:TestService</wsdl-service-name> @@ -41,6 +113,7 @@ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface> <wsdl-port-type xmlns:portTypeNS='http://jboss.org/test/ws/xop/doclit'>portTypeNS:TestService</wsdl-port-type> <wsdl-binding xmlns:bindingNS='http://jboss.org/test/ws/xop/doclit'>bindingNS:TestServiceBinding</wsdl-binding> + <service-endpoint-method-mapping> <java-method-name>ping</java-method-name> <wsdl-operation>ping</wsdl-operation> @@ -59,5 +132,63 @@ <wsdl-message-part-name>parameters</wsdl-message-part-name> </wsdl-return-value-mapping> </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingImage</java-method-name> + <wsdl-operation>pingImage</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingImage</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingImageIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingImageResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingImageOut</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingSource</java-method-name> + <wsdl-operation>pingSource</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingSource</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingSourceIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingSourceResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingSourceOut</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + + <service-endpoint-method-mapping> + <java-method-name>pingDataHandler</java-method-name> + <wsdl-operation>pingDataHandler</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingDataHandlerIn</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingDataHandlerOut</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> </java-wsdl-mapping> \ No newline at end of file Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl 2006-10-24 14:06:00 UTC (rev 1296) @@ -16,6 +16,10 @@ <import namespace="http://www.w3.org/2005/05/xmlmime"/> +  <s:element name="PingMsg"> <s:complexType> <s:sequence> @@ -24,14 +28,94 @@ </s:sequence> </s:complexType> </s:element> + +  <s:element name="PingMsgResponse"> <s:complexType> <s:sequence> - <s:element name="xopContent" minOccurs="0" maxOccurs="1" xmime:expectedContentTypes="text/plain" type="xmime:base64Binary"/> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="application/octet-stream" + type="xmime:base64Binary"/> </s:sequence> </s:complexType> </s:element> +  + <s:element name="PingImage"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingImageResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + +  + <s:element name="PingSource"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg,text/xml" + xmime:contentType="text/xml" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingSourceResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="text/xml" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + +  + <s:element name="PingDataHandler"> + <s:complexType> + <s:sequence> + <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" + xmime:expectedContentTypes="image/jpeg,text/xml" + type="xmime:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + + <s:element name="PingDataHandlerResponse"> + <s:complexType> + <s:sequence> + <s:element name="xopContent" minOccurs="0" maxOccurs="1" type="s:base64Binary"/> + </s:sequence> + </s:complexType> + </s:element> + </s:schema> </types> @@ -42,11 +126,44 @@ <part name="parameters" element="s0:PingMsgResponse" /> </message> + <message name="PingImageIn"> + <part name="parameters" element="s0:PingImage" /> + </message> + <message name="PingImageOut"> + <part name="parameters" element="s0:PingImageResponse" /> + </message> + + <message name="PingSourceIn"> + <part name="parameters" element="s0:PingSource" /> + </message> + <message name="PingSourceOut"> + <part name="parameters" element="s0:PingSourceResponse" /> + </message> + + <message name="PingDataHandlerIn"> + <part name="parameters" element="s0:PingDataHandler" /> + </message> + <message name="PingDataHandlerOut"> + <part name="parameters" element="s0:PingDataHandlerResponse" /> + </message> + <portType name="TestService"> <operation name="ping"> <input message="s0:PingIn" /> <output message="s0:PingOut" /> </operation> + <operation name="pingImage"> + <input message="s0:PingImageIn" /> + <output message="s0:PingImageOut" /> + </operation> + <operation name="pingSource"> + <input message="s0:PingSourceIn" /> + <output message="s0:PingSourceOut" /> + </operation> + <operation name="pingDataHandler"> + <input message="s0:PingDataHandlerIn" /> + <output message="s0:PingDataHandlerOut" /> + </operation> </portType> <binding name="TestServiceBinding" type="s0:TestService"> @@ -60,6 +177,33 @@ <soap:body use="literal" /> </output> </operation> + <operation name="pingImage"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/doclit/PingImage" style="document" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + <operation name="pingSource"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/doclit/PingSource" style="document" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + <operation name="pingDataHandler"> + <soap:operation soapAction="http://jboss.org/test/ws/xop/doclit/PingDataHandler" style="document" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> </binding> <service name="TestService"> Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/xop/schema.xsd =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/xop/schema.xsd 2006-10-24 13:50:36 UTC (rev 1295) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/xop/schema.xsd 2006-10-24 14:06:00 UTC (rev 1296) @@ -9,7 +9,7 @@ <s:complexType> <s:sequence> <s:element name="message" minOccurs="0" maxOccurs="1" type="s:string" /> - <s:element name="imagejpeg" xmime:contentType="image/jpeg" type="tns:XOPBinary"/> + <s:element name="xopContent" xmime:contentType="image/jpeg" type="tns:XOPBinary"/> </s:sequence> </s:complexType> </s:element> @@ -17,7 +17,7 @@ <s:element name="PingMsgResponse"> <s:complexType> <s:sequence> - <s:element name="imagejpeg" xmime:contentType="image/jpeg" type="xmime:base64Binary"/> + <s:element name="xopContent" xmime:contentType="image/jpeg" type="xmime:base64Binary"/> </s:sequence> </s:complexType> </s:element> @@ -33,7 +33,7 @@ <s:element name="MSFTBinary"> <s:complexType> <s:sequence> - <s:element minOccurs="0" name="array" nillable="true" type="s:base64Binary"/> + <s:element minOccurs="0" name="xopContent" nillable="true" type="s:base64Binary"/> </s:sequence> </s:complexType> </s:element>

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r1295 - in branches/tdiesler/trunk/src: main/java/org/jboss/ws/integration/jboss main/java/org/jboss/ws/jaxws test/java/org/jboss/test/ws/jaxws/webserviceref

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-10-24 09:50:36 -0400 (Tue, 24 Oct 2006) New Revision: 1295 Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java Log: Implement @WebServiceRef Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java 2006-10-24 08:33:04 UTC (rev 1294) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java 2006-10-24 13:50:36 UTC (rev 1295) @@ -23,17 +23,12 @@ // $Id$ -import java.lang.reflect.Constructor; -import java.net.URL; - import javax.naming.Context; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; import javax.xml.ws.WebServiceRef; import org.jboss.logging.Logger; import org.jboss.naming.Util; -import org.jboss.ws.deployment.JAXWSClientMetaDataBuilder; +import org.jboss.ws.jaxws.ServiceReferenceable; /** * Binds a JAXWS Service object into JNDI @@ -41,36 +36,19 @@ * @author Thomas.Diesler(a)jboss.org * @since 24-Oct-2006 */ -public class WebServiceRefDeployer +public class WebServiceRefDeployer { // provide logging private static Logger log = Logger.getLogger(WebServiceRefDeployer.class); - + private WebServiceRefDeployer() { // Hide ctor } - - public static void setupWebServiceRef(Context jndiCtx, String jndiName, Class type, WebServiceRef ref) throws Exception + + public static void setupWebServiceRef(Context ctx, String jndiName, Class type, WebServiceRef ref) throws Exception { - String wsdlLocation = ref.wsdlLocation(); - log.debug("setupWebServiceRef [jndi=" + jndiName + ",type=" + type + ",wsdl=" + wsdlLocation + "]"); - - if (Service.class.isAssignableFrom(type) == false) - throw new IllegalArgumentException("WebServiceRef type '" + type + "' is not assignable to javax.xml.ws.Service"); - - Service service; - if (wsdlLocation.length() > 0) - { - Constructor ctor = type.getConstructor(new Class[]{URL.class, QName.class}); - URL wsdlURL = new URL(wsdlLocation); - service = (Service)ctor.newInstance(new Object[]{wsdlURL, null}); - } - else - { - service = (Service)type.newInstance(); - } - - Util.bind(jndiCtx, jndiName, service); + Util.bind(ctx, jndiName, new ServiceReferenceable(type.getName(), ref.wsdlLocation())); + log.debug("WebServiceRef bound [jndi=" + jndiName + ",type=" + type.getName() + "]"); } } Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java 2006-10-24 08:33:04 UTC (rev 1294) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java 2006-10-24 13:50:36 UTC (rev 1295) @@ -0,0 +1,158 @@ +/* + * 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. + */ +// $Id$ +package org.jboss.ws.jaxws; + +// $Id$ + +import java.io.File; +import java.lang.reflect.Constructor; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Hashtable; + +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.Reference; +import javax.naming.spi.ObjectFactory; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.jboss.logging.Logger; + +/** + * This ServiceObjectFactory reconstructs a javax.xml.ws.Service + * for a given WSDL when the webservice client does a JNDI lookup + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Oct-2004 + */ +public class ServiceObjectFactory implements ObjectFactory +{ + // provide logging + private static final Logger log = Logger.getLogger(ServiceObjectFactory.class); + + /** + * Creates an object using the location or reference information specified. + * <p/> + * + * @param obj The possibly null object containing location or reference + * information that can be used in creating an object. + * @param name The name of this object relative to <code>nameCtx</code>, + * or null if no name is specified. + * @param nameCtx The context relative to which the <code>name</code> + * parameter is specified, or null if <code>name</code> is + * relative to the default initial context. + * @param environment The possibly null environment that is used in + * creating the object. + * @return The object created; null if an object cannot be created. + * @throws Exception if this object factory encountered an exception + * while attempting to create an object, and no other object factories are + * to be tried. + * @see javax.naming.spi.NamingManager#getObjectInstance + * @see javax.naming.spi.NamingManager#getURLContext + */ + public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception + { + try + { + Reference ref = (Reference)obj; + + String serviceTypeName = (String)ref.get(ServiceReferenceable.SERVICE_TYPE).getContent(); + String wsdlLocation = (String)ref.get(ServiceReferenceable.WSDL_LOCATION).getContent(); + + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + Class serviceType = ctxLoader.loadClass(serviceTypeName); + + if (Service.class.isAssignableFrom(serviceType) == false) + throw new IllegalArgumentException("WebServiceRef type '" + serviceType + "' is not assignable to javax.xml.ws.Service"); + + Service service; + + URL wsdlURL = getWsdlLocationURL(serviceType, wsdlLocation); + if (wsdlURL != null) + { + Constructor ctor = serviceType.getConstructor(new Class[] { URL.class, QName.class }); + service = (Service)ctor.newInstance(new Object[] { wsdlURL, null }); + } + else + { + service = (Service)serviceType.newInstance(); + } + + return service; + } + catch (Exception ex) + { + log.error("Cannot create service", ex); + throw ex; + } + } + + private URL getWsdlLocationURL(Class type, String wsdlLocation) + { + URL wsdlURL = null; + if (wsdlLocation != null && wsdlLocation.length() > 0) + { + // Try the wsdlLocation as URL + try + { + wsdlURL = new URL(wsdlLocation); + } + catch (MalformedURLException ex) + { + // ignore + } + + // Try the filename as File + if (wsdlURL == null) + { + try + { + File file = new File(wsdlLocation); + if (file.exists()) + wsdlURL = file.toURL(); + } + catch (MalformedURLException e) + { + // ignore + } + } + + // Try the filename as Resource + if (wsdlURL == null) + { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + wsdlURL = loader.getResource(wsdlLocation); + } + + // Try the filename relative to class + if (wsdlURL == null) + { + String packagePath = type.getPackage().getName().replace('.', '/'); + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + wsdlURL = loader.getResource(packagePath + "/" + wsdlLocation); + } + } + return wsdlURL; + } +} Property changes on: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/ServiceObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java 2006-10-24 08:33:04 UTC (rev 1294) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java 2006-10-24 13:50:36 UTC (rev 1295) @@ -0,0 +1,70 @@ +/* + * 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. + */ +// $Id$ +package org.jboss.ws.jaxws; + +// $Id$ + +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.Referenceable; +import javax.naming.StringRefAddr; + +/** + * A JNDI reference to a javax.xml.ws.Service + * + * It holds the information to reconstrut the javax.xml.ws.Service + * when the client does a JNDI lookup. + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Oct-2006 + */ +public class ServiceReferenceable implements Referenceable +{ + public static final String WSDL_LOCATION = "WSDL_LOCATION"; + public static final String SERVICE_TYPE = "SERVICE_TYPE"; + + private String serviceType; + private String wsdlLocation; + + public ServiceReferenceable(String serviceType, String wsdlLocation) + { + this.serviceType = serviceType; + this.wsdlLocation = wsdlLocation; + } + + /** + * Retrieves the Reference of this object. + * + * @return The non-null Reference of this object. + * @throws javax.naming.NamingException If a naming exception was encountered while retrieving the reference. + */ + public Reference getReference() throws NamingException + { + Reference myRef = new Reference(ServiceReferenceable.class.getName(), ServiceObjectFactory.class.getName(), null); + + myRef.add(new StringRefAddr(SERVICE_TYPE, serviceType)); + myRef.add(new StringRefAddr(WSDL_LOCATION, wsdlLocation)); + + return myRef; + } +} \ No newline at end of file Property changes on: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/ServiceReferenceable.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-24 08:33:04 UTC (rev 1294) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-24 13:50:36 UTC (rev 1295) @@ -23,16 +23,21 @@ import javax.xml.ws.WebServiceRef; +import org.jboss.logging.Logger; + public class ApplicationClient { - @WebServiceRef - public TestEndpointService service; + // Provide logging + private static Logger log = Logger.getLogger(ApplicationClient.class); + + @WebServiceRef (name ="TestEndpointService", wsdlLocation ="META-INF/wsdl/TestEndpoint.wsdl") + public static TestEndpointService service; public static void main(String[] args) { ApplicationClient client = new ApplicationClient(); String outStr = client.echo("Hello world!"); - System.out.println(outStr); + log.info(outStr); } public String echo(String inStr) Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2006-10-24 08:33:04 UTC (rev 1294) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2006-10-24 13:50:36 UTC (rev 1295) @@ -24,6 +24,8 @@ import javax.jws.WebMethod; import javax.jws.WebService; +import org.jboss.logging.Logger; + /** * Test the JAXWS annotation: javax.jws.WebServiceRef * @@ -33,9 +35,13 @@ @WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref") public class TestEndpointImpl { + // Provide logging + private static Logger log = Logger.getLogger(TestEndpointImpl.class); + @WebMethod public String echo(String input) { + log.info(input); return input; } }

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r1294 - in branches/tdiesler/trunk: . src/main/etc src/main/java/javax/xml/ws/spi src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/integration/jboss src/main/java/org/jboss/ws/jaxrpc src/main/java/org/jboss/ws/jaxws/handler src/main/java/org/jboss/ws/jaxws/spi src/main/java/org/jboss/ws/metadata src/main/java/org/jboss/ws/tools/helpers src/main/java/org/jboss/ws/tools/jaxws src/test/java/org/jboss/test/ws/jaxws/webserviceref

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-10-24 04:33:04 -0400 (Tue, 24 Oct 2006) New Revision: 1294 Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java Modified: branches/tdiesler/trunk/.classpath branches/tdiesler/trunk/build.xml branches/tdiesler/trunk/src/main/etc/jbossws-component-info.xml branches/tdiesler/trunk/src/main/etc/jbossws14-component-info.xml branches/tdiesler/trunk/src/main/java/javax/xml/ws/spi/Provider.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/PortInfoImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java Log: partial commit Modified: branches/tdiesler/trunk/.classpath =================================================================== --- branches/tdiesler/trunk/.classpath 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/.classpath 2006-10-24 08:33:04 UTC (rev 1294) @@ -16,7 +16,6 @@ <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="lib" path="thirdparty/concurrent.jar"/> <classpathentry kind="lib" path="thirdparty/javassist.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> <classpathentry kind="lib" path="thirdparty/policy-1.0.jar"/> <classpathentry kind="lib" path="thirdparty/stax-api-1.0.jar"/> @@ -29,5 +28,6 @@ <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-common.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: branches/tdiesler/trunk/build.xml =================================================================== --- branches/tdiesler/trunk/build.xml 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/build.xml 2006-10-24 08:33:04 UTC (rev 1294) @@ -222,6 +222,7 @@ <fileset dir="${build.classes.dir}"> <include name="javax/jws/**"/> <include name="javax/xml/ws/**"/> + <include name="org/jboss/ws/integration/jboss/WebServiceRefDeployer.class"/> </fileset> </jar> @@ -231,7 +232,6 @@ <fileset dir="${build.classes.dir}"> <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/**"/> - <exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> <fileset dir="${build.resources.dir}"> <include name="schema/**"/> @@ -244,7 +244,6 @@ <fileset dir="${build.classes.dir}"> <include name="org/jboss/ws/integration/*.class"/> <include name="org/jboss/ws/integration/jboss/**"/> - <include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> </jar> @@ -357,7 +356,6 @@ <fileset dir="${build.classes14.dir}"> <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/**"/> - <exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> <fileset dir="${build.resources.dir}"> <include name="schema/**"/> @@ -370,7 +368,6 @@ <fileset dir="${build.classes14.dir}"> <include name="org/jboss/ws/integration/*.class"/> <include name="org/jboss/ws/integration/jboss/**"/> - <include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> </jar> Modified: branches/tdiesler/trunk/src/main/etc/jbossws-component-info.xml =================================================================== --- branches/tdiesler/trunk/src/main/etc/jbossws-component-info.xml 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/etc/jbossws-component-info.xml 2006-10-24 08:33:04 UTC (rev 1294) @@ -5,8 +5,11 @@ version="@repository.id@" description="JBossWS an implementation of J2EE Web Services"> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-jaxws.jar"/> + <artifact id="jboss-saaj.jar"/> + <artifact id="jbossws-client.jar"/> <artifact id="jbossws.sar"/> - <artifact id="jbossws-client.jar"/> <import componentref="apache-xmlsec"> <compatible version="@apache-xmlsec@"/> @@ -25,8 +28,11 @@ </import> <export> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-jaxws.jar"/> + <include input="jboss-saaj.jar"/> + <include input="jbossws-client.jar"/> <include input="jbossws.sar"/> - <include input="jbossws-client.jar"/> </export> </component> Modified: branches/tdiesler/trunk/src/main/etc/jbossws14-component-info.xml =================================================================== --- branches/tdiesler/trunk/src/main/etc/jbossws14-component-info.xml 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/etc/jbossws14-component-info.xml 2006-10-24 08:33:04 UTC (rev 1294) @@ -5,8 +5,11 @@ version="@repository.id@" description="JBossWS an implementation of J2EE Web Services"> + <artifact id="jboss-jaxrpc.jar"/> + <artifact id="jboss-jaxws.jar"/> + <artifact id="jboss-saaj.jar"/> + <artifact id="jbossws14-client.jar"/> <artifact id="jbossws14.sar"/> - <artifact id="jbossws14-client.jar"/> <import componentref="apache-xmlsec"> <compatible version="@apache-xmlsec@"/> @@ -28,8 +31,11 @@ </import> <export> + <include input="jboss-jaxrpc.jar"/> + <include input="jboss-jaxws.jar"/> + <include input="jboss-saaj.jar"/> + <include input="jbossws14-client.jar"/> <include input="jbossws14.sar"/> - <include input="jbossws14-client.jar"/> </export> </component> Modified: branches/tdiesler/trunk/src/main/java/javax/xml/ws/spi/Provider.java =================================================================== --- branches/tdiesler/trunk/src/main/java/javax/xml/ws/spi/Provider.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/javax/xml/ws/spi/Provider.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -67,7 +67,7 @@ } } - public abstract ServiceDelegate createServiceDelegate(URL url, QName qname, Class class1); + public abstract ServiceDelegate createServiceDelegate(URL url, QName serviceName, Class class1); /** * Creates an endpoint object with the provided binding and implementation object. Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -67,19 +67,19 @@ /** Build from WSDL and jaxrpc-mapping.xml */ - public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL) + public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL) { if (wsdlURL == null) throw new IllegalArgumentException("Invalid wsdlURL: " + wsdlURL); - log.debug("START buildMetaData: [service=" + serviceQName + "]"); + log.debug("START buildMetaData: [service=" + serviceName + "]"); try { UnifiedMetaData wsMetaData = new UnifiedMetaData(); wsMetaData.setResourceLoader(resourceLoader); wsMetaData.setClassLoader(classLoader); - ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceQName); + ServiceMetaData serviceMetaData = new ServiceMetaData(wsMetaData, serviceName); wsMetaData.addService(serviceMetaData); serviceMetaData.setWsdlFile(wsdlURL.toExternalForm()); @@ -107,24 +107,24 @@ private void buildMetaDataInternal(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions) throws IOException { - QName serviceQName = serviceMetaData.getQName(); + QName serviceName = serviceMetaData.getServiceName(); // Get the WSDL service WSDLService wsdlService = null; - if (serviceQName == null) + if (serviceName == null) { if (wsdlDefinitions.getServices().length != 1) throw new IllegalArgumentException("Expected a single service element"); wsdlService = wsdlDefinitions.getServices()[0]; - serviceMetaData.setQName(wsdlService.getQName()); + serviceMetaData.setServiceName(wsdlService.getQName()); } else { - wsdlService = wsdlDefinitions.getService(new NCName(serviceQName.getLocalPart())); + wsdlService = wsdlDefinitions.getService(new NCName(serviceName.getLocalPart())); } if (wsdlService == null) - throw new IllegalArgumentException("Cannot obtain wsdl service: " + serviceQName); + throw new IllegalArgumentException("Cannot obtain wsdl service: " + serviceName); // Build endpoint meta data for (WSDLEndpoint wsdlEndpoint : wsdlService.getEndpoints()) Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ClientMetaDataBuilder.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -148,7 +148,7 @@ private void buildMetaDataInternal(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions, JavaWsdlMapping javaWsdlMapping, UnifiedServiceRefMetaData serviceRefMetaData) throws IOException { - QName serviceQName = serviceMetaData.getQName(); + QName serviceQName = serviceMetaData.getServiceName(); // Get the WSDL service WSDLService wsdlService = null; @@ -158,7 +158,7 @@ throw new IllegalArgumentException("Expected a single service element"); wsdlService = wsdlDefinitions.getServices()[0]; - serviceMetaData.setQName(wsdlService.getQName()); + serviceMetaData.setServiceName(wsdlService.getQName()); } else { Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR109ServerMetaDataBuilder.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -126,7 +126,7 @@ throw new WSException("Cannot find port in wsdl: " + portName); // set service name - serviceMetaData.setQName(wsdlEndpoint.getWsdlService().getQName()); + serviceMetaData.setServiceName(wsdlEndpoint.getWsdlService().getQName()); QName interfaceQName = wsdlEndpoint.getInterface().getQName(); ServerEndpointMetaData sepMetaData = new ServerEndpointMetaData(serviceMetaData, portName, interfaceQName, Type.JAXRPC); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -885,7 +885,7 @@ { try { - String serviceName = serviceMetaData.getQName().getLocalPart(); + String serviceName = serviceMetaData.getServiceName().getLocalPart(); WSDLGenerator generator = new JAXBWSDLGenerator(getJAXBContext(epMetaData)); WSDLDefinitions wsdlDefinitions = generator.generate(serviceMetaData); Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -0,0 +1,76 @@ +/* + * 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.integration.jboss; + +// $Id$ + +import java.lang.reflect.Constructor; +import java.net.URL; + +import javax.naming.Context; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebServiceRef; + +import org.jboss.logging.Logger; +import org.jboss.naming.Util; +import org.jboss.ws.deployment.JAXWSClientMetaDataBuilder; + +/** + * Binds a JAXWS Service object into JNDI + * + * @author Thomas.Diesler(a)jboss.org + * @since 24-Oct-2006 + */ +public class WebServiceRefDeployer +{ + // provide logging + private static Logger log = Logger.getLogger(WebServiceRefDeployer.class); + + private WebServiceRefDeployer() + { + // Hide ctor + } + + public static void setupWebServiceRef(Context jndiCtx, String jndiName, Class type, WebServiceRef ref) throws Exception + { + String wsdlLocation = ref.wsdlLocation(); + log.debug("setupWebServiceRef [jndi=" + jndiName + ",type=" + type + ",wsdl=" + wsdlLocation + "]"); + + if (Service.class.isAssignableFrom(type) == false) + throw new IllegalArgumentException("WebServiceRef type '" + type + "' is not assignable to javax.xml.ws.Service"); + + Service service; + if (wsdlLocation.length() > 0) + { + Constructor ctor = type.getConstructor(new Class[]{URL.class, QName.class}); + URL wsdlURL = new URL(wsdlLocation); + service = (Service)ctor.newInstance(new Object[]{wsdlURL, null}); + } + else + { + service = (Service)type.newInstance(); + } + + Util.bind(jndiCtx, jndiName, service); + } +} Property changes on: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/jboss/WebServiceRefDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ParameterWrapping.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -292,7 +292,7 @@ if (wrappedParameters == null) throw new WSException("Cannot generate a type when their is no wrapped parameters"); - String serviceName = serviceMetaData.getQName().getLocalPart(); + String serviceName = serviceMetaData.getServiceName().getLocalPart(); String parameterName = pmd.getXmlName().getLocalPart(); String endpointName = endpointMetaData.getQName().getLocalPart(); String packageName = endpointMetaData.getServiceEndpointInterface().getPackage().getName(); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceImpl.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -135,7 +135,7 @@ */ public QName getServiceName() { - return serviceMetaData.getQName(); + return serviceMetaData.getServiceName(); } /** Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerDelegateJAXWS.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -135,7 +135,7 @@ private PortInfo getPortInfo(EndpointMetaData epMetaData) { - QName serviceName = epMetaData.getServiceMetaData().getQName(); + QName serviceName = epMetaData.getServiceMetaData().getServiceName(); QName portName = epMetaData.getQName(); String bindingId = epMetaData.getBindingId(); PortInfo info = new PortInfoImpl(serviceName, portName, bindingId); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/HandlerResolverImpl.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -206,7 +206,7 @@ UnifiedMetaData wsMetaData = epMetaData.getServiceMetaData().getUnifiedMetaData(); for (ServiceMetaData smd : wsMetaData.getServices()) { - QName qname = smd.getQName(); + QName qname = smd.getServiceName(); String nsURI = qname.getNamespaceURI(); String localPart = qname.getLocalPart(); if (nsURI.equals(namespaceURI) && localPart.startsWith(localPattern)) @@ -220,7 +220,7 @@ UnifiedMetaData wsMetaData = epMetaData.getServiceMetaData().getUnifiedMetaData(); for (ServiceMetaData smd : wsMetaData.getServices()) { - QName qname = smd.getQName(); + QName qname = smd.getServiceName(); if (services.equals(qname)) { infos.add(new PortInfoImpl(qname, null, null)); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/PortInfoImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/PortInfoImpl.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/handler/PortInfoImpl.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -45,7 +45,7 @@ public PortInfoImpl(EndpointMetaData epMetaData) { - this.serviceName = epMetaData.getServiceMetaData().getQName(); + this.serviceName = epMetaData.getServiceMetaData().getServiceName(); this.portName = epMetaData.getQName(); this.bindingID = epMetaData.getBindingId(); } Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/jaxws/spi/ServiceDelegateImpl.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -86,9 +86,6 @@ public ServiceDelegateImpl(URL wsdlURL, QName serviceName) { - if (serviceName == null) - throw new IllegalArgumentException("Illegal null service name"); - JAXWSClientMetaDataBuilder builder = new JAXWSClientMetaDataBuilder(); ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); @@ -223,7 +220,7 @@ @Override public QName getServiceName() { - return serviceMetaData.getQName(); + return serviceMetaData.getServiceName(); } /** Returns an Iterator for the list of QNames of service endpoints grouped by this service */ Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/ServiceMetaData.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -68,7 +68,7 @@ // The service endpoints private Map<QName, EndpointMetaData> endpoints = new LinkedHashMap<QName, EndpointMetaData>(); - private QName qname; + private QName serviceName; private String wsdName; private String wsdlFile; private String jaxrpcMappingFile; @@ -88,10 +88,10 @@ // The security configuration private WSSecurityConfiguration securityConfiguration; - public ServiceMetaData(UnifiedMetaData wsMetaData, QName name) + public ServiceMetaData(UnifiedMetaData wsMetaData, QName serviceName) { this.wsMetaData = wsMetaData; - this.qname = name; + this.serviceName = serviceName; this.types = new TypesMetaData(this); } @@ -100,14 +100,14 @@ return wsMetaData; } - public void setQName(QName name) + public void setServiceName(QName serviceName) { - this.qname = name; + this.serviceName = serviceName; } - public QName getQName() + public QName getServiceName() { - return qname; + return serviceName; } public String getWebserviceDescriptionName() @@ -371,14 +371,14 @@ /** Assert that the given namespace is the WSDL's target namespace */ public void assertTargetNamespace(String targetNS) { - if (getQName().getNamespaceURI().equals(targetNS) == false) + if (getServiceName().getNamespaceURI().equals(targetNS) == false) throw new WSException("Requested namespace is not WSDL target namespace: " + targetNS); } public String toString() { StringBuilder buffer = new StringBuilder("\nServiceMetaData:"); - buffer.append("\n qname=" + qname); + buffer.append("\n qname=" + serviceName); buffer.append("\n wsdName=" + wsdName); buffer.append("\n wsdlFile=" + wsdlFile); buffer.append("\n jaxrpcFile=" + jaxrpcMappingFile); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/helpers/JavaToWSDLHelper.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -195,7 +195,7 @@ */ private void buildServiceMapping(EndpointMetaData endpoint) { - QName origQName = endpoint.getServiceMetaData().getQName(); + QName origQName = endpoint.getServiceMetaData().getServiceName(); String serviceInterfaceName = endpoint.getServiceEndpointInterface().getPackage().getName() + "." + origQName.getLocalPart(); QName serviceQName = new QName(origQName.getNamespaceURI(), origQName.getLocalPart(), "serviceNS"); Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java =================================================================== --- branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -277,8 +277,8 @@ { WSDLService wsdlService = new WSDLService(wsdl); - wsdlService.setQName(service.getQName()); - wsdlService.setName(new NCName(service.getQName().getLocalPart())); + wsdlService.setQName(service.getServiceName()); + wsdlService.setName(new NCName(service.getServiceName().getLocalPart())); wsdl.addService(wsdlService); EndpointMetaData endpoint = null; @@ -308,7 +308,7 @@ wsdl.setWsdlNamespace(Constants.NS_WSDL11); // One WSDL per service - String ns = service.getQName().getNamespaceURI(); + String ns = service.getServiceName().getNamespaceURI(); wsdl.setTargetNamespace(ns); wsdl.registerNamespaceURI(ns, "tns"); wsdl.registerNamespaceURI(Constants.NS_SOAP11, "soap"); Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-24 04:00:47 UTC (rev 1293) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-24 08:33:04 UTC (rev 1294) @@ -25,7 +25,7 @@ public class ApplicationClient { - @WebServiceRef(wsdlLocation = "resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl") + @WebServiceRef public TestEndpointService service; public static void main(String[] args)

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r1293 - in branches/jbossws-1.0/src/test/java/org/jboss/test/ws: jaxrpc/samples/wssecurity tools/jbws1090

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2006-10-24 00:00:47 -0400 (Tue, 24 Oct 2006) New Revision: 1293 Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java Log: Fix subclipse Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2006-10-24 03:38:56 UTC (rev 1292) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java 2006-10-24 04:00:47 UTC (rev 1293) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.jaxrpc.samples.wssecurity; -// $Id: $ +// $Id$ import java.io.File; import java.net.URL; Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2006-10-24 03:38:56 UTC (rev 1292) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/jbws1090/JBWS1090TestCase.java 2006-10-24 04:00:47 UTC (rev 1293) @@ -21,7 +21,7 @@ */ package org.jboss.test.ws.tools.jbws1090; -// $Id: $ +// $Id$ import java.io.File; import java.io.FileInputStream;

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r1292 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/utils test test/java/org/jboss/test/ws/jaxrpc/jbws1303 test/resources/jaxrpc/jbws1303/WEB-INF

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2006-10-23 23:38:56 -0400 (Mon, 23 Oct 2006) New Revision: 1292 Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastMod_PortType.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/Lastmod.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastmodImpl.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastmodResponse.java branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/jaxrpc-mapping.xml Removed: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java branches/jbossws-1.0/src/test/build.xml branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml Log: Fix JBWS-1303 Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-23 22:29:23 UTC (rev 1291) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-24 03:38:56 UTC (rev 1292) @@ -72,6 +72,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.jboss.logging.Logger; /** * Traverse a DOM tree in order to print a document that is parsed. @@ -82,6 +83,7 @@ */ public class DOMWriter { + private static Logger log = Logger.getLogger(DOMWriter.class); // Print writer private PrintWriter out; // True, if canonical output @@ -291,13 +293,19 @@ { String nsURI = getNamespaceURI(atPrefix, element, rootNode); nsMap.put(atPrefix, nsURI); - // xsi:type='ns1:SubType', xsi:type='xsd:string' - if (atName.equals(atPrefix + ":type") && nsURI.equals("http://www.w3.org/2001/XMLSchema-instance") && atValue.indexOf(":") > 0) + if (atName.equals(atPrefix + ":type") && atValue.indexOf(":") > 0) { - String typePrefix = atValue.substring(0, atValue.indexOf(":")); - String typeURI = getNamespaceURI(typePrefix, element, rootNode); - nsMap.put(typePrefix, typeURI); + // xsi defined on the envelope + if (nsURI == null) + nsURI = getNamespaceURI(atPrefix, element, null); + + if ("http://www.w3.org/2001/XMLSchema-instance".equals(nsURI)) + { + String typePrefix = atValue.substring(0, atValue.indexOf(":")); + String typeURI = getNamespaceURI(typePrefix, element, rootNode); + nsMap.put(typePrefix, typeURI); + } } } @@ -576,4 +584,4 @@ } return (str.toString()); } -} \ No newline at end of file +} Modified: branches/jbossws-1.0/src/test/build.xml =================================================================== --- branches/jbossws-1.0/src/test/build.xml 2006-10-23 22:29:23 UTC (rev 1291) +++ branches/jbossws-1.0/src/test/build.xml 2006-10-24 03:38:56 UTC (rev 1292) @@ -313,7 +313,6 @@ <mkdir dir="${build.test.dir}/wstools/java"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/>  - <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/jbws1303/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws1303/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> @@ -337,7 +336,6 @@ <move todir="${build.test.dir}/wstools/java"> <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/> - <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/jbws1303/WEB-INF" includes="org/**"/> <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" includes="org/**"/> </move> Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java 2006-10-23 22:29:23 UTC (rev 1291) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastModImpl.java 2006-10-24 03:38:56 UTC (rev 1292) @@ -1,39 +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.jaxrpc.jbws1303; - -import java.rmi.RemoteException; - -import org.jboss.logging.Logger; - -public class LastModImpl implements LastMod_PortType -{ - // Provide logging - private static Logger log = Logger.getLogger(LastModImpl.class); - - public LastmodResponse lastmod(Lastmod lastmod) throws RemoteException - { - String req = lastmod.getLastmodRequest(); - log.info("lastmod: " + req); - return new LastmodResponse(req); - } -} Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastMod_PortType.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastMod_PortType.java 2006-10-23 22:29:23 UTC (rev 1291) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastMod_PortType.java 2006-10-24 03:38:56 UTC (rev 1292) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun Oct 22 20:21:32 CDT 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jaxrpc.jbws1303; +public interface LastMod_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jaxrpc.jbws1303.LastmodResponse lastmod(org.jboss.test.ws.jaxrpc.jbws1303.Lastmod lastmod) throws java.rmi.RemoteException; +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastMod_PortType.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/Lastmod.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/Lastmod.java 2006-10-23 22:29:23 UTC (rev 1291) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/Lastmod.java 2006-10-24 03:38:56 UTC (rev 1292) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun Oct 22 20:21:32 CDT 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jaxrpc.jbws1303; + + +public class Lastmod +{ + +protected java.lang.String lastmodRequest; +public Lastmod(){} + +public Lastmod(java.lang.String lastmodRequest){ +this.lastmodRequest=lastmodRequest; +} +public java.lang.String getLastmodRequest() { return lastmodRequest ;} + +public void setLastmodRequest(java.lang.String lastmodRequest){ this.lastmodRequest = lastmodRequest; } + +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/Lastmod.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastmodImpl.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastmodImpl.java 2006-10-23 22:29:23 UTC (rev 1291) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastmodImpl.java 2006-10-24 03:38:56 UTC (rev 1292) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.jbws1303; + +import java.rmi.RemoteException; + +import org.jboss.logging.Logger; + +public class LastmodImpl implements LastMod_PortType +{ + // Provide logging + private static Logger log = Logger.getLogger(LastmodImpl.class); + + public LastmodResponse lastmod(Lastmod lastmod) throws RemoteException + { + String req = lastmod.getLastmodRequest(); + log.info("lastmod: " + req); + return new LastmodResponse(req); + } +} Added: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastmodResponse.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastmodResponse.java 2006-10-23 22:29:23 UTC (rev 1291) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastmodResponse.java 2006-10-24 03:38:56 UTC (rev 1292) @@ -0,0 +1,27 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Sun Oct 22 20:21:32 CDT 2006 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jaxrpc.jbws1303; + + +public class LastmodResponse +{ + +protected java.lang.String timeChanged; +public LastmodResponse(){} + +public LastmodResponse(java.lang.String timeChanged){ +this.timeChanged=timeChanged; +} +public java.lang.String getTimeChanged() { return timeChanged ;} + +public void setTimeChanged(java.lang.String timeChanged){ this.timeChanged=timeChanged; } + +} Property changes on: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/LastmodResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2006-10-23 22:29:23 UTC (rev 1291) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1303/ServerHandler.java 2006-10-24 03:38:56 UTC (rev 1292) @@ -40,11 +40,13 @@ } /** - * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' + * xmlns:xsi='http://www.w3c.org/2001/XMLSchema-instance' + & xmlns:xsd='http://www.w3.org/2001/XMLSchema'> * <env:Header/> * <env:Body> * <lastmodResponse xmlns='http://netid.msu.edu:8080/lastmod.pl'> - * <TimeChanged xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='xsd:string'>yesterday</TimeChanged> + * <TimeChanged xsi:type='xsd:string'>yesterday</TimeChanged> * </lastmodResponse> * </env:Body> * </env:Envelope> @@ -56,10 +58,10 @@ SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(); SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSD, Constants.NS_SCHEMA_XSD); + soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSI, Constants.NS_SCHEMA_XSI); SOAPElement bodyElement = soapMessage.getSOAPBody().addChildElement("lastmodResponse"); bodyElement.setAttribute("xmlns", "http://netid.msu.edu:8080/lastmod.pl"); SOAPElement soapElement = bodyElement.addChildElement("TimeChanged"); - soapElement.addNamespaceDeclaration(Constants.PREFIX_XSI, Constants.NS_SCHEMA_XSI); soapElement.setAttribute("xsi:type", "xsd:string"); soapElement.setValue("yesterday"); ((SOAPMessageContext)msgContext).setMessage(soapMessage); Added: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/jaxrpc-mapping.xml 2006-10-23 22:29:23 UTC (rev 1291) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/jaxrpc-mapping.xml 2006-10-24 03:38:56 UTC (rev 1292) @@ -0,0 +1,55 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jaxrpc.jbws1303</package-type> + <namespaceURI>http://netid.msu.edu:8080/lastmod.pl</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws1303.Lastmod</java-type> + <anonymous-type-qname xmlns:typeNS='http://netid.msu.edu:8080/lastmod.pl'>typeNS:>lastmod</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>lastmodRequest</java-variable-name> + <xml-element-name>lastmodRequest</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jaxrpc.jbws1303.LastmodResponse</java-type> + <anonymous-type-qname xmlns:typeNS='http://netid.msu.edu:8080/lastmod.pl'>typeNS:>lastmodResponse</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>timeChanged</java-variable-name> + <xml-element-name>TimeChanged</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1303.LastMod</service-interface> + <wsdl-service-name xmlns:serviceNS='http://netid.msu.edu:8080/lastmod.pl'>serviceNS:LastMod</wsdl-service-name> + <port-mapping> + <port-name>LastModPort</port-name> + <java-port-name>LastModPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1303.LastMod_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://netid.msu.edu:8080/lastmod.pl'>portTypeNS:LastModPortType</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://netid.msu.edu:8080/lastmod.pl'>bindingNS:LastModBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lastmod</java-method-name> + <wsdl-operation>lastmod</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jaxrpc.jbws1303.Lastmod</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://netid.msu.edu:8080/lastmod.pl'>wsdlMsgNS:lastmodInput</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jaxrpc.jbws1303.LastmodResponse</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://netid.msu.edu:8080/lastmod.pl'>wsdlMsgNS:lastmodOutput</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> Property changes on: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/jaxrpc-mapping.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml 2006-10-23 22:29:23 UTC (rev 1291) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1303/WEB-INF/web.xml 2006-10-24 03:38:56 UTC (rev 1292) @@ -7,7 +7,7 @@ <servlet> <servlet-name>LastMod</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1303.LastModImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1303.LastmodImpl</servlet-class> </servlet> <servlet-mapping>

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r1291 - in branches/jbossws-1.0.3.GA-JBWS-1311/src: main/java/org/jboss/ws/utils test/java/org/jboss/test/ws/jbws1303

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2006-10-23 18:29:23 -0400 (Mon, 23 Oct 2006) New Revision: 1291 Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/utils/DOMWriter.java branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/ServerHandler.java Log: Correct test case Fix condition when xsi is defined on the envelope Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/utils/DOMWriter.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-23 19:15:52 UTC (rev 1290) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-23 22:29:23 UTC (rev 1291) @@ -72,6 +72,7 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.jboss.logging.Logger; /** * Traverse a DOM tree in order to print a document that is parsed. @@ -82,6 +83,7 @@ */ public class DOMWriter { + private static Logger log = Logger.getLogger(DOMWriter.class); // Print writer private PrintWriter out; // True, if canonical output @@ -291,13 +293,19 @@ { String nsURI = getNamespaceURI(atPrefix, element, rootNode); nsMap.put(atPrefix, nsURI); - // xsi:type='ns1:SubType', xsi:type='xsd:string' - if (atName.equals(atPrefix + ":type") && nsURI.equals("http://www.w3.org/2001/XMLSchema-instance") && atValue.indexOf(":") > 0) + if (atName.equals(atPrefix + ":type") && atValue.indexOf(":") > 0) { - String typePrefix = atValue.substring(0, atValue.indexOf(":")); - String typeURI = getNamespaceURI(typePrefix, element, rootNode); - nsMap.put(typePrefix, typeURI); + // xsi defined on the envelope + if (nsURI == null) + nsURI = getNamespaceURI(atPrefix, element, null); + + if ("http://www.w3.org/2001/XMLSchema-instance".equals(nsURI)) + { + String typePrefix = atValue.substring(0, atValue.indexOf(":")); + String typeURI = getNamespaceURI(typePrefix, element, rootNode); + nsMap.put(typePrefix, typeURI); + } } } @@ -576,4 +584,4 @@ } return (str.toString()); } -} \ No newline at end of file +} Modified: branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/ServerHandler.java =================================================================== --- branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/ServerHandler.java 2006-10-23 19:15:52 UTC (rev 1290) +++ branches/jbossws-1.0.3.GA-JBWS-1311/src/test/java/org/jboss/test/ws/jbws1303/ServerHandler.java 2006-10-23 22:29:23 UTC (rev 1291) @@ -40,11 +40,13 @@ } /** - * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + * <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/' + * xmlns:xsi='http://www.w3c.org/2001/XMLSchema-instance' + & xmlns:xsd='http://www.w3.org/2001/XMLSchema'> * <env:Header/> * <env:Body> * <lastmodResponse xmlns='http://netid.msu.edu:8080/lastmod.pl'> - * <TimeChanged xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:type='xsd:string'>yesterday</TimeChanged> + * <TimeChanged xsi:type='xsd:string'>yesterday</TimeChanged> * </lastmodResponse> * </env:Body> * </env:Envelope> @@ -56,10 +58,10 @@ SOAPMessage soapMessage = MessageFactory.newInstance().createMessage(); SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSD, Constants.NS_SCHEMA_XSD); + soapEnvelope.addNamespaceDeclaration(Constants.PREFIX_XSI, Constants.NS_SCHEMA_XSI); SOAPElement bodyElement = soapMessage.getSOAPBody().addChildElement("lastmodResponse"); bodyElement.setAttribute("xmlns", "http://netid.msu.edu:8080/lastmod.pl"); SOAPElement soapElement = bodyElement.addChildElement("TimeChanged"); - soapElement.addNamespaceDeclaration(Constants.PREFIX_XSI, Constants.NS_SCHEMA_XSI); soapElement.setAttribute("xsi:type", "xsd:string"); soapElement.setValue("yesterday"); ((SOAPMessageContext)msgContext).setMessage(soapMessage);

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r1290 - in trunk: .settings src/main/java/org/jboss/ws src/main/java/org/jboss/ws/deployment src/main/java/org/jboss/ws/metadata/jsr109 src/main/java/org/jboss/ws/metadata/wsdl src/main/java/org/jboss/ws/metadata/wsdl/xmlschema src/main/java/org/jboss/ws/tools src/main/java/org/jboss/ws/tools/helpers src/main/java/org/jboss/ws/tools/jaxws src/main/java/org/jboss/ws/tools/metadata src/main/java/org/jboss/ws/utils src/test src/test/ant src/test/etc src/test/java/org/jboss/test/w

by jbossws-commits＠lists.jboss.org

Author: jason.greene(a)jboss.com Date: 2006-10-23 15:15:52 -0400 (Mon, 23 Oct 2006) New Revision: 1290 Added: trunk/src/test/resources/jaxws/jsr181/webparam/jaxrpc-mapping.xml Modified: trunk/.settings/org.eclipse.jdt.core.prefs trunk/src/main/java/org/jboss/ws/Constants.java trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebserviceDescriptionMetaData.java trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java trunk/src/test/ant/build-jars-jaxws.xml trunk/src/test/build.xml trunk/src/test/etc/log4j.xml trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/JSR181WebParamTestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/PingService.java trunk/src/test/resources/jaxws/jsr181/webparam/WEB-INF/web.xml trunk/src/test/resources/tools/holders/java/org/jboss/test/HoldersServiceInterface.java Log: Rewrite parameter processing in WSDLToJava and MappingFileGeneratorHelper Fix remainder of test cases Disable XOP and JMS cases Revert 1274 Fix bug introduced in 1271 Modified: trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/.settings/org.eclipse.jdt.core.prefs 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/.settings/org.eclipse.jdt.core.prefs 2006-10-23 19:15:52 UTC (rev 1290) @@ -1,9 +1,9 @@ -#Mon May 15 10:38:05 CEST 2006 +#Thu Oct 19 19:43:08 CDT 2006 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch, .svn/, output/ +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch, .svn, output/ org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled Modified: trunk/src/main/java/org/jboss/ws/Constants.java =================================================================== --- trunk/src/main/java/org/jboss/ws/Constants.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/Constants.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -77,7 +77,7 @@ static final String URI_LITERAL_ENC = ""; /** WSDL 2.0 Encoding Rules */ static final String URI_STYLE_RPC = "http://www.w3.org/2004/03/wsdl/style/rpc"; - static final String URI_STYLE_DOC = "http://www.w3.org/2004/03/wsdl/style/iri"; + static final String URI_STYLE_IRI = "http://www.w3.org/2004/03/wsdl/style/iri"; //represents doc /**Style of WSDL */ static final String RPC_LITERAL = "RPC/Literal"; static final String DOCUMENT_LITERAL = "Document/Literal"; @@ -241,6 +241,8 @@ static final String WSDL_PROPERTY_EVENTSOURCE = "http://www.jboss.org/jbossws/wse/isEventSource"; + /** The key to the original message part name */ + static final String WSDL_PROPERTY_PART_NAME = "http://www.jboss.org/jbossws/partname"; /** The key to the message part type in case a part does not reference an element; http://www.jboss.org/jbossws/rpc/xmltype */ static final String WSDL_PROPERTY_RPC_XMLTYPE = "http://www.jboss.org/jbossws/rpc/xmltype"; /** Used as WSDL 2.0 property string to provide support for WSDL 1.1 mime types */ Modified: trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/deployment/AnnotationsMetaDataBuilder.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -23,13 +23,26 @@ // $Id:AnnotationsMetaDataBuilder.java 732 2006-08-12 18:40:21Z thomas.diesler(a)jboss.com $ +import java.io.File; +import java.io.IOException; +import java.io.Writer; + import javax.xml.ws.BindingType; import org.jboss.logging.Logger; +import org.jboss.ws.Constants; +import org.jboss.ws.WSException; import org.jboss.ws.annotation.PortComponent; import org.jboss.ws.metadata.EndpointMetaData; import org.jboss.ws.metadata.ServerEndpointMetaData; +import org.jboss.ws.metadata.ServiceMetaData; +import org.jboss.ws.metadata.UnifiedMetaData; import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.server.ServerConfig; +import org.jboss.ws.server.ServerConfigFactory; +import org.jboss.ws.tools.JavaToWSDL; +import org.jboss.ws.utils.IOUtils; /** An abstract annotation meta data builder. * @@ -55,6 +68,56 @@ } } + protected void processOrGenerateWSDL(Class wsClass, ServiceMetaData serviceMetaData, String wsdlLocation, EndpointMetaData endpointMetaData) + { + if (wsdlLocation.length() > 0) + { + serviceMetaData.setWsdlFile(wsdlLocation); + } + else + { + // Generate the wsdl + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + try + { + UnifiedMetaData wsMetaData = serviceMetaData.getUnifiedMetaData(); + Thread.currentThread().setContextClassLoader(wsMetaData.getClassLoader()); + String serviceName = serviceMetaData.getQName().getLocalPart(); + + JavaToWSDL javaToWSDL = new JavaToWSDL(Constants.NS_WSDL11); + javaToWSDL.setUnifiedMetaData(wsMetaData); + javaToWSDL.setQualifiedElements(true); + WSDLDefinitions wsdlDefinitions = javaToWSDL.generate(wsClass); + + ServerConfigFactory factory = ServerConfigFactory.getInstance(); + ServerConfig config = factory.getServerConfig(); + File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/jbossws"); + tmpdir.mkdirs(); + + File wsdlTmpFile = File.createTempFile(serviceName, ".wsdl", tmpdir); + wsdlTmpFile.deleteOnExit(); + + Writer writer = IOUtils.getCharsetFileWriter(wsdlTmpFile, Constants.DEFAULT_XML_CHARSET); + wsdlDefinitions.write(writer, Constants.DEFAULT_XML_CHARSET); + writer.close(); + + serviceMetaData.setWsdlFile(wsdlTmpFile.toURL().toExternalForm()); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (IOException e) + { + throw new WSException("Cannot write generated wsdl", e); + } + finally + { + Thread.currentThread().setContextClassLoader(ctxLoader); + } + } + } + protected void processPortComponent(UnifiedDeploymentInfo udi, Class wsClass, String linkName, ServerEndpointMetaData epMetaData) { String contextRoot = null; Modified: trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/deployment/JAXWSClientMetaDataBuilder.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -28,16 +28,21 @@ import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; +import javax.xml.rpc.encoding.TypeMappingRegistry; import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.jaxrpc.Style; +import org.jboss.ws.jaxrpc.TypeMappingImpl; +import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl; import org.jboss.ws.metadata.ClientEndpointMetaData; import org.jboss.ws.metadata.EndpointMetaData; import org.jboss.ws.metadata.OperationMetaData; import org.jboss.ws.metadata.ParameterMetaData; import org.jboss.ws.metadata.ServiceMetaData; +import org.jboss.ws.metadata.TypeMappingMetaData; +import org.jboss.ws.metadata.TypesMetaData; import org.jboss.ws.metadata.UnifiedMetaData; import org.jboss.ws.metadata.EndpointMetaData.Type; import org.jboss.ws.metadata.wsdl.NCName; @@ -49,7 +54,6 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; -import org.jboss.ws.metadata.wsdl.WSDLRPCPart; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; @@ -165,7 +169,7 @@ // Set the operation style String style = wsdlOperation.getStyle(); - epMetaData.setStyle((Constants.URI_STYLE_DOC.equals(style) ? Style.DOCUMENT : Style.RPC)); + epMetaData.setStyle((Constants.URI_STYLE_IRI.equals(style) ? Style.DOCUMENT : Style.RPC)); // Set the operation MEP if (Constants.WSDL20_PATTERN_IN_ONLY.equals(wsdlOperation.getPattern())) @@ -177,75 +181,109 @@ if (wsdlBindingOperation != null) opMetaData.setSOAPAction(wsdlBindingOperation.getSOAPAction()); - // Build the parameter meta data - if (opMetaData.getStyle() == Style.RPC) - { - buildParameterMetaDataRpc(opMetaData, wsdlOperation); - } - else - { - buildParameterMetaDataDoc(opMetaData, wsdlOperation); - } + // Get the type mapping for the encoding style + String encStyle = epMetaData.getEncodingStyle().toURI(); + TypeMappingRegistry tmRegistry = new TypeMappingRegistryImpl(); + TypeMappingImpl typeMapping = (TypeMappingImpl)tmRegistry.getTypeMapping(encStyle); +// +// // Build the parameter meta data +// if (opMetaData.getStyle() == Style.RPC) +// { +// buildParameterMetaDataRpc(opMetaData, wsdlOperation, typeMapping); +// } +// else +// { +// buildParameterMetaDataDoc(opMetaData, wsdlOperation, typeMapping); +// } +// +// // Build operation faults +// buildFaultMetaData(opMetaData, wsdlOperation); - // Build operation faults - buildFaultMetaData(opMetaData, wsdlOperation); - // process further operation extensions processOpMetaExtensions(opMetaData, wsdlOperation); } } - private void buildParameterMetaDataRpc(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation) + private void buildParameterMetaDataRpc(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, TypeMappingImpl typeMapping) { log.trace("buildParameterMetaDataRpc: " + opMetaData.getQName()); + TypesMetaData typesMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getTypesMetaData(); + for (WSDLInterfaceOperationInput opInput : wsdlOperation.getInputs()) { - for (WSDLRPCPart childPart : opInput.getChildParts()) - { - QName xmlName = new QName(childPart.getName()); - QName xmlType = childPart.getType(); - ParameterMetaData inMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, null); - opMetaData.addParameter(inMetaData); - } + QName xmlName = opInput.getElement(); + QName xmlType = opInput.getXMLType(); + String javaTypeName = typeMapping.getJavaTypeName(xmlType); + + ParameterMetaData inMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName); + opMetaData.addParameter(inMetaData); + + boolean inHeader = opInput.getProperty(Constants.WSDL_PROPERTY_APPLICATION_DATA) != null; + inMetaData.setInHeader(inHeader); } for (WSDLInterfaceOperationOutput opOutput : wsdlOperation.getOutputs()) { - for (WSDLRPCPart childPart : opOutput.getChildParts()) + String partName = opOutput.getProperty(Constants.WSDL_PROPERTY_PART_NAME).getValue(); + QName xmlName = opOutput.getElement(); + + ParameterMetaData outMetaData = opMetaData.getParameter(xmlName); + if (outMetaData != null && wsdlOperation.getInputByPartName(partName) != null) { - QName xmlName = new QName(childPart.getName()); - QName xmlType = childPart.getType(); + outMetaData.setMode(ParameterMode.INOUT); + } + else + { + QName xmlType = opOutput.getXMLType(); + String javaTypeName = typeMapping.getJavaTypeName(xmlType); - ParameterMetaData outMetaData = opMetaData.getParameter(xmlName); - if (outMetaData != null) + boolean inHeader = opOutput.getProperty(Constants.WSDL_PROPERTY_APPLICATION_DATA) != null; + boolean hasReturnMapping = (inHeader == false); + + if (hasReturnMapping) { - outMetaData.setMode(ParameterMode.INOUT); + outMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName); + opMetaData.setReturnParameter(outMetaData); } else { - outMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, null); - opMetaData.setReturnParameter(outMetaData); + outMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName); + outMetaData.setMode(ParameterMode.OUT); + opMetaData.addParameter(outMetaData); + + outMetaData.setInHeader(inHeader); } } } } - private void buildParameterMetaDataDoc(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation) + private void buildParameterMetaDataDoc(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation, TypeMappingImpl typeMapping) { log.trace("buildParameterMetaDataDoc: " + opMetaData.getQName()); + EndpointMetaData epMetaData = opMetaData.getEndpointMetaData(); + ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); + TypesMetaData typesMetaData = serviceMetaData.getTypesMetaData(); + for (WSDLInterfaceOperationInput opInput : wsdlOperation.getInputs()) { QName xmlName = opInput.getElement(); - ParameterMetaData inMetaData = new ParameterMetaData(opMetaData, xmlName, null); + QName xmlType = opInput.getXMLType(); + String javaTypeName = typeMapping.getJavaTypeName(xmlType); + + TypeMappingMetaData typeMetaData = typesMetaData.getTypeMappingByXMLType(xmlType); + if (typeMetaData != null) + javaTypeName = typeMetaData.getJavaTypeName(); + + ParameterMetaData inMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName); inMetaData.setInHeader(opInput.getProperty(Constants.WSDL_PROPERTY_APPLICATION_DATA) != null); opMetaData.addParameter(inMetaData); } for (WSDLInterfaceOperationOutput opOutput : wsdlOperation.getOutputs()) { - String partName = opOutput.getPartName(); + String partName = opOutput.getProperty(Constants.WSDL_PROPERTY_PART_NAME).getValue(); QName xmlName = opOutput.getElement(); ParameterMetaData paramMetaData = opMetaData.getParameter(xmlName); @@ -255,17 +293,23 @@ } else { + QName xmlType = opOutput.getXMLType(); + String javaTypeName = typeMapping.getJavaTypeName(xmlType); + boolean inHeader = opOutput.getProperty(Constants.WSDL_PROPERTY_APPLICATION_DATA) != null; boolean hasReturnMapping = (inHeader == false); + if (typesMetaData.getTypeMappingByXMLType(xmlType) != null) + javaTypeName = typesMetaData.getTypeMappingByXMLType(xmlType).getJavaTypeName(); + if (hasReturnMapping) { - ParameterMetaData retMetaData = new ParameterMetaData(opMetaData, xmlName, null); + ParameterMetaData retMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName); opMetaData.setReturnParameter(retMetaData); } else { - ParameterMetaData outMetaData = new ParameterMetaData(opMetaData, xmlName, null); + ParameterMetaData outMetaData = new ParameterMetaData(opMetaData, xmlName, xmlType, javaTypeName); opMetaData.addParameter(outMetaData); outMetaData.setMode(ParameterMode.OUT); Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR109MetaDataBuilder.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -178,7 +178,7 @@ // Set the operation style String style = wsdlOperation.getStyle(); - epMetaData.setStyle((Constants.URI_STYLE_DOC.equals(style) ? Style.DOCUMENT : Style.RPC)); + epMetaData.setStyle((Constants.URI_STYLE_IRI.equals(style) ? Style.DOCUMENT : Style.RPC)); // Set the operation MEP if (Constants.WSDL20_PATTERN_IN_ONLY.equals(wsdlOperation.getPattern())) Modified: trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java =================================================================== --- trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/deployment/JSR181MetaDataBuilder.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -24,7 +24,6 @@ // $Id$ import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.Writer; @@ -92,8 +91,6 @@ import org.jboss.ws.server.ServerConfigFactory; import org.jboss.ws.tools.jaxws.JAXBWSDLGenerator; import org.jboss.ws.tools.jaxws.WSDLGenerator; -import org.jboss.ws.utils.DOMUtils; -import org.jboss.ws.utils.DOMWriter; import org.jboss.ws.utils.HolderUtils; import org.jboss.ws.utils.IOUtils; import org.jboss.ws.utils.JBossWSEntityResolver; @@ -101,7 +98,6 @@ import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; -import org.w3c.dom.Element; import com.sun.xml.bind.api.JAXBRIContext; import com.sun.xml.bind.api.TypeReference; @@ -251,6 +247,7 @@ wrapperGenerator = new DynamicWrapperGenerator(loader); javaTypes.clear(); typeRefs.clear(); + jaxbCtx = null; } protected JAXBRIContext getJAXBContext(EndpointMetaData epMetaData) @@ -372,6 +369,8 @@ private void processWebMethod(EndpointMetaData epMetaData, Method method) { + ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); + TypesMetaData typesMetaData = serviceMetaData.getTypesMetaData(); String targetNS = epMetaData.getQName().getNamespaceURI(); // reflection defaults @@ -875,7 +874,7 @@ opMetaData.addExtension(addrExt); } - private void processOrGenerateWSDL(Class wsClass, ServiceMetaData serviceMetaData, String wsdlLocation, EndpointMetaData epMetaData) + protected void processOrGenerateWSDL(Class wsClass, ServiceMetaData serviceMetaData, String wsdlLocation, EndpointMetaData epMetaData) { if (wsdlLocation.length() > 0) { @@ -902,11 +901,6 @@ wsdlDefinitions.write(writer, Constants.DEFAULT_XML_CHARSET); writer.close(); - // Write generated wsdl to debug log - Element root = DOMUtils.parse(new FileInputStream (wsdlTmpFile)); - String wsdl = DOMWriter.printNode(root, true); - log.debug("Generated wsdl:\n" + wsdl); - serviceMetaData.setWsdlFile(wsdlTmpFile.toURL().toExternalForm()); } catch (RuntimeException rte) Modified: trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebserviceDescriptionMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebserviceDescriptionMetaData.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebserviceDescriptionMetaData.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -1,24 +1,24 @@ /* -* 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. -*/ + * 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.jsr109; // $Id$ @@ -78,7 +78,7 @@ portComponents.toArray(array); return array; } - + /** * Get the QNames of the port components to be declared * in the namespaces @@ -90,15 +90,15 @@ //TODO:Check if there is just one QName that drives all portcomponents //or each port component can have a distinct QName (namespace/prefix) //Maintain uniqueness of the QName - Map map = new HashMap(); + Map map = new HashMap(); Iterator iter = portComponents.iterator(); - while(iter != null && iter.hasNext()) + while (iter != null && iter.hasNext()) { PortComponentMetaData pcm = (PortComponentMetaData)iter.next(); QName qname = pcm.getWsdlPort(); - map.put(qname.getPrefix(),qname); + map.put(qname.getPrefix(), qname); } - return map.values(); + return map.values(); } /** @@ -155,7 +155,7 @@ { this.jaxrpcMappingFile = jaxrpcMappingFile; } - + /** * Serialize as a String * @@ -166,10 +166,10 @@ StringBuilder buffer = new StringBuilder("<webservice-description> <webservice-description-name>"); buffer.append(this.webserviceDescriptionName); buffer.append("</webservice-description-name>"); - buffer.append("<wsdl-file>"+wsdlFile+"</wsdl-file>"); - buffer.append("<jaxrpc-mapping-file>"+jaxrpcMappingFile+"</jaxrpc-mapping-file>"); - for(PortComponentMetaData pm:portComponents) - buffer.append(pm.serialize()); + buffer.append("<wsdl-file>" + wsdlFile + "</wsdl-file>"); + buffer.append("<jaxrpc-mapping-file>" + jaxrpcMappingFile + "</jaxrpc-mapping-file>"); + for (PortComponentMetaData pm : portComponents) + buffer.append(pm.serialize()); buffer.append("</webservice-description>"); return buffer.toString(); } Modified: trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/metadata/jsr109/WebservicesMetaData.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -1,24 +1,24 @@ /* -* 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. -*/ + * 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. + */ // $Id$ package org.jboss.ws.metadata.jsr109; @@ -47,10 +47,9 @@ // The URL to the webservices.xml descriptor private URL descriptorURL; - public WebservicesMetaData() - { - } - + /** + * Construct webservices meta data, with a given resource class loader. + */ public WebservicesMetaData(URL descriptorURL) { this.descriptorURL = descriptorURL; @@ -72,7 +71,7 @@ webserviceDescriptions.toArray(array); return array; } - + //Serialize as a String public String serialize() { @@ -80,30 +79,30 @@ //Construct the webservices.xml definitions List qnames = new ArrayList(); Iterator iter = webserviceDescriptions.iterator(); - while(iter != null && iter.hasNext()) + while (iter != null && iter.hasNext()) { WebserviceDescriptionMetaData wmd = (WebserviceDescriptionMetaData)iter.next(); qnames.addAll(wmd.getPortComponentQNames()); - } - createHeader( buffer,qnames ); - for(WebserviceDescriptionMetaData wm:webserviceDescriptions) - buffer.append(wm.serialize()); + } + createHeader(buffer, qnames); + for (WebserviceDescriptionMetaData wm : webserviceDescriptions) + buffer.append(wm.serialize()); buffer.append("</webservices>"); - return buffer.toString(); + return buffer.toString(); } - - private void createHeader( StringBuilder buf, List qnames) - { + + private void createHeader(StringBuilder buf, List qnames) + { buf.append("<webservices xmlns='http://java.sun.com/xml/ns/j2ee'"); - buf.append(" xmlns:xsi='"+Constants.NS_SCHEMA_XSI+"'"); + buf.append(" xmlns:xsi='" + Constants.NS_SCHEMA_XSI + "'"); //Lets append the port type namespaces Iterator iter = qnames.iterator(); - while(iter != null && iter.hasNext()) + while (iter != null && iter.hasNext()) { QName qn = (QName)iter.next(); buf.append(" xmlns:").append(qn.getPrefix()).append("='").append(qn.getNamespaceURI()).append("'"); - } + } buf.append(" xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'"); - buf.append(" version='1.1' >"); + buf.append(" version='1.1' >"); } } Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDL11Reader.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -142,10 +142,10 @@ private void cleanupTemporaryFiles() { - for (File current : tempFiles) - { - current.delete(); - } + for (File current : tempFiles) + { + current.delete(); + } } // process all bindings not within service separetly @@ -496,7 +496,7 @@ if (wsaAction != null) destOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_ACTION_IN, wsaAction.getLocalPart())); - List<String> paramOrder = (List<String>)srcOperation.getParameterOrdering(); + List<String> paramOrder = (List<String>) srcOperation.getParameterOrdering(); if (paramOrder != null) { for (String name : paramOrder) @@ -506,24 +506,12 @@ } } - WSDLInterfaceOperationInput rpcInput = null; - if (Constants.URI_STYLE_RPC == destOperation.getStyle()) + WSDLInterfaceOperationInput rpcInput = new WSDLInterfaceOperationInput(destOperation); + for (Part srcPart : (List<Part>) srcMessage.getOrderedParts(paramOrder)) { - rpcInput = new WSDLInterfaceOperationInput(destOperation);; - - // This is really a place holder, but also the actual value used in WSDL-2.0 RPC bindings - rpcInput.setElement(destOperation.getQName()); - rpcInput.setMessageName(srcMessage.getQName()); - destOperation.addInput(rpcInput); - } - - for (Part srcPart : (List<Part>)srcMessage.getOrderedParts(paramOrder)) - { - if (Constants.URI_STYLE_DOC == destOperation.getStyle()) + if (Constants.URI_STYLE_IRI == destOperation.getStyle()) { WSDLInterfaceOperationInput destInput = new WSDLInterfaceOperationInput(destOperation); - destInput.setPartName(srcPart.getName()); - QName elementName = messagePartToElementName(srcWsdl, srcPortType, srcOperation, srcMessage, srcPart); destInput.setElement(elementName); @@ -531,19 +519,30 @@ destInput.setMessageName(srcMessage.getQName()); destOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_IN, srcMessage.getQName().getLocalPart())); + destInput.setPartName(srcPart.getName()); + destOperation.addInput(destInput); } else { // If we don't have a type then we aren't a valid RPC parameter - // This could happen on a header element, in which case the binding will pick it up later + // This could happen on a header element, in which case the + // binding will pick it up QName xmlType = srcPart.getTypeName(); if (xmlType != null) rpcInput.addChildPart(new WSDLRPCPart(srcPart.getName(), destWsdl.registerQName(xmlType))); - else + else messagePartToElementName(srcWsdl, srcPortType, srcOperation, srcMessage, srcPart); } } + if (Constants.URI_STYLE_RPC == destOperation.getStyle()) + { + // This is really a place holder, but also the actual value used in + // WSDL 2.0 RPC bindings + rpcInput.setElement(destOperation.getQName()); + rpcInput.setMessageName(srcMessage.getQName()); + destOperation.addInput(rpcInput); + } } } @@ -560,11 +559,11 @@ log.trace("processOperationOutput: " + srcMessage.getQName()); destOperation.setPattern(Constants.WSDL20_PATTERN_IN_OUT); - QName wsaAction = (QName)srcOutput.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSA_ACTION); + QName wsaAction = (QName) srcOutput.getExtensionAttribute(Constants.WSDL_ATTRIBUTE_WSA_ACTION); if (wsaAction != null) destOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_ACTION_OUT, wsaAction.getLocalPart())); - List<String> paramOrder = (List<String>)srcOperation.getParameterOrdering(); + List<String> paramOrder = (List<String>) srcOperation.getParameterOrdering(); if (paramOrder != null) { for (String name : paramOrder) @@ -574,36 +573,30 @@ WSDLRPCSignatureItem item = destOperation.getRpcSignatureitem(name); if (item != null) item.setDirection(Direction.INOUT); - else destOperation.addRpcSignatureItem(new WSDLRPCSignatureItem(name, Direction.OUT)); + else + destOperation.addRpcSignatureItem(new WSDLRPCSignatureItem(name, Direction.OUT)); } } } - WSDLInterfaceOperationOutput rpcOutput = null; - if (Constants.URI_STYLE_RPC == destOperation.getStyle()) + WSDLInterfaceOperationOutput rpcOutput = new WSDLInterfaceOperationOutput(destOperation); + for (Part srcPart : (List<Part>) srcMessage.getOrderedParts(null)) { - rpcOutput = new WSDLInterfaceOperationOutput(destOperation); - // This is really a place holder, but also the actual value used in WSDL-2.0 RPC bindings - QName name = destOperation.getQName(); - rpcOutput.setElement(new QName(name.getNamespaceURI(), name.getLocalPart() + "Response")); - rpcOutput.setMessageName(srcMessage.getQName()); - destOperation.addOutput(rpcOutput); - } - - for (Part srcPart : (List<Part>)srcMessage.getOrderedParts(null)) - { - if (Constants.URI_STYLE_DOC == destOperation.getStyle()) + if (Constants.URI_STYLE_IRI == destOperation.getStyle()) { WSDLInterfaceOperationOutput destOutput = new WSDLInterfaceOperationOutput(destOperation); - destOutput.setPartName(srcPart.getName()); QName elementName = messagePartToElementName(srcWsdl, srcPortType, srcOperation, srcMessage, srcPart); destOutput.setElement(elementName); // Lets remember the Message name destOutput.setMessageName(srcMessage.getQName()); - destOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_OUT, srcMessage.getQName().getLocalPart())); + destOperation.addProperty(new WSDLProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_OUT, srcMessage.getQName() + .getLocalPart())); + // Remember the original part name + destOutput.setPartName(srcPart.getName()); + destOperation.addOutput(destOutput); } else @@ -614,10 +607,20 @@ QName xmlType = srcPart.getTypeName(); if (xmlType != null) rpcOutput.addChildPart(new WSDLRPCPart(srcPart.getName(), destWsdl.registerQName(xmlType))); - else + else messagePartToElementName(srcWsdl, srcPortType, srcOperation, srcMessage, srcPart); } } + + if (Constants.URI_STYLE_RPC == destOperation.getStyle()) + { + // This is really a place holder, but also the actual value used in + // WSDL 2.0 RPC bindings + QName name = destOperation.getQName(); + rpcOutput.setElement(new QName(name.getNamespaceURI(), name.getLocalPart() + "Response")); + rpcOutput.setMessageName(srcMessage.getQName()); + destOperation.addOutput(rpcOutput); + } } private void processOperationFaults(Operation srcOperation, WSDLInterfaceOperation destOperation, WSDLInterface destInterface) @@ -730,23 +733,23 @@ if (operationStyle == null) { - for (ExtensibilityElement extElement : (List<ExtensibilityElement>)srcBinding.getExtensibilityElements()) + for (ExtensibilityElement extElement : (List<ExtensibilityElement>) srcBinding.getExtensibilityElements()) { QName elementType = extElement.getElementType(); if (extElement instanceof SOAPBinding) { - SOAPBinding soapBinding = (SOAPBinding)extElement; + SOAPBinding soapBinding = (SOAPBinding) extElement; operationStyle = soapBinding.getStyle(); } else if (SOAP12_BINDING.equals(elementType)) { - Element domElement = ((UnknownExtensibilityElement)extElement).getElement(); + Element domElement = ((UnknownExtensibilityElement) extElement).getElement(); operationStyle = getOptionalAttribute(domElement, "style"); } } } - return ("rpc".equals(operationStyle)) ? Constants.URI_STYLE_RPC : Constants.URI_STYLE_DOC; + return ("rpc".equals(operationStyle)) ? Constants.URI_STYLE_RPC : Constants.URI_STYLE_IRI; } private void processBinding(Definition srcWsdl, Binding srcBinding) @@ -891,14 +894,11 @@ interface ReferenceCallback { void removeReference(QName element); - void removeRPCPart(String partName); - QName getXmlType(String partName); } - private void processBindingInput(WSDLBindingOperation destBindingOperation, final WSDLInterfaceOperation destIntfOperation, - final BindingOperation srcBindingOperation, BindingInput srcBindingInput) + private void processBindingInput(WSDLBindingOperation destBindingOperation, final WSDLInterfaceOperation destIntfOperation, final BindingOperation srcBindingOperation, BindingInput srcBindingInput) { log.trace("processBindingInput"); @@ -907,7 +907,8 @@ WSDLBindingOperationInput input = new WSDLBindingOperationInput(destBindingOperation); destBindingOperation.addInput(input); - ReferenceCallback cb = new ReferenceCallback() { + ReferenceCallback cb = new ReferenceCallback() + { public QName getXmlType(String partName) { return srcBindingOperation.getOperation().getInput().getMessage().getPart(partName).getTypeName(); @@ -930,8 +931,7 @@ processBindingReference(destBindingOperation, destIntfOperation, soap11Body, extList, input, cb); } - private void processBindingOutput(WSDLBindingOperation destBindingOperation, final WSDLInterfaceOperation destIntfOperation, - final BindingOperation srcBindingOperation, BindingOutput srcBindingOutput) + private void processBindingOutput(WSDLBindingOperation destBindingOperation, final WSDLInterfaceOperation destIntfOperation, final BindingOperation srcBindingOperation, BindingOutput srcBindingOutput) { log.trace("processBindingInput"); @@ -940,7 +940,8 @@ WSDLBindingOperationOutput output = new WSDLBindingOperationOutput(destBindingOperation); destBindingOperation.addOutput(output); - ReferenceCallback cb = new ReferenceCallback() { + ReferenceCallback cb = new ReferenceCallback() + { public QName getXmlType(String partName) { return srcBindingOperation.getOperation().getOutput().getMessage().getPart(partName).getTypeName(); @@ -964,8 +965,9 @@ processBindingReference(destBindingOperation, destIntfOperation, soap11Body, extList, output, cb); } - private void processBindingReference(WSDLBindingOperation destBindingOperation, WSDLInterfaceOperation destIntfOperation, QName soap11Body, - List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, ReferenceCallback callback) + + private void processBindingReference(WSDLBindingOperation destBindingOperation, WSDLInterfaceOperation destIntfOperation, + QName soap11Body, List<ExtensibilityElement> extList, WSDLBindingMessageReference reference, ReferenceCallback callback) { for (ExtensibilityElement extElement : extList) { @@ -986,7 +988,7 @@ throw new WSException("Could not determine element name from header: " + partName); reference.addSoapHeader(new WSDLSOAPHeader(elementName, partName)); - if (Constants.URI_STYLE_DOC == destIntfOperation.getStyle()) + if (Constants.URI_STYLE_IRI == destIntfOperation.getStyle()) { callback.removeReference(elementName); } @@ -1028,9 +1030,9 @@ // Found content types in this part if (name != null) { - QName xmlType = callback.getXmlType(name); + QName xmlType = callback.getXmlType(name); reference.addMimePart(new WSDLMIMEPart(name, xmlType, types)); - if (Constants.URI_STYLE_DOC == destIntfOperation.getStyle()) + if (Constants.URI_STYLE_IRI == destIntfOperation.getStyle()) { // A mime part must be defined as <part type=""> callback.removeReference(new QName(name)); @@ -1045,6 +1047,7 @@ } } + private void processEncodingStyle(ExtensibilityElement extElement, WSDLBindingOperation destBindingOperation) { log.trace("processEncodingStyle"); Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceMessageReference.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -193,6 +193,8 @@ /** * Gets the WSDL 1.1 part name. + * + * @return the part name */ public String getPartName() { @@ -200,14 +202,6 @@ } /** - * Sets the WSDL 1.1 part name. - */ - public void setPartName(String partName) - { - this.partName = partName; - } - - /** * Sets the WSDL 1.1 message name. * * @param messageName The part name @@ -227,6 +221,16 @@ return messageName; } + /** + * Sets the WSDL 1.1 part name. + * + * @param partName The part name + */ + public void setPartName(String partName) + { + this.partName = partName; + } + public int compareTo(Object o) { int c = -1; Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/WSDLInterfaceOperation.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -30,6 +30,7 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; +import org.jboss.ws.metadata.wsdl.WSDLRPCSignatureItem.Direction; // $Id$ @@ -167,7 +168,8 @@ WSDLInterfaceOperationInput opInput = null; for (WSDLInterfaceOperationInput auxInput : inputs.values()) { - if (partName.equals(auxInput.getPartName())) + WSDLProperty property = auxInput.getProperty(Constants.WSDL_PROPERTY_PART_NAME); + if (property != null && property.getValue().equals(partName)) opInput = auxInput; } return opInput; @@ -199,7 +201,8 @@ WSDLInterfaceOperationOutput opOutput = null; for (WSDLInterfaceOperationOutput auxOutput : outputs.values()) { - if (partName.equals(auxOutput.getPartName())) + WSDLProperty property = auxOutput.getProperty(Constants.WSDL_PROPERTY_PART_NAME); + if (property != null && property.getValue().equals(partName)) opOutput = auxOutput; } return opOutput; @@ -237,7 +240,8 @@ public void addRpcSignatureItem(WSDLRPCSignatureItem item) { - item.setPosition(rpcSignatureItems.size()); + if (item.getDirection() != Direction.RETURN) + item.setPosition(rpcSignatureItems.size()); rpcSignatureItems.put(item.getName(), item); } Modified: trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java =================================================================== --- trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/metadata/wsdl/xmlschema/WSSchemaUtils.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -48,7 +48,6 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; -import org.jboss.ws.utils.DOMWriter; import org.jboss.xb.binding.NamespaceRegistry; /** @@ -570,10 +569,7 @@ buf.append("<restriction base='" + baseType + "'>"); StringList list = ((XSSimpleTypeDefinition)xstype).getLexicalEnumeration(); for (int i = 0; i < list.getLength(); i++) - { - String listItem = DOMWriter.normalize(list.item(i), false); - buf.append("<enumeration value='" + listItem +"'/>"); - } + buf.append("<enumeration value='" + list.item(i) +"'/>"); buf.append("</restriction>"); } buf.append("</simpleType>"); Modified: trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -26,7 +26,9 @@ import java.io.IOException; import java.net.URL; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Set; @@ -51,6 +53,7 @@ import org.jboss.ws.metadata.wsdl.WSDLException; import org.jboss.ws.metadata.wsdl.WSDLInterface; import org.jboss.ws.metadata.wsdl.WSDLInterfaceFault; +import org.jboss.ws.metadata.wsdl.WSDLInterfaceMessageReference; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationInput; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; @@ -299,7 +302,7 @@ QName xmlType = new QName(element.getTypeDefinition().getNamespace(), element.getTypeDefinition().getName()); JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1; - generateParameter(buf, null, xmlName, xmlType, xsmodel, element.getTypeDefinition(), array, !element.getNillable()); + generateParameter(buf, xmlName, xmlType, xsmodel, element.getTypeDefinition(), array, !element.getNillable(), false); buf.append(" ").append(getMethodParam(xmlName)); } } @@ -348,7 +351,7 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); boolean array = particle.getMaxOccursUnbounded() || particle.getMaxOccurs() > 1; StringBuilder buf = new StringBuilder(); - generateParameter(buf, null, xmlName, xmlType, xsmodel, element.getTypeDefinition(), array, !element.getNillable()); + generateParameter(buf, xmlName, xmlType, xsmodel, element.getTypeDefinition(), array, !element.getNillable(), false); return buf.toString(); } } @@ -374,105 +377,16 @@ String returnType = null; StringBuilder paramBuffer = new StringBuilder(); - boolean first = true; + WSDLInterfaceOperationInput input = WSDLUtils.getWsdl11Input(op); - if (input != null) + WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(op); + if (isDocument()) { - - if (isDocument()) - { - QName xmlName = input.getElement(); - QName xmlType = input.getXMLType(); - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - - if (unwrap) - { - unwrapRequest(paramBuffer, xt); - } - else - { - generateParameter(paramBuffer, input, xmlName, xmlType, xsmodel, xt, false, true); - paramBuffer.append(" ").append(getMethodParam(xmlName)); - } - } - else - { - for (WSDLRPCPart part :input.getChildParts()) - { - if (!first) - { - paramBuffer.append(","); - first = false; - } - QName xmlName = new QName(part.getName()); - QName xmlType = part.getType(); - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - - generateParameter(paramBuffer, input, xmlName, xmlType, xsmodel, xt, false, true); - paramBuffer.append(" ").append(getMethodParam(xmlName)); - } - } - + returnType = appendDocParameters(paramBuffer, input, output); } - - // This needs to be rewritten, custom types, and custom holders should be supported - WSDLInterfaceOperationInput output = WSDLUtils.getWsdl11Input(op); - if (output != null) + else { - if (isDocument()) - { - QName xmlName = output.getElement(); - QName xmlType = output.getXMLType(); - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - - if (unwrap) - { - returnType = unwrapResponse(xt); - } - else if (output.getPartName().equals(input.getPartName())) - { - // IN-OUT, we skip it - } - else - { - returnType = getReturnType(xmlName, xmlType, xt); - } - } - else - { - boolean returnParameter = true; - for (WSDLRPCPart part : output.getChildParts()) - { - // IN-OUT - if (input.getChildPart(part.getName()) != null) - continue; - - QName xmlName = new QName(part.getName()); - QName xmlType = part.getType(); - JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); - XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); - - if (returnParameter) - { - returnType = getReturnType(xmlName, xmlType, xt); - returnParameter = false; - } - else - { - if (!first) - { - paramBuffer.append(","); - first = false; - } - - generateParameter(paramBuffer, output, xmlName, xmlType, xsmodel, xt, false, true); - paramBuffer.append(" ").append(getMethodParam(xmlName)); - } - } - } + returnType = appendRpcParameters(paramBuffer, op, output); } if (returnType == null) @@ -505,7 +419,10 @@ Class cl = getJavaType(faultXMLType, false); if (cl == null) - buf.append(seiPkgName + "." + cleanUpFaultName(faultXMLType.getLocalPart())); + { + String faultTypeName = (!xt.getAnonymous()) ? faultXMLType.getLocalPart() : faultXMLName.getLocalPart(); + buf.append(seiPkgName + "." + cleanUpFaultName(faultTypeName)); + } else buf.append( cl.getName()); buf.append( "," ); @@ -516,8 +433,86 @@ } } - private void generateParameter(StringBuilder buf, WSDLInterfaceOperationInput in, QName xmlName, QName xmlType, JBossXSModel xsmodel, XSTypeDefinition xt, boolean array, boolean primitive) throws IOException + private String appendRpcParameters(StringBuilder paramBuffer, WSDLInterfaceOperation op, WSDLInterfaceOperationOutput output) throws IOException { + String returnType = null; + boolean first = true; + + RPCSignature signature = new RPCSignature(op); + for (WSDLRPCPart part : signature.parameters()) + { + + if (first) + first = false; + else + paramBuffer.append(", "); + + QName xmlName = new QName(part.getName()); + QName xmlType = part.getType(); + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + + boolean holder = output != null && output.getChildPart(part.getName()) != null; + generateParameter(paramBuffer, xmlName, xmlType, xsmodel, xt, false, true, holder); + paramBuffer.append(" ").append(getMethodParam(xmlName)); + } + + if (signature.returnParameter() != null) + { + QName xmlName = new QName(signature.returnParameter().getName()); + QName xmlType = signature.returnParameter().getType(); + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + returnType = getReturnType(xmlName, xmlType, xt); + } + + return returnType; + } + + private String appendDocParameters(StringBuilder paramBuffer, WSDLInterfaceOperationInput input, WSDLInterfaceOperationOutput output) throws IOException + { + String returnType = null; + boolean holder = false; + if (input != null && input.getElement() != null) + { + QName xmlName = input.getElement(); + QName xmlType = input.getXMLType(); + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + + if (unwrap) + { + unwrapRequest(paramBuffer, xt); + } + else + { + holder = output != null && xmlName.equals(output.getElement()); + generateParameter(paramBuffer, xmlName, xmlType, xsmodel, xt, false, true, holder); + paramBuffer.append(" ").append(getMethodParam(xmlName)); + } + } + if (!holder && output != null && output.getElement() != null) + { + QName xmlName = output.getElement(); + QName xmlType = output.getXMLType(); + JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); + XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); + + if (unwrap) + { + returnType = unwrapResponse(xt); + } + else + { + returnType = getReturnType(xmlName, xmlType, xt); + } + } + + return returnType; + } + + private void generateParameter(StringBuilder buf, QName xmlName, QName xmlType, JBossXSModel xsmodel, XSTypeDefinition xt, boolean array, boolean primitive, boolean holder) throws IOException + { WrappedArray wrappedArray = new WrappedArray(xt); String arraySuffix = (array) ? "[]" : ""; if (wrappedArray.unwrap()) @@ -533,10 +528,12 @@ Class cl = getJavaType(xmlType, primitive); //Class cl = typeMapping.getJavaType(inqname,true); - if (in != null) - cl = this.checkNeedHolder(in,cl); + if(cl != null) { + if (holder) + cl = utils.getHolder(cl); + buf.append(JavaUtils.getSourceName(cl) + arraySuffix); } else @@ -656,29 +653,9 @@ faultname = faultname.substring(0, index); } } - return faultname; + return JavaUtils.capitalize(faultname); } - /** - * Check if an holder is required for the input type - * @param wout - * @param cls - * @return - */ - private Class checkNeedHolder(WSDLInterfaceOperationInput win, Class cls) - { - //Now check if the part exists in both input and output => Need Holder - WSDLInterfaceOperation op = win.getWsdlOperation(); - QName el = win.getElement(); - - WSDLInterfaceOperationOutput out = op.getOutput(el); - - if(out != null) - cls = utils.getHolder(cls); //Need a holder - - return cls; - } - private void checkTypeMapping() { if(typeMapping == null) Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -77,6 +77,7 @@ import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; +import org.jboss.ws.tools.RPCSignature; import org.jboss.ws.tools.ToolsUtils; import org.jboss.ws.tools.WSToolsConstants; import org.jboss.ws.tools.mapping.MappingFileGenerator; @@ -232,11 +233,11 @@ { WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop); MethodParamPartsMapping mpin = null; - String partName = win.getPartName(); if (win != null) { QName xmlName = win.getElement(); QName xmlType = win.getXMLType(); + String partName = win.getPartName(); String wsdlMessageName = win.getMessageName().getLocalPart(); if (shouldUnwrap()) @@ -264,7 +265,7 @@ XSTypeDefinition xt = schemaModel.getTypeDefinition(xmlType.getLocalPart(),xmlType.getNamespaceURI()); unwrapResponse(semm, messageName, xt); } - else if (partName != null && partName.equals(output.getPartName())) + else if (win.getElement() != null && win.getElement().equals(output.getElement())) { mpin.getWsdlMessageMapping().setParameterMode("INOUT"); } @@ -279,6 +280,26 @@ } } + private String getMode(WSDLInterfaceOperation op, String name) + { + WSDLInterfaceOperationInput in = WSDLUtils.getWsdl11Input(op); + WSDLInterfaceOperationOutput out = WSDLUtils.getWsdl11Output(op); + + boolean i = false ,o = false; + if (in != null && in.getChildPart(name) != null) + i = true; + if (out != null && out.getChildPart(name) != null) + o = true; + + if (i && o) + return "INOUT"; + + if (o) + return "OUT"; + + return "IN"; + } + private void constructRPCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop) { WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop); @@ -286,63 +307,36 @@ throw new WSException("RPC endpoints require an input message"); String wsdlMessageName = win.getMessageName().getLocalPart(); - HashMap<String, MethodParamPartsMapping> map = new HashMap<String, MethodParamPartsMapping>(); + RPCSignature signature = new RPCSignature(wiop); + int i = 0; + for (WSDLRPCPart part : signature.parameters()) { - int i = 0; - for (WSDLRPCPart part : win.getChildParts()) - { - QName xmlName = new QName(part.getName()); - QName xmlType = part.getType(); - String partName = part.getName(); + String partName = part.getName(); + QName xmlName = new QName(partName); + QName xmlType = part.getType(); + MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm,xmlName, xmlType, + i++, wsdlMessageName, getMode(wiop, part.getName()), partName, false, true); - MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm,xmlName, xmlType, - i++, wsdlMessageName, "IN", partName, false, true); - - map.put(partName, mpin); - semm.addMethodParamPartsMapping(mpin); - } + semm.addMethodParamPartsMapping(mpin); } - WSDLInterfaceOperationOutput output = WSDLUtils.getWsdl11Output(wiop); - if (output != null) + WSDLRPCPart returnParameter = signature.returnParameter(); + if (returnParameter != null) { - int i = 0; - boolean first = true; - for (WSDLRPCPart part : output.getChildParts()) - { - QName xmlName = new QName(part.getName()); - QName xmlType = part.getType(); - String partName = part.getName(); + String partName = returnParameter.getName(); + QName xmlName = new QName(partName); + QName xmlType = returnParameter.getType(); - MethodParamPartsMapping mapping = map.get(partName); - if (mapping != null) - { - mapping.getWsdlMessageMapping().setParameterMode("INOUT"); - continue; - } - - // The first OUT param is our return value - if (first) - { - WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); - wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, false, true)); - QName messageName = output.getMessageName(); - wrvm.setWsdlMessage(new QName(messageName.getNamespaceURI(), messageName.getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS)); - wrvm.setWsdlMessagePartName(partName); - semm.setWsdlReturnValueMapping(wrvm); - first = false; - } - else - { - mapping = getMethodParamPartsMapping(semm, xmlName, xmlType, i++, wsdlMessageName, "OUT", partName, false, true); - semm.addMethodParamPartsMapping(mapping); - } - } + WsdlReturnValueMapping wrvm = new WsdlReturnValueMapping(semm); + wrvm.setMethodReturnValue(getJavaTypeAsString(xmlName, xmlType, false, true)); + QName messageName = WSDLUtils.getWsdl11Output(wiop).getMessageName(); + wrvm.setWsdlMessage(new QName(messageName.getNamespaceURI(), messageName.getLocalPart(), WSToolsConstants.WSTOOLS_CONSTANT_MAPPING_WSDL_MESSAGE_NS)); + wrvm.setWsdlMessagePartName(partName); + semm.setWsdlReturnValueMapping(wrvm); } } - public void constructJavaXmlTypeMapping(JavaWsdlMapping jwm) { WSDLInterface[] intfArr = wsdlDefinitions.getInterfaces(); 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-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/tools/jaxws/WSDLGenerator.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -72,7 +72,8 @@ WSDLEndpoint wsdlEndpoint = new WSDLEndpoint(service); wsdlEndpoint.setQName(endpoint.getQName()); wsdlEndpoint.setName(new NCName(endpoint.getQName().getLocalPart())); - wsdlEndpoint.setAddress(endpoint.getEndpointAddress()); + String address = endpoint.getEndpointAddress(); + wsdlEndpoint.setAddress(address == null ? "REPLACE_WITH_ACTUAL_URL" : address); service.addEndpoint(wsdlEndpoint); WSDLInterface wsdlInterface = new WSDLInterface(wsdl); @@ -158,7 +159,7 @@ protected void processOperationDOC(WSDLInterfaceOperation interfaceOperation, WSDLBindingOperation bindingOperation, OperationMetaData operation) { - interfaceOperation.setStyle(Constants.URI_STYLE_DOC); + interfaceOperation.setStyle(Constants.URI_STYLE_IRI); WSDLInterfaceOperationInput input = new WSDLInterfaceOperationInput(interfaceOperation); WSDLBindingOperationInput bindingInput = new WSDLBindingOperationInput(bindingOperation); @@ -266,7 +267,7 @@ if (twoWay && param.getMode() != ParameterMode.IN) output.addChildPart(part); } - addSignatureItem(interfaceOperation, param, true); + addSignatureItem(interfaceOperation, param, false); } interfaceOperation.addInput(input); Modified: trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java =================================================================== --- trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/tools/metadata/ToolsEndpointMetaData.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -42,7 +42,7 @@ { super(service, name, interfaceQName, Type.JAXRPC); } - + @Override public Object getEndpointConfig() { Modified: trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java =================================================================== --- trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/main/java/org/jboss/ws/utils/DOMWriter.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -98,21 +98,12 @@ private boolean wroteXMLDeclaration; // The node that started the write private Node rootNode; - // True if we want namespace completion - private boolean completeNamespaces = true; - + public DOMWriter(Writer w) { this.out = new PrintWriter(w); } - public DOMWriter(Writer w, String charsetName) - { - this.out = new PrintWriter(w); - this.charsetName = charsetName; - this.writeXMLDeclaration = true; - } - public DOMWriter(OutputStream stream) { try @@ -166,17 +157,6 @@ return this; } - /** - * Set wheter subelements should have their namespaces completed. - * Setting this to false may lead to invalid XML fragments. - * The default is true. - */ - public DOMWriter setCompleteNamespaces(boolean complete) - { - this.completeNamespaces = complete; - return this; - } - public boolean isPrettyprint() { return prettyprint; @@ -201,9 +181,9 @@ * Set wheter the XML declaration should be written. * The default is false. */ - public DOMWriter setWriteXMLDeclaration(boolean flag) + public DOMWriter setWriteXMLDeclaration(boolean writeXMLDeclaration) { - this.writeXMLDeclaration = flag; + this.writeXMLDeclaration = writeXMLDeclaration; return this; } @@ -230,10 +210,7 @@ if (charsetName != null) out.print(" encoding='" + charsetName + "'"); - out.print("?>"); - if (prettyprint) - out.println(); - + out.println("?>"); wroteXMLDeclaration = true; } @@ -255,7 +232,7 @@ break; } - // print element with attributes + // print element with attributes case Node.ELEMENT_NODE: { Element element = (Element)node; @@ -270,7 +247,7 @@ out.print('<'); out.print(nodeName); - + Map nsMap = new HashMap(); String elPrefix = node.getPrefix(); if (elPrefix != null) @@ -278,15 +255,15 @@ String nsURI = getNamespaceURI(elPrefix, element, rootNode); nsMap.put(elPrefix, nsURI); } - + Attr attrs[] = sortAttributes(node.getAttributes()); for (int i = 0; i < attrs.length; i++) { Attr attr = attrs[i]; String atPrefix = attr.getPrefix(); String atName = attr.getNodeName(); - String atValue = normalize(attr.getNodeValue(), canonical); - + String atValue = normalize(attr.getNodeValue()); + if (atPrefix != null && !atPrefix.equals("xmlns") && !atPrefix.equals("xml")) { String nsURI = getNamespaceURI(atPrefix, element, rootNode); @@ -300,23 +277,20 @@ nsMap.put(typePrefix, typeURI); } } - + out.print(" " + atName + "='" + atValue + "'"); } - + // Add missing namespace declaration - if (completeNamespaces) + Iterator itPrefix = nsMap.keySet().iterator(); + while (itPrefix.hasNext()) { - Iterator itPrefix = nsMap.keySet().iterator(); - while (itPrefix.hasNext()) + String prefix = (String)itPrefix.next(); + String nsURI = (String)nsMap.get(prefix); + if (nsURI == null) { - String prefix = (String)itPrefix.next(); - String nsURI = (String)nsMap.get(prefix); - if (nsURI == null) - { - nsURI = getNamespaceURI(prefix, element, null); - out.print(" xmlns:" + prefix + "='" + nsURI + "'"); - } + nsURI = getNamespaceURI(prefix, element, null); + out.print(" xmlns:" + prefix + "='" + nsURI + "'"); } } @@ -372,7 +346,7 @@ { if (canonical) { - out.print(normalize(node.getNodeValue(), canonical)); + out.print(normalize(node.getNodeValue())); } else { @@ -386,7 +360,7 @@ // print text case Node.TEXT_NODE: { - String text = normalize(node.getNodeValue(), canonical); + String text = normalize(node.getNodeValue()); if (prettyprint == false || text.trim().length() > 0) out.print(text); break; @@ -526,7 +500,7 @@ } /** Normalizes the given string. */ - public static String normalize(String s, boolean canonical) + private String normalize(String s) { StringBuffer str = new StringBuffer(); Modified: trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxws.xml 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/ant/build-jars-jaxws.xml 2006-10-23 19:15:52 UTC (rev 1290) @@ -169,7 +169,6 @@ <war warfile="${build.test.dir}/libs/jaxws-jsr181-webparam.war" webxml="${build.test.dir}/resources/jaxws/jsr181/webparam/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingService.class"/> - <include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingServiceImpl.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingDocument*.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webparam/SecurityHeader.class"/> </classes> Modified: trunk/src/test/build.xml =================================================================== --- trunk/src/test/build.xml 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/build.xml 2006-10-23 19:15:52 UTC (rev 1290) @@ -140,7 +140,6 @@  <path id="jbossws.client.classpath"> - <pathelement location="${build.lib.dir}/${jbossws.client.jar}"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/commons-logging.jar"/> <pathelement location="${jboss.client}/javassist.jar"/> @@ -150,6 +149,7 @@ <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.client}/jbossretro-rt.jar"/> <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/> + <pathelement location="${jboss.client}/${jbossws.client.jar}"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/mail.jar"/> </path> Modified: trunk/src/test/etc/log4j.xml =================================================================== --- trunk/src/test/etc/log4j.xml 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/etc/log4j.xml 2006-10-23 19:15:52 UTC (rev 1290) @@ -53,7 +53,7 @@  <category name="org.jboss.ws"> - <priority value="DEBUG"/> + <priority value="TRACE" class="org.jboss.logging.XLevel"/> </category> <category name="org.jboss.remoting"> Modified: trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/java/org/jboss/test/ws/common/wsdl11/WSDL11TestCase.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -66,7 +66,7 @@ // check the echoString operation WSDLInterfaceOperation wsdlOperation = wsdlInterface.getOperation(new NCName("echoString")); - assertEquals(Constants.URI_STYLE_DOC, wsdlOperation.getStyle()); + assertEquals(Constants.URI_STYLE_IRI, wsdlOperation.getStyle()); WSDLInterfaceOperationInput wsdlInput = wsdlOperation.getInput(new QName(TARGET_NAMESPACE, "echoString")); assertEquals(new QName(TARGET_NAMESPACE, "echoString"), wsdlInput.getXMLType()); @@ -75,7 +75,7 @@ // check the echoSimpleUserType operation wsdlOperation = wsdlInterface.getOperation(new NCName("echoSimpleUserType")); - assertEquals(Constants.URI_STYLE_DOC, wsdlOperation.getStyle()); + assertEquals(Constants.URI_STYLE_IRI, wsdlOperation.getStyle()); wsdlInput = wsdlOperation.getInput(new QName(TARGET_NAMESPACE, "echoSimpleUserType")); assertEquals(new QName(TARGET_NAMESPACE, "echoSimpleUserType"), wsdlInput.getXMLType()); Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -37,35 +37,37 @@ public class JMSTransportTestCase extends JBossWSTest { private static CountDownLatch count; - + public static Test suite() throws Exception { count = new CountDownLatch(1); return JBossWSTestSetup.newTestSetup(JMSTransportTestCase.class, "jaxrpc-samples-jmstransport.sar"); } - + /** * Send the message to the specified queue */ public void testSOAPMessageToEndpointQueue() throws Exception { - String reqMessage = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - "<env:Body>" + - "<ns1:getContactInfo xmlns:ns1='http://org.jboss.ws/samples/jmstransport'>" + - "<String_1>mafia</String_1>" + - "</ns1:getContactInfo>" + - "</env:Body>" + + System.out.println("FIXME: JBWS-1312"); + if (true) return; + String reqMessage = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + "<env:Body>" + + "<ns1:getContactInfo xmlns:ns1='http://org.jboss.ws/samples/jmstransport'>" + + "<String_1>mafia</String_1>" + + "</ns1:getContactInfo>" + + "</env:Body>" + "</env:Envelope>"; - String resMessage = + String resMessage = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - "<env:Header/>" + - "<env:Body>" + - "<ns1:getContactInfoResponse xmlns:ns1='http://org.jboss.ws/samples/jmstransport'>" + - "<result>The 'mafia' boss is currently out of office, please call again.</result>" + - "</ns1:getContactInfoResponse>" + - "</env:Body>" + + "<env:Header/>" + + "<env:Body>" + + "<ns1:getContactInfoResponse xmlns:ns1='http://org.jboss.ws/samples/jmstransport'>" + + "<result>The 'mafia' boss is currently out of office, please call again.</result>" + + "</ns1:getContactInfoResponse>" + + "</env:Body>" + "</env:Envelope>"; InitialContext context = new InitialContext(); @@ -90,10 +92,10 @@ // Please explain to me why this does not work relieably // count.await(); Thread.sleep(500); - + assertNotNull("Expected response message", responseListener.resMessage); assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage)); - + con.stop(); session.close(); con.close(); @@ -102,7 +104,7 @@ public static class ResponseListener implements MessageListener { public String resMessage; - + public void onMessage(Message msg) { TextMessage textMessage = (TextMessage)msg; Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -64,4 +64,31 @@ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit_handler"); } -} + + /* (non-Javadoc) + * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestOptimized() + */ + @Override + public void testRequestOptimized() throws Exception + { + System.out.println("FIXME: JBWS-1313"); + } + + /* (non-Javadoc) + * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestResponseOptimized() + */ + @Override + public void testRequestResponseOptimized() throws Exception + { + System.out.println("FIXME: JBWS-1313"); + } + + /* (non-Javadoc) + * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testResponseOptimized() + */ + @Override + public void testResponseOptimized() throws Exception + { + System.out.println("FIXME: JBWS-1313"); + } +} \ No newline at end of file Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -77,27 +77,27 @@ assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length); } - public void testSimpleTypesOptimized() throws Exception - { - DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); - byte[] bytesOut = port.pingSimple("s1|s1", bytesIn); - - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - } - - public void testSimpleTypesResponseOptimized() throws Exception - { - DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); - byte[] bytesIn = IOUtils.convertToBytes(dh); - ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - - byte[] bytesOut = port.pingSimple("s0|s1", bytesIn); - - assertNotNull("Return xopContent was null", bytesOut); - assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); - - } +// public void testSimpleTypesOptimized() throws Exception +// { +// DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); +// byte[] bytesIn = IOUtils.convertToBytes(dh); +// ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); +// byte[] bytesOut = port.pingSimple("s1|s1", bytesIn); +// +// assertNotNull("Return xopContent was null", bytesOut); +// assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); +// } +// +// public void testSimpleTypesResponseOptimized() throws Exception +// { +// DataHandler dh = new DataHandler("Simple type plain text attachment", "text/plain"); +// byte[] bytesIn = IOUtils.convertToBytes(dh); +// ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); +// +// byte[] bytesOut = port.pingSimple("s0|s1", bytesIn); +// +// assertNotNull("Return xopContent was null", bytesOut); +// assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); +// +// } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -41,7 +41,7 @@ * @version $Id$ * @since Sep 22, 2006 */ -public class XOPHandlerTestCase extends XOPBase { +public class XOPHandlerTestCase extends XOPBase { public static Test suite() { @@ -60,4 +60,31 @@ //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit_handler"); } + + /* (non-Javadoc) + * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestOptimized() + */ + @Override + public void testRequestOptimized() throws Exception + { + System.out.println("FIXME: JBWS-1313"); + } + + /* (non-Javadoc) + * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testRequestResponseOptimized() + */ + @Override + public void testRequestResponseOptimized() throws Exception + { + System.out.println("FIXME: JBWS-1313"); + } + + /* (non-Javadoc) + * @see org.jboss.test.ws.jaxrpc.xop.rpclit.XOPBase#testResponseOptimized() + */ + @Override + public void testResponseOptimized() throws Exception + { + System.out.println("FIXME: JBWS-1313"); + } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/complex/client/JSR181ComplexTestCase.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -21,13 +21,18 @@ */ package org.jboss.test.ws.jaxws.jsr181.complex.client; +import java.io.File; +import java.net.URL; import java.util.Arrays; import java.util.Calendar; +import javax.xml.rpc.Service; + import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.jaxrpc.ServiceFactoryImpl; /** * @@ -43,6 +48,18 @@ return JBossWSTestSetup.newTestSetup(JSR181ComplexTestCase.class, /* "jaxws-jsr181-complex.war" */ ""); } + @Override + protected void setUp() throws Exception + { + super.setUp(); +// URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jsr181-complex/RegistrationService?wsdl"); +// File mappingFile = new File("resources/jaxws/jsr181/complex/jaxrpc-mapping.xml"); +// ServiceFactoryImpl factory = new ServiceFactoryImpl(); + //Service service = factory.createService(wsdlURL, null, mappingFile.toURL()); + //port = (RegistrationService) service.getPort(RegistrationService.class); + } + + public void testRegistration() throws Exception { System.out.println("FIXME: JBWS-1297"); Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/JSR181WebParamTestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/JSR181WebParamTestCase.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/JSR181WebParamTestCase.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -21,15 +21,21 @@ */ package org.jboss.test.ws.jaxws.jsr181.webparam; +import java.io.File; import java.net.URL; import javax.xml.namespace.QName; -import javax.xml.ws.Service; +import javax.xml.rpc.ParameterMode; +import javax.xml.rpc.Service; import junit.framework.Test; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.jaxrpc.CallImpl; +import org.jboss.ws.jaxrpc.ServiceFactoryImpl; +import org.jboss.ws.metadata.OperationMetaData; +import org.jboss.ws.metadata.ParameterMetaData; /** * Test the JSR-181 annotation: javax.jws.WebParam @@ -50,17 +56,21 @@ public void testEcho() throws Exception { QName serviceName = new QName(targetNS, "PingServiceService"); + QName portName = new QName(targetNS, "PingServicePort"); URL wsdlURL = new URL(endpointURL + "?wsdl"); - Service service = Service.create(wsdlURL, serviceName); - PingService port = (PingService)service.getPort(PingService.class); + File mappingFile = new File("resources/jaxws/jsr181/webparam/jaxrpc-mapping.xml"); + assertTrue(mappingFile.exists()); + ServiceFactoryImpl factory = new ServiceFactoryImpl(); + Service service = factory.createService(wsdlURL, serviceName, mappingFile.toURL()); + CallImpl call = (CallImpl)service.createCall(portName, "echo"); + PingDocument doc = new PingDocument("Hello Kermit"); - PingDocument ret = port.echo(doc); - assertEquals(doc, ret); + Object retObj = call.invoke(new Object[]{doc}); + assertEquals(doc, retObj); } - /* public void testPingOneWay() throws Exception { QName serviceName = new QName(targetNS, "PingServiceService"); @@ -135,5 +145,4 @@ Object retObj = call.invoke(new Object[]{doc, secHeader}); assertNull("Expected null return", retObj); } - */ } \ No newline at end of file Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/PingService.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/PingService.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webparam/PingService.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -28,6 +28,8 @@ import javax.jws.soap.SOAPBinding; import javax.xml.ws.Holder; +import org.jboss.logging.Logger; + /** * Test the JSR-181 annotation: javax.jws.WebParam * @@ -36,19 +38,36 @@ */ @WebService(targetNamespace = "http://www.openuri.org/jsr181/WebParamExample") @SOAPBinding(style = SOAPBinding.Style.RPC) -public interface PingService +public class PingService { + // Provide logging + private static Logger log = Logger.getLogger(PingService.class); + @WebMethod - public PingDocument echo(PingDocument p); + public PingDocument echo(PingDocument p) + { + log.info("echo: " + p); + return p; + } @Oneway @WebMethod(operationName = "PingOneWay") - public void ping(@WebParam(name = "Ping") PingDocument p); + public void ping(@WebParam(name = "Ping") PingDocument p) + { + log.info("ping: " + p); + } @WebMethod(operationName = "PingTwoWay") - public void ping(@WebParam(name = "Ping", mode = WebParam.Mode.INOUT) Holder<PingDocument> p); + public void ping(@WebParam(name = "Ping", mode = WebParam.Mode.INOUT) Holder<PingDocument> p) + { + log.info("ping: " + p.value); + p.value = new PingDocument(p.value.getContent() + " Response"); + } @Oneway @WebMethod(operationName = "SecurePing") - public void ping(@WebParam(name = "Ping") PingDocument p, @WebParam(name = "SecHeader", header = true) SecurityHeader secHdr); + public void ping(@WebParam(name = "Ping") PingDocument p, @WebParam(name = "SecHeader", header = true) SecurityHeader secHdr) + { + log.info("ping: " + p + "," + secHdr); + } } \ No newline at end of file Modified: trunk/src/test/resources/jaxws/jsr181/webparam/WEB-INF/web.xml =================================================================== --- trunk/src/test/resources/jaxws/jsr181/webparam/WEB-INF/web.xml 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/resources/jaxws/jsr181/webparam/WEB-INF/web.xml 2006-10-23 19:15:52 UTC (rev 1290) @@ -7,7 +7,7 @@ <servlet> <servlet-name>TestService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jsr181.webparam.PingServiceImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.jsr181.webparam.PingService</servlet-class> </servlet> <servlet-mapping> Copied: trunk/src/test/resources/jaxws/jsr181/webparam/jaxrpc-mapping.xml (from rev 1273, trunk/src/test/resources/jaxws/jsr181/webparam/jaxrpc-mapping.xml) Modified: trunk/src/test/resources/tools/holders/java/org/jboss/test/HoldersServiceInterface.java =================================================================== --- trunk/src/test/resources/tools/holders/java/org/jboss/test/HoldersServiceInterface.java 2006-10-23 17:26:08 UTC (rev 1289) +++ trunk/src/test/resources/tools/holders/java/org/jboss/test/HoldersServiceInterface.java 2006-10-23 19:15:52 UTC (rev 1290) @@ -23,6 +23,6 @@ public interface HoldersServiceInterface extends java.rmi.Remote { - public javax.xml.rpc.holders.FloatHolder processHolder( javax.xml.rpc.holders.CalendarHolder id, + public float processHolder( javax.xml.rpc.holders.CalendarHolder id, javax.xml.rpc.holders.IntHolder amount) throws java.rmi.RemoteException; }

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r1289 - in branches/tdiesler/trunk: . src/ant src/test src/test/ant src/test/java/org/jboss/test/ws/jaxws/webserviceref src/test/resources/jaxws/webserviceref/META-INF

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-10-23 13:26:08 -0400 (Mon, 23 Oct 2006) New Revision: 1289 Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml Modified: branches/tdiesler/trunk/src/ant/build-thirdparty.xml branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml branches/tdiesler/trunk/src/test/build.xml branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java branches/tdiesler/trunk/version.properties Log: partial commit Modified: branches/tdiesler/trunk/src/ant/build-thirdparty.xml =================================================================== --- branches/tdiesler/trunk/src/ant/build-thirdparty.xml 2006-10-23 16:09:18 UTC (rev 1288) +++ branches/tdiesler/trunk/src/ant/build-thirdparty.xml 2006-10-23 17:26:08 UTC (rev 1289) @@ -31,6 +31,7 @@ <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/hibernate/${hibernate}/lib/hibernate3.jar" dest="${thirdparty.dir}/hibernate3.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> @@ -65,6 +66,7 @@ <pathelement location="${thirdparty.dir}/javassist.jar"/> <pathelement location="${thirdparty.dir}/concurrent.jar"/> <pathelement location="${thirdparty.dir}/log4j.jar"/> + <pathelement location="${thirdparty.dir}/hibernate3.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> Modified: branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml 2006-10-23 16:09:18 UTC (rev 1288) +++ branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml 2006-10-23 17:26:08 UTC (rev 1289) @@ -409,6 +409,20 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/> </classes> </war> + <jar destfile="${build.test.dir}/libs/jaxws-webserviceref-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/webserviceref/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxws/webserviceref/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + <include name="wsdl/**"/> + </metainf> + <manifest> + <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.ApplicationClient"/> + </manifest> + </jar>  <war warfile="${build.test.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${build.test.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml"> Modified: branches/tdiesler/trunk/src/test/build.xml =================================================================== --- branches/tdiesler/trunk/src/test/build.xml 2006-10-23 16:09:18 UTC (rev 1288) +++ branches/tdiesler/trunk/src/test/build.xml 2006-10-23 17:26:08 UTC (rev 1289) @@ -175,8 +175,10 @@ <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/> <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> <pathelement location="${jboss.lib}/jboss-system.jar"/> <pathelement location="${jboss.server.lib}/jboss.jar"/> + <pathelement location="${thirdparty.dir}/hibernate3.jar"/> <pathelement location="${thirdparty.dir}/qdox.jar"/> <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> <pathelement location="${thirdparty.dir}/policy-1.0.jar"/> Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-23 16:09:18 UTC (rev 1288) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java 2006-10-23 17:26:08 UTC (rev 1289) @@ -0,0 +1,44 @@ +/* + * 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.webserviceref; + +import javax.xml.ws.WebServiceRef; + +public class ApplicationClient +{ + @WebServiceRef(wsdlLocation = "resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl") + public TestEndpointService service; + + public static void main(String[] args) + { + ApplicationClient client = new ApplicationClient(); + String outStr = client.echo("Hello world!"); + System.out.println(outStr); + } + + public String echo(String inStr) + { + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + String outStr = port.echo(inStr); + return outStr; + } +} Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java 2006-10-23 16:09:18 UTC (rev 1288) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java 2006-10-23 17:26:08 UTC (rev 1289) @@ -25,22 +25,22 @@ import java.net.MalformedURLException; import java.net.URL; -import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.ws.Service; import junit.framework.Test; +import org.jboss.ejb3.client.ClientLauncher; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; /** - * Test the JSR-181 annotation: javax.jws.WebService + * Test the JAXWS annotation: javax.xml.ws.WebServiceref * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 + * @author Thomas.Diesler(a)jboss.com + * @since 23-Oct-2005 */ public class WebServiceRefTestCase extends JBossWSTest { @@ -48,13 +48,19 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(WebServiceRefTestCase.class, "jaxws-webserviceref.war"); + return JBossWSTestSetup.newTestSetup(WebServiceRefTestCase.class, "jaxws-webserviceref.war, jaxws-webserviceref-client.jar"); } + public void testWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } + public void testDynamicProxy() throws Exception { - assertWSDLAccess(); - URL wsdlURL = new File("resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); Service service = Service.create(wsdlURL, qname); @@ -65,11 +71,8 @@ assertEquals(helloWorld, retObj); } - private void assertWSDLAccess() throws MalformedURLException + public void testApplicationClient() throws Exception { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); + ClientLauncher.launch(ApplicationClient.class.getName(), "jbossws-client", new String[0]); } } Added: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml =================================================================== --- branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml 2006-10-23 16:09:18 UTC (rev 1288) +++ branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml 2006-10-23 17:26:08 UTC (rev 1289) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<application-client version="5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application-client_5.xsd"> + + <display-name>TestEndpointService</display-name> + +</application-client> Property changes on: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/application-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml =================================================================== --- branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml 2006-10-23 16:09:18 UTC (rev 1288) +++ branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml 2006-10-23 17:26:08 UTC (rev 1289) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 5.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_5_0.dtd"> + +<jboss-client> + <jndi-name>jbossws-client</jndi-name> +</jboss-client> Property changes on: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/jboss-client.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/tdiesler/trunk/version.properties =================================================================== --- branches/tdiesler/trunk/version.properties 2006-10-23 16:09:18 UTC (rev 1288) +++ branches/tdiesler/trunk/version.properties 2006-10-23 17:26:08 UTC (rev 1289) @@ -27,6 +27,7 @@ apache-log4j=1.2.8 apache-xalan=j_2.7.0 apache-xerces=2.7.1 +hibernate=3.2.0.CR2 jboss-backport-concurrent=2.1.0.GA jboss-jbossretro=1.0.2.GA jbpm-bpel=1.1.Beta2

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r1288 - in branches/tdiesler/trunk/src/test: ant java/org/jboss/test/ws/jaxws java/org/jboss/test/ws/jaxws/webserviceref resources/jaxws resources/jaxws/webserviceref resources/jaxws/webserviceref/META-INF resources/jaxws/webserviceref/META-INF/wsdl resources/jaxws/webserviceref/WEB-INF

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-10-23 12:09:18 -0400 (Mon, 23 Oct 2006) New Revision: 1288 Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/Echo.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EchoResponse.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ObjectFactory.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/package-info.java branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/ branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/ branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/ branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/ branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/web.xml Modified: branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml Log: Add @WebServiceRef test case Modified: branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/ant/build-jars-jaxws.xml 2006-10-23 16:09:18 UTC (rev 1288) @@ -403,6 +403,13 @@ </metainf> </jar> +  + <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"/> + </classes> + </war> +  <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"> Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/Echo.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/Echo.java 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/Echo.java 2006-10-23 16:09:18 UTC (rev 1288) @@ -0,0 +1,62 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for echo complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="echo"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echo", propOrder = { + "arg0" +}) +public class Echo { + + @XmlElement(namespace = "http://org.jboss.ws/wsref") + protected String arg0; + + /** + * Gets the value of the arg0 property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getArg0() { + return arg0; + } + + /** + * Sets the value of the arg0 property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setArg0(String value) { + this.arg0 = value; + } + +} Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/Echo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EchoResponse.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EchoResponse.java 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EchoResponse.java 2006-10-23 16:09:18 UTC (rev 1288) @@ -0,0 +1,62 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for echoResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="echoResponse"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "echoResponse", propOrder = { + "_return" +}) +public class EchoResponse { + + @XmlElement(name = "return", namespace = "http://org.jboss.ws/wsref") + protected String _return; + + /** + * Gets the value of the return property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getReturn() { + return _return; + } + + /** + * Sets the value of the return property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setReturn(String value) { + this._return = value; + } + +} Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/EchoResponse.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ObjectFactory.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ObjectFactory.java 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ObjectFactory.java 2006-10-23 16:09:18 UTC (rev 1288) @@ -0,0 +1,71 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.webserviceref package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _EchoResponse_QNAME = new QName("http://org.jboss.ws/wsref", "echoResponse"); + private final static QName _Echo_QNAME = new QName("http://org.jboss.ws/wsref", "echo"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.webserviceref + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link EchoResponse } + * + */ + public EchoResponse createEchoResponse() { + return new EchoResponse(); + } + + /** + * Create an instance of {@link Echo } + * + */ + public Echo createEcho() { + return new Echo(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link EchoResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/wsref", name = "echoResponse") + public JAXBElement<EchoResponse> createEchoResponse(EchoResponse value) { + return new JAXBElement<EchoResponse>(_EchoResponse_QNAME, EchoResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Echo }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/wsref", name = "echo") + public JAXBElement<Echo> createEcho(Echo value) { + return new JAXBElement<Echo>(_Echo_QNAME, Echo.class, null, value); + } + +} Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/ObjectFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java 2006-10-23 16:09:18 UTC (rev 1288) @@ -0,0 +1,36 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebResult; +import javax.jws.WebService; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0_01-b59-fcs + * Generated source version: 2.0 + * + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref") +public interface TestEndpoint { + + + /** + * + * @param arg0 + * @return + * returns java.lang.String + */ + @WebMethod + @WebResult(targetNamespace = "http://org.jboss.ws/wsref") + @RequestWrapper(localName = "echo", targetNamespace = "http://org.jboss.ws/wsref", className = "org.jboss.test.ws.jaxws.webserviceref.Echo") + @ResponseWrapper(localName = "echoResponse", targetNamespace = "http://org.jboss.ws/wsref", className = "org.jboss.test.ws.jaxws.webserviceref.EchoResponse") + public String echo( + @WebParam(name = "arg0", targetNamespace = "http://org.jboss.ws/wsref") + String arg0); + +} Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java 2006-10-23 16:09:18 UTC (rev 1288) @@ -0,0 +1,41 @@ +/* + * 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.webserviceref; + +import javax.jws.WebMethod; +import javax.jws.WebService; + +/** + * Test the JAXWS annotation: javax.jws.WebServiceRef + * + * @author Thomas.Diesler(a)jboss.org + * @since 23-Oct-2006 + */ +@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/wsref") +public class TestEndpointImpl +{ + @WebMethod + public String echo(String input) + { + return input; + } +} Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java 2006-10-23 16:09:18 UTC (rev 1288) @@ -0,0 +1,53 @@ + +package org.jboss.test.ws.jaxws.webserviceref; + +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; + + +/** + * This class was generated by the JAXWS SI. + * JAX-WS RI 2.0_01-b59-fcs + * Generated source version: 2.0 + * + */ +@WebServiceClient(name = "TestEndpointService", targetNamespace = "http://org.jboss.ws/wsref", wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") +public class TestEndpointService + extends Service +{ + + private final static URL TESTENDPOINTSERVICE_WSDL_LOCATION; + + static { + URL url = null; + try { + url = new URL("file:./resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + TESTENDPOINTSERVICE_WSDL_LOCATION = url; + } + + public TestEndpointService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } + + public TestEndpointService() { + super(TESTENDPOINTSERVICE_WSDL_LOCATION, new QName("http://org.jboss.ws/wsref", "TestEndpointService")); + } + + /** + * + * @return + * returns TestEndpoint + */ + @WebEndpoint(name = "TestEndpointPort") + public TestEndpoint getTestEndpointPort() { + return (TestEndpoint)super.getPort(new QName("http://org.jboss.ws/wsref", "TestEndpointPort"), TestEndpoint.class); + } + +} Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java 2006-10-23 16:09:18 UTC (rev 1288) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.webserviceref; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import javax.naming.InitialContext; +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; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; + +/** + * Test the JSR-181 annotation: javax.jws.WebService + * + * @author Thomas.Diesler(a)jboss.org + * @since 29-Apr-2005 + */ +public class WebServiceRefTestCase extends JBossWSTest +{ + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-webserviceref"; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(WebServiceRefTestCase.class, "jaxws-webserviceref.war"); + } + + public void testDynamicProxy() throws Exception + { + assertWSDLAccess(); + + URL wsdlURL = new File("resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl").toURL(); + QName qname = new QName("http://org.jboss.ws/wsref", "TestEndpointService"); + Service service = Service.create(wsdlURL, qname); + TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class); + + String helloWorld = "Hello world!"; + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + private void assertWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } +} Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/WebServiceRefTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/package-info.java =================================================================== --- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/package-info.java 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/package-info.java 2006-10-23 16:09:18 UTC (rev 1288) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.ws/wsref") +package org.jboss.test.ws.jaxws.webserviceref; Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/webserviceref/package-info.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl =================================================================== --- branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl 2006-10-23 16:09:18 UTC (rev 1288) @@ -0,0 +1,50 @@ + +<definitions name='TestEndpointService' targetNamespace='http://org.jboss.ws/wsref' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://org.jboss.ws/wsref' version='1.0' xmlns:tns='http://org.jboss.ws/wsref' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:element name='echo' type='tns:echo'/> + <xs:element name='echoResponse' type='tns:echoResponse'/> + <xs:complexType name='echo'> + <xs:sequence> + <xs:element form='qualified' minOccurs='0' name='arg0' type='xs:string'/> + </xs:sequence> + </xs:complexType> + <xs:complexType name='echoResponse'> + <xs:sequence> + <xs:element form='qualified' minOccurs='0' name='return' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='TestEndpoint_echo'> + <part element='tns:echo' name='echo'/> + </message> + <message name='TestEndpoint_echoResponse'> + <part element='tns:echoResponse' name='echoResponse'/> + </message> + <portType name='TestEndpoint'> + <operation name='echo' parameterOrder='echo'> + <input message='tns:TestEndpoint_echo'/> + <output message='tns:TestEndpoint_echoResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echo'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal'/> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='TestEndpointService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='http://@jbosstest.host.name@:8080/jaxws-webserviceref/TestEndpoint'/> + </port> + </service> +</definitions> \ No newline at end of file Property changes on: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/META-INF/wsdl/TestEndpoint.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/web.xml =================================================================== --- branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/web.xml 2006-10-23 15:00:50 UTC (rev 1287) +++ branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/web.xml 2006-10-23 16:09:18 UTC (rev 1288) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.webserviceref.TestEndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Property changes on: branches/tdiesler/trunk/src/test/resources/jaxws/webserviceref/WEB-INF/web.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 6 months

1
0
0 / 0

JBossWS SVN: r1287 - branches/tdiesler

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2006-10-23 11:00:50 -0400 (Mon, 23 Oct 2006) New Revision: 1287 Added: branches/tdiesler/trunk/ Log: recreate userbranch Copied: branches/tdiesler/trunk (from rev 1286, trunk)

17 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits October 2006