[jbossws-commits] JBossWS SVN: r5949 - in stack/native/trunk: ant-import and 17 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-03-12 15:02:14 -0400 (Wed, 12 Mar 2008) New Revision: 5949 Added: stack/native/trunk/src/main/java/org/jboss/ws/annotation/EndpointFeature.java stack/native/trunk/src/main/java/org/jboss/ws/annotation/FastInfoset.java stack/native/trunk/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java stack/native/trunk/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/FeatureResolver.java stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java stack/native/trunk/src/test/resources/jaxws/fastinfoset/ stack/native/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/ stack/native/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml Removed: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java stack/native/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/ stack/native/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml Modified: stack/native/trunk/.classpath stack/native/trunk/ant-import-tests/build-jars-jaxws.xml stack/native/trunk/ant-import-tests/build-testsuite.xml stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/ant-import/jbossws-deploy-macros.xml stack/native/trunk/src/main/java/org/jboss/ws/annotation/SchemaValidation.java stack/native/trunk/src/main/java/org/jboss/ws/core/client/EndpointInfo.java stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java stack/native/trunk/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java stack/native/trunk/version.properties Log: [JBWS-925] Add support for FastInfoset Modified: stack/native/trunk/.classpath =================================================================== --- stack/native/trunk/.classpath 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/.classpath 2008-03-12 19:02:14 UTC (rev 5949) @@ -39,5 +39,6 @@ <classpathentry kind="lib" path="thirdparty/jboss-jaxb-intros.jar"/> <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/> <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/> + <classpathentry kind="lib" path="thirdparty/FastInfoset.jar"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-12 19:02:14 UTC (rev 5949) @@ -111,6 +111,7 @@ <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-fi/${sun-fi}/lib/FastInfoset.jar" dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> @@ -134,13 +135,14 @@ <target name="thirdparty-classpath" depends="thirdparty-get"> <!-- The compile classpath for jbossws core --> - <path id="thirdparty.classpath"> + <path id="thirdparty.classpath"> <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar --> <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> - - <pathelement location="${thirdparty.dir}/ant.jar"/> - <pathelement location="${thirdparty.dir}/activation.jar"/> + + <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> + <pathelement location="${thirdparty.dir}/ant.jar"/> + <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/getopt.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> @@ -153,6 +155,7 @@ <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/> + <pathelement location="${thirdparty.dir}/jboss-jaxb-intros.jar"/> <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/> <pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/> <pathelement location="${thirdparty.dir}/jboss-remoting.jar"/> @@ -167,8 +170,7 @@ <pathelement location="${thirdparty.dir}/xalan.jar"/> <pathelement location="${thirdparty.dir}/xmlsec.jar"/> <pathelement location="${thirdparty.dir}/xercesImpl.jar"/> - <pathelement location="${thirdparty.dir}/jboss-jaxb-intros.jar"/> - </path> + </path> </target> Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 19:02:14 UTC (rev 5949) @@ -30,6 +30,7 @@ </patternset> <patternset id="jbossws.client.patternset"> + <include name="**/FastInfoset.jar"/> <include name="**/jbossws-client.jar"/> <include name="**/jbossws-common.jar"/> <include name="**/jbossws-framework.jar"/> @@ -75,6 +76,7 @@ </patternset> <patternset id="jbossws.service.lib.patternset"> + <include name="**/FastInfoset.jar"/> <include name="**/jboss-jaxb-intros.jar"/> <include name="**/jbossws-core.jar"/> <include name="**/policy.jar"/> Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2008-03-12 19:02:14 UTC (rev 5949) @@ -106,6 +106,13 @@ </fileset> </jar> + <!-- jaxws-fastinfoset --> + <war warfile="${tests.output.dir}/libs/jaxws-fastinfoset.war" webxml="${tests.output.dir}/resources/jaxws/fastinfoset/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.class"/> + </classes> + </war> + <!-- jaxws-handlerlifecycle --> <war warfile="${tests.output.dir}/libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/resources/jaxws/handlerlifecycle/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2008-03-12 19:02:14 UTC (rev 5949) @@ -39,6 +39,7 @@ </path> <path id="tests.extra.classpath"> + <pathelement location="${core.dir}/thirdparty/FastInfoset.jar"/> <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> <pathelement location="${core.dir}/thirdparty/policy.jar"/> Copied: stack/native/trunk/src/main/java/org/jboss/ws/annotation/EndpointFeature.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/annotation/EndpointFeature.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/annotation/EndpointFeature.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/annotation/EndpointFeature.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,46 @@ +/* + * 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.annotation; + +// $Id$ + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * A endpoint feature meta annotation + * + * @author Thomas.Diesler(a)jboss.com + * @since 29-Feb-2008 + */ +@Retention(value = RetentionPolicy.RUNTIME) +@Target(value = { ElementType.ANNOTATION_TYPE }) +public @interface EndpointFeature { + + /** + * The id of this endpoint feature + */ + String id() default ""; + +} Copied: stack/native/trunk/src/main/java/org/jboss/ws/annotation/FastInfoset.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/annotation/FastInfoset.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/annotation/FastInfoset.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/annotation/FastInfoset.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -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.ws.annotation; + +// $Id$ + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import org.jboss.ws.feature.FastInfosetFeature; + +/** + * This feature represents the use of FastInfoset + * + * @author Thomas.Diesler(a)jboss.com + * @since 29-Feb-2008 + */ +@Retention(value = RetentionPolicy.RUNTIME) +@Target(value = { ElementType.TYPE }) +@EndpointFeature( id = FastInfosetFeature.ID) +public @interface FastInfoset { + + /** + * Specifies if the feature is enabled or disabled + */ + boolean enabled() default true; +} Modified: stack/native/trunk/src/main/java/org/jboss/ws/annotation/SchemaValidation.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/annotation/SchemaValidation.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/annotation/SchemaValidation.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -29,6 +29,7 @@ import java.lang.annotation.Target; import org.jboss.ws.extensions.validation.StrictlyValidErrorHandler; +import org.jboss.ws.feature.SchemaValidationFeature; /** * This feature represents the use of schema validation with a @@ -39,6 +40,7 @@ */ @Retention(value = RetentionPolicy.RUNTIME) @Target(value = { ElementType.TYPE }) +@EndpointFeature( id = SchemaValidationFeature.ID) public @interface SchemaValidation { /** @@ -54,4 +56,9 @@ * If this is not specified the @{ValidationErrorHandler} will be used. */ Class errorHandler() default StrictlyValidErrorHandler.class; + + /** + * Specifies if the feature is enabled or disabled + */ + boolean enabled() default true; } Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/client/EndpointInfo.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/client/EndpointInfo.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -27,7 +27,10 @@ import java.util.Map; import java.util.Properties; +import javax.xml.ws.WebServiceFeature; + import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.FeatureResolver; /** A wrapper object that associates the target address with some metadata * @@ -38,9 +41,11 @@ { private String targetAddress; private Map<String, Object> properties; + private FeatureResolver features; public EndpointInfo(EndpointMetaData epMetaData, String targetAddress, Map<String, Object> callProps) { + this.features = epMetaData.getFeatureResolver(); this.targetAddress = targetAddress; this.properties = callProps; @@ -81,6 +86,11 @@ return targetAddress; } + public <T extends WebServiceFeature> boolean isFeatureEnabled(Class<T> key) + { + return features.isFeatureEnabled(key); + } + public boolean equals(Object obj) { if (!(obj instanceof EndpointInfo)) Copied: stack/native/trunk/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/client/FastInfosetConnectionHTTP.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -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.ws.core.client; + +// $Id$ + +import org.jboss.remoting.marshal.Marshaller; +import org.jboss.remoting.marshal.UnMarshaller; +import org.jboss.ws.core.soap.FastInfosetMarshaller; +import org.jboss.ws.core.soap.FastInfosetUnMarshaller; + +/** + * SOAPConnection implementation + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-Mar-2008 + */ +public class FastInfosetConnectionHTTP extends SOAPProtocolConnectionHTTP +{ + public UnMarshaller getUnmarshaller() + { + return new FastInfosetUnMarshaller(); + } + + public Marshaller getMarshaller() + { + return new FastInfosetMarshaller(); + } +} Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -54,10 +54,12 @@ import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.metadata.config.EndpointProperty; import org.jboss.ws.metadata.config.CommonConfig; +import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.extensions.wsrm.transport.RMChannel; import org.jboss.ws.extensions.wsrm.transport.RMTransportHelper; import org.jboss.ws.extensions.wsrm.transport.RMMetadata; +import org.jboss.ws.feature.FastInfosetFeature; /** * SOAPConnection implementation. @@ -306,12 +308,14 @@ // May be overridden through endpoint config if (msgContext != null) { - CommonConfig config = msgContext.getEndpointMetaData().getConfig(); + EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); + CommonConfig config = epMetaData.getConfig(); // chunksize settings String chunkSizeValue = config.getProperty(EndpointProperty.CHUNKED_ENCODING_SIZE); int chunkSize = chunkSizeValue != null ? Integer.valueOf(chunkSizeValue) : -1; - if (chunkSize > 0) + boolean isFastInfoset = epMetaData.isFeatureEnabled(FastInfosetFeature.class); + if (chunkSize > 0 && isFastInfoset == false) { clientConfig.put(EndpointProperty.CHUNKED_ENCODING_SIZE, chunkSizeValue); } Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/client/RemoteConnectionFactory.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -21,6 +21,7 @@ */ package org.jboss.ws.core.client; +import org.jboss.ws.feature.FastInfosetFeature; import org.jboss.wsf.spi.util.ServiceLoader; // $Id$ @@ -48,6 +49,9 @@ if (key == null) throw new IllegalArgumentException("Cannot obtain remote connetion for: " + targetAddress); + if (epInfo.isFeatureEnabled(FastInfosetFeature.class)) + key += ".fastinfoset"; + RemoteConnection con = (RemoteConnection)ServiceLoader.loadService(key, null); if (con == null) throw new IllegalArgumentException("Cannot obtain remote connetion for: " + key); Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -24,18 +24,15 @@ // $Id$ import java.io.IOException; -import java.util.Iterator; import java.util.Map; import java.util.Properties; -import javax.xml.soap.MimeHeader; import javax.xml.soap.MimeHeaders; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import org.jboss.remoting.marshal.Marshaller; import org.jboss.remoting.marshal.UnMarshaller; -import org.jboss.ws.WSException; import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.soap.SOAPMessageMarshaller; import org.jboss.ws.core.soap.SOAPMessageUnMarshallerHTTP; @@ -46,7 +43,6 @@ * * @author Thomas.Diesler(a)jboss.org * @author <a href="mailto:jason@stacksmash.com">Jason T. Greene</a> - * * @since 02-Apr-2007 */ public class SOAPProtocolConnectionHTTP extends HTTPRemotingConnection @@ -87,9 +83,9 @@ protected void populateHeaders(MessageAbstraction reqMessage, Map<String, Object> metadata) { super.populateHeaders(reqMessage, metadata); - + Properties props = (Properties)metadata.get("HEADER"); - + // R2744 A HTTP request MESSAGE MUST contain a SOAPAction HTTP header field // with a quoted value equal to the value of the soapAction attribute of // soapbind:operation, if present in the corresponding WSDL description. @@ -115,6 +111,6 @@ { props.put("SOAPAction", "\"\""); } - + } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -560,12 +560,11 @@ { if (features != null) { - Set<WebServiceFeature> featureSet = new HashSet<WebServiceFeature>(); - for (WebServiceFeature feature : features) - featureSet.add(feature); - EndpointMetaData epMetaData = ((StubExt)stub).getEndpointMetaData(); - epMetaData.setWebServiceFeatures(featureSet); + for (WebServiceFeature feature : features) + { + epMetaData.addFeature(feature); + } } } Copied: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetEnvelopeBuilder.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,82 @@ +/* + * 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.core.soap; + +//$Id$ + +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; + +import javax.xml.namespace.QName; +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; + +import org.jboss.util.NotImplementedException; +import org.jboss.ws.Constants; +import org.jboss.ws.core.CommonSOAPFaultException; +import org.jboss.wsf.common.DOMUtils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import com.sun.xml.fastinfoset.dom.DOMDocumentParser; + +/** + * A SOAPEnvelope builder for FastInfoset + * + * @author Thomas.Diesler(a)jboss.com + * @since 12-Mar-2008 + */ +public class FastInfosetEnvelopeBuilder extends EnvelopeBuilderDOM +{ + @Override + public SOAPEnvelope build(SOAPMessage soapMessage, InputStream ins, boolean ignoreParseError) throws IOException, SOAPException + { + // Parse the XML input stream + Element domEnv = null; + try + { + DOMDocumentParser parser = new DOMDocumentParser(); + Document resDoc = DOMUtils.getDocumentBuilder().newDocument(); + parser.parse(resDoc, ins); + domEnv = resDoc.getDocumentElement(); + } + catch (Exception ex) + { + if (ignoreParseError) + { + return null; + } + QName faultCode = Constants.SOAP11_FAULT_CODE_CLIENT; + throw new CommonSOAPFaultException(faultCode, ex.getMessage()); + } + + return build(soapMessage, domEnv); + } + + @Override + public SOAPEnvelope build(SOAPMessage soapMessage, Reader reader, boolean ignoreParseError) throws IOException, SOAPException + { + throw new NotImplementedException(); + } +} Copied: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetMarshaller.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,90 @@ +/* + * 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.core.soap; + +import java.io.IOException; +import java.io.OutputStream; + +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; + +import org.jboss.logging.Logger; +import org.jboss.remoting.InvocationRequest; +import org.jboss.remoting.invocation.OnewayInvocation; +import org.jboss.remoting.marshal.Marshaller; + +import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 12-Mar-2008 + */ +public class FastInfosetMarshaller implements Marshaller +{ + // Provide logging + private static Logger log = Logger.getLogger(FastInfosetMarshaller.class); + + /** + * Marshaller will need to take the dataObject and convert + * into primitive java data types and write to the + * given output. + * + * @param dataObject Object to be writen to output + * @param output The data output to write the object + * data to. + */ + public void write(Object dataObject, OutputStream output) throws IOException + { + if (dataObject instanceof InvocationRequest) + dataObject = ((InvocationRequest)dataObject).getParameter(); + + if (dataObject instanceof OnewayInvocation) + dataObject = ((OnewayInvocation)dataObject).getParameters()[0]; + + if ((dataObject instanceof SOAPMessage) == false) + throw new IllegalArgumentException("Not a SOAPMessage: " + dataObject); + + SOAPMessageImpl soapMessage = (SOAPMessageImpl)dataObject; + if (soapMessage.getAttachments().hasNext()) + throw new IllegalStateException("Attachments not supported with FastInfoset"); + + try + { + SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); + DOMDocumentSerializer serializer = new DOMDocumentSerializer(); + serializer.setOutputStream(output); + serializer.serialize(soapEnv); + } + catch (SOAPException ex) + { + IOException ioex = new IOException("Cannot serialize SOAP Envelope"); + ioex.initCause(ex); + throw ioex; + } + } + + public Marshaller cloneMarshaller() throws CloneNotSupportedException + { + return new FastInfosetMarshaller(); + } +} Copied: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/FastInfosetUnMarshaller.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,46 @@ +/* + * 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.core.soap; + +import org.jboss.ws.core.CommonMessageContext; +import org.jboss.ws.metadata.umdm.EndpointMetaData; + +/** + * @author Thomas.Diesler(a)jboss.org + * @since 12-Mar-2008 + */ +public class FastInfosetUnMarshaller extends SOAPMessageUnMarshallerHTTP +{ + @Override + protected MessageFactoryImpl getMessageFactory() + { + CommonMessageContext context = MessageContextAssociation.peekMessageContext(); + EndpointMetaData epMetaData = context != null ? context.getEndpointMetaData() : null; + + MessageFactoryImpl factory = super.getMessageFactory(); + if (epMetaData != null) + factory.setFeatureResolver(epMetaData.getFeatureResolver()); + + return factory; + } + +} Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -39,12 +39,15 @@ import javax.xml.soap.SOAPConstants; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; +import javax.xml.ws.WebServiceFeature; import javax.xml.ws.Service.Mode; import org.jboss.logging.Logger; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder; +import org.jboss.ws.feature.FastInfosetFeature; +import org.jboss.ws.metadata.umdm.FeatureResolver; import org.jboss.wsf.common.IOUtils; import org.jboss.wsf.spi.util.ServiceLoader; @@ -64,21 +67,18 @@ private Mode serviceMode; // The style used by this MessageFactory private Style style; + // The features used by this MessageFactory + private FeatureResolver features = new FeatureResolver(); // Used if the style is dynamic private boolean dynamic; - private EnvelopeBuilder envelopeBuilder; - public MessageFactoryImpl() { envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE; - envelopeBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName()); } public MessageFactoryImpl(String protocol) throws SOAPException { - envelopeBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), EnvelopeBuilderDOM.class.getName()); - if (SOAPConstants.SOAP_1_1_PROTOCOL.equals(protocol) || SOAPConstants.DEFAULT_SOAP_PROTOCOL.equals(protocol)) envNamespace = SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE; else if (SOAPConstants.SOAP_1_2_PROTOCOL.equals(protocol)) @@ -137,6 +137,16 @@ this.serviceMode = serviceMode; } + public void addFeature(WebServiceFeature feature) + { + this.features.addFeature(feature); + } + + public void setFeatureResolver(FeatureResolver features) + { + this.features = features; + } + /** * Creates a new SOAPMessage object with the default SOAPPart, SOAPEnvelope, * SOAPBody, and SOAPHeader objects. Profile-specific message factories can @@ -255,11 +265,19 @@ soapMessage.setAttachments(attachments); // Get the SOAPEnvelope builder + EnvelopeBuilder envBuilder; + if (features.isFeatureEnabled(FastInfosetFeature.class)) + { + envBuilder = new FastInfosetEnvelopeBuilder(); + } + else + { + envBuilder = (EnvelopeBuilder)ServiceLoader.loadService(EnvelopeBuilder.class.getName(), null); + } - envelopeBuilder.setStyle(getStyle()); - // Build the payload - envelopeBuilder.build(soapMessage, inputStream, ignoreParseError); + envBuilder.setStyle(getStyle()); + envBuilder.build(soapMessage, inputStream, ignoreParseError); } return soapMessage; Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPBodyElementDoc.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -100,7 +100,7 @@ { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); - feature = epMetaData.getWebServiceFeature(SchemaValidationFeature.class); + feature = epMetaData.getFeature(SchemaValidationFeature.class); URL xsdURL = feature.getSchemaLocation() != null ? new URL(feature.getSchemaLocation()) : null; if (xsdURL == null) { @@ -139,7 +139,7 @@ { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext != null) - feature = msgContext.getEndpointMetaData().getWebServiceFeature(SchemaValidationFeature.class); + feature = msgContext.getEndpointMetaData().getFeature(SchemaValidationFeature.class); return feature != null ? feature.isEnabled() : false; } Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshaller.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -49,7 +49,7 @@ try { - SOAPMessage soapMsg = new MessageFactoryImpl().createMessage(null, inputStream, true); + SOAPMessage soapMsg = getMessageFactory().createMessage(null, inputStream, true); return soapMsg; } @@ -62,6 +62,11 @@ } } + protected MessageFactoryImpl getMessageFactory() + { + return new MessageFactoryImpl(); + } + public void setClassLoader(ClassLoader classloader) { } Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/soap/SOAPMessageUnMarshallerHTTP.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -81,7 +81,7 @@ if (resCode != HttpServletResponse.SC_NO_CONTENT) { MimeHeaders mimeHeaders = getMimeHeaders(metadata); - soapMsg = new MessageFactoryImpl().createMessage(mimeHeaders, inputStream, true); + soapMsg = getMessageFactory().createMessage(mimeHeaders, inputStream, true); } return soapMsg; @@ -95,6 +95,11 @@ } } + protected MessageFactoryImpl getMessageFactory() + { + return new MessageFactoryImpl(); + } + /** * Set the class loader to use for unmarhsalling. This may * be needed when need to have access to class definitions that Copied: stack/native/trunk/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/feature/FastInfosetFeature.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,69 @@ +/* + * 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.feature; + +// $Id$ + +import javax.xml.ws.WebServiceFeature; + +import org.jboss.ws.Constants; + +/** + * This feature represents the use of FastInfoset + * + * @author Thomas.Diesler(a)jboss.com + * @since 29-Feb-2008 + */ +public final class FastInfosetFeature extends WebServiceFeature +{ + /** + * Constant value identifying the SchemaValidationFeature + */ + public static final String ID = Constants.NS_JBOSSWS_URI + "/features/fastinfoset"; + + /** + * Create an <code>SchemaValidationFeature</code>. + * The instance created will be enabled. + */ + public FastInfosetFeature() + { + this.enabled = true; + } + + /** + * Creates an <code>SchemaValidationFeature</code>. + * + * @param enabled specifies if this feature should be enabled or not + */ + public FastInfosetFeature(boolean enabled) + { + this.enabled = enabled; + } + + /** + * {@inheritDoc} + */ + public String getID() + { + return ID; + } +} Copied: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,108 @@ +/* + * 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.builder.jaxws; + +// $Id$ + +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.net.URL; + +import org.jboss.ws.WSException; +import org.jboss.ws.annotation.FastInfoset; +import org.jboss.ws.annotation.SchemaValidation; +import org.jboss.ws.feature.FastInfosetFeature; +import org.jboss.ws.feature.SchemaValidationFeature; +import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.wsf.spi.deployment.ArchiveDeployment; +import org.jboss.wsf.spi.deployment.Deployment; +import org.xml.sax.ErrorHandler; + +/** + * Process EndpointFeature annotations + * + * @author Thomas.Diesler(a)jboss.com + * @since 12-Mar-2008 + */ +public class EndpointFeatureProcessor +{ + protected void processEndpointFeatures(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> sepClass) + { + for (Annotation an : sepClass.getAnnotations()) + { + if (an.annotationType() == SchemaValidation.class) + { + processSchemaValidation(dep, sepMetaData, sepClass); + } + else if (an.annotationType() == FastInfoset.class) + { + processFastInfoset(dep, sepMetaData, sepClass); + } + } + } + + private void processFastInfoset(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> sepClass) + { + FastInfoset anFeature = sepClass.getAnnotation(FastInfoset.class); + FastInfosetFeature feature = new FastInfosetFeature(anFeature.enabled()); + sepMetaData.addFeature(feature); + } + + private void processSchemaValidation(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> sepClass) + { + SchemaValidation anFeature = sepClass.getAnnotation(SchemaValidation.class); + SchemaValidationFeature feature = new SchemaValidationFeature(anFeature.enabled()); + + String xsdLoc = anFeature.schemaLocation(); + if (xsdLoc.length() > 0) + { + if (dep instanceof ArchiveDeployment) + { + try + { + URL xsdURL = ((ArchiveDeployment)dep).getMetaDataFileURL(xsdLoc); + xsdLoc = xsdURL.toExternalForm(); + } + catch (IOException ex) + { + throw new WSException("Cannot load schema: " + xsdLoc, ex); + } + } + feature.setSchemaLocation(xsdLoc); + } + + Class handlerClass = anFeature.errorHandler(); + if (handlerClass != null) + { + try + { + ErrorHandler errorHandler = (ErrorHandler)handlerClass.newInstance(); + feature.setErrorHandler(errorHandler); + } + catch (Exception ex) + { + throw new WSException("Cannot instanciate error handler: " + handlerClass, ex); + } + } + sepMetaData.addFeature(feature); + } +} Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -24,7 +24,6 @@ // $Id$ import java.io.File; -import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -60,7 +59,6 @@ import org.jboss.ws.Constants; import org.jboss.ws.WSException; import org.jboss.ws.annotation.Documentation; -import org.jboss.ws.annotation.SchemaValidation; import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; import org.jboss.ws.core.jaxws.JAXBContextFactory; import org.jboss.ws.core.jaxws.WrapperGenerator; @@ -72,7 +70,6 @@ import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult; import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner; -import org.jboss.ws.feature.SchemaValidationFeature; import org.jboss.ws.metadata.accessor.JAXBAccessorFactoryCreator; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -91,8 +88,6 @@ import org.jboss.ws.metadata.wsdl.WSDLMIMEPart; import org.jboss.wsf.common.JavaUtils; import org.jboss.wsf.spi.binding.BindingCustomization; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.metadata.j2ee.serviceref.HandlerChainsObjectFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; @@ -102,7 +97,6 @@ import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.Unmarshaller; import org.jboss.xb.binding.UnmarshallerFactory; -import org.xml.sax.ErrorHandler; import com.sun.xml.bind.api.JAXBRIContext; import com.sun.xml.bind.api.TypeReference; @@ -554,10 +548,10 @@ String tns = epMetaData.getPortName().getNamespaceURI(); String portTypeName = epMetaData.getPortName().getLocalPart(); String opName = opMetaData.getQName().getLocalPart(); - addrExt.setInboundAction(tns + "/" + portTypeName + "/" + opName + "Request"); + addrExt.setInboundAction(tns + "/" + portTypeName + "/" + opName + "Request"); if (!opMetaData.isOneWay()) - addrExt.setOutboundAction(tns + "/" + portTypeName + "/" + opName + "Response"); + addrExt.setOutboundAction(tns + "/" + portTypeName + "/" + opName + "Response"); } opMetaData.addExtension(addrExt); @@ -598,7 +592,7 @@ throw new IllegalArgumentException("@SOAPBinding must be specified using DOCUMENT style when placed on a method"); opMetaData.setParameterStyle(anBinding.parameterStyle()); } - + if (method.isAnnotationPresent(Documentation.class)) { opMetaData.setDocumentation(method.getAnnotation(Documentation.class).content()); @@ -1040,46 +1034,4 @@ { this.wrapperGenerator = wrapperGenerator; } - - protected void processWebServiceFeatures(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> sepClass) - { - if (sepClass.isAnnotationPresent(SchemaValidation.class)) - { - SchemaValidation anValidation = sepClass.getAnnotation(SchemaValidation.class); - SchemaValidationFeature feature = new SchemaValidationFeature(); - - String xsdLoc = anValidation.schemaLocation(); - if (xsdLoc.length() > 0) - { - if (dep instanceof ArchiveDeployment) - { - try - { - URL xsdURL = ((ArchiveDeployment)dep).getMetaDataFileURL(xsdLoc); - xsdLoc = xsdURL.toExternalForm(); - } - catch (IOException ex) - { - throw new WSException("Cannot load schema: " + xsdLoc, ex); - } - } - feature.setSchemaLocation(xsdLoc); - } - - Class handlerClass = anValidation.errorHandler(); - if (handlerClass != null) - { - try - { - ErrorHandler errorHandler = (ErrorHandler)handlerClass.newInstance(); - feature.setErrorHandler(errorHandler); - } - catch (Exception ex) - { - throw new WSException("Cannot instanciate error handler: " + handlerClass, ex); - } - } - sepMetaData.addWebServiceFeature(feature); - } - } } Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -139,7 +139,8 @@ processEndpointConfig(dep, sepMetaData, sepClass, linkName); // process web service features - processWebServiceFeatures(dep, sepMetaData, sepClass); + EndpointFeatureProcessor epFeatureProcessor = new EndpointFeatureProcessor(); + epFeatureProcessor.processEndpointFeatures(dep, sepMetaData, sepClass); // Process endpoint documentation if (seiClass.isAnnotationPresent(Documentation.class)) Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -28,6 +28,11 @@ * @version $Id$ * @since 14.12.2006 */ + +/** + * Refactor this to use features + */ +@Deprecated public class EndpointProperty { public final static String MTOM_THRESHOLD = "http://org.jboss.ws/mtom#threshold"; Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -63,6 +63,7 @@ import org.jboss.ws.core.soap.Use; import org.jboss.ws.extensions.wsrm.config.RMConfig; import org.jboss.ws.extensions.wsrm.config.RMPortConfig; +import org.jboss.ws.feature.FastInfosetFeature; import org.jboss.ws.metadata.accessor.AccessorFactory; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; import org.jboss.ws.metadata.accessor.JAXBAccessorFactoryCreator; @@ -150,7 +151,7 @@ // All of the registered types private List<Class> registeredTypes = new ArrayList<Class>(); // The features defined for this endpoint - private Set<WebServiceFeature> features = new HashSet<WebServiceFeature>(); + private FeatureResolver features = new FeatureResolver(); // The documentation edfined through the @Documentation annotation private String documentation; @@ -363,29 +364,24 @@ this.properties = properties; } - public <T extends WebServiceFeature> T getWebServiceFeature(Class<T> key) + public <T extends WebServiceFeature> T getFeature(Class<T> key) { - for (WebServiceFeature feature : features) - { - if (key == feature.getClass()) - return (T)feature; - } - return null; + return features.getFeature(key); } - public Set<WebServiceFeature> getWebServiceFeatures() + public <T extends WebServiceFeature> boolean isFeatureEnabled(Class<T> key) { - return features; + return features.isFeatureEnabled(key); } - - public void addWebServiceFeature(WebServiceFeature feature) + + public FeatureResolver getFeatureResolver() { - this.features.add(feature); + return features; } - public void setWebServiceFeatures(Set<WebServiceFeature> features) + public void addFeature(WebServiceFeature feature) { - this.features = features; + this.features.addFeature(feature); } public String getDocumentation() Copied: stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/FeatureResolver.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/main/java/org/jboss/ws/metadata/umdm/FeatureResolver.java) =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/FeatureResolver.java (rev 0) +++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/umdm/FeatureResolver.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,68 @@ +/* + * 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.umdm; + +// $Id$ + +import java.util.HashSet; +import java.util.Set; + +import javax.xml.ws.WebServiceFeature; + +/** + * A component that maintains a set of web service features + * + * @author Thomas.Diesler(a)jboss.org + * @since 12-May-2005 + */ +public class FeatureResolver +{ + // The features defined for this endpoint + private Set<WebServiceFeature> features = new HashSet<WebServiceFeature>(); + + public <T extends WebServiceFeature> boolean hasFeature(Class<T> key) + { + return getFeature(key) != null; + } + + public <T extends WebServiceFeature> boolean isFeatureEnabled(Class<T> key) + { + T feature = getFeature(key); + return (feature != null ? feature.isEnabled() : false); + } + + public <T extends WebServiceFeature> T getFeature(Class<T> key) + { + for (WebServiceFeature feature : features) + { + if (key == feature.getClass()) + return (T)feature; + } + return null; + } + + public void addFeature(WebServiceFeature feature) + { + this.features.add(feature); + } + +} Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -80,6 +80,7 @@ import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.extensions.wsrm.RMConstant; import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.feature.FastInfosetFeature; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -97,6 +98,8 @@ import org.jboss.wsf.common.IOUtils; import org.w3c.dom.Document; +import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer; + /** * A request handler * @@ -310,7 +313,7 @@ boolean isWsrmMessage = rmResCtx != null; boolean isWsrmOneWay = isWsrmMessage && (Boolean)rmResCtx.get(RMConstant.ONE_WAY_OPERATION); if ((outStream != null) && (isWsrmOneWay == false)) // RM hack - sendResponse(outStream, msgContext, isFault); + sendResponse(endpoint, outStream, isFault); } catch (Exception ex) { @@ -331,9 +334,12 @@ } } - private void sendResponse(OutputStream outputStream, CommonMessageContext msgContext, boolean isFault) throws SOAPException, IOException + private void sendResponse(Endpoint endpoint, OutputStream output, boolean isFault) throws SOAPException, IOException { + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); MessageAbstraction resMessage = msgContext.getMessageAbstraction(); + String wsaTo = null; // Get the destination from the AddressingProperties @@ -352,7 +358,17 @@ } else { - resMessage.writeTo(outputStream); + if (epMetaData.isFeatureEnabled(FastInfosetFeature.class) && resMessage instanceof SOAPMessage) + { + SOAPEnvelope soapEnv = ((SOAPMessage)resMessage).getSOAPPart().getEnvelope(); + DOMDocumentSerializer serializer = new DOMDocumentSerializer(); + serializer.setOutputStream(output); + serializer.serialize(soapEnv); + } + else + { + resMessage.writeTo(output); + } } } @@ -397,6 +413,7 @@ msgFactory.setServiceMode(sepMetaData.getServiceMode()); msgFactory.setStyle(sepMetaData.getStyle()); + msgFactory.setFeatureResolver(sepMetaData.getFeatureResolver()); reqMessage = (SOAPMessageImpl)msgFactory.createMessage(headers, inputStream); } Copied: stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset (from rev 5948, stack/native/branches/tdiesler/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset) =================================================================== --- stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.ws.core.client.RemoteConnection.http.fastinfoset 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1 @@ +org.jboss.ws.core.client.FastInfosetConnectionHTTP \ No newline at end of file Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset (from rev 5948, stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset) Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -1,34 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.fastinfoset; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -@WebService(targetNamespace = "http://org.jboss.ws/fastinfoset") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface FastInfoset -{ - @WebMethod - String echo(String code); -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfoset.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,34 @@ +/* + * 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.fastinfoset; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(targetNamespace = "http://org.jboss.ws/fastinfoset") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface FastInfoset +{ + @WebMethod + String echo(String code); +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -1,120 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.fastinfoset; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; - -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPMessage; - -import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.feature.FastInfosetFeature; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.common.DOMWriter; -import org.jboss.wsf.test.JBossWSTest; -import org.jvnet.fastinfoset.FastInfosetException; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import com.sun.xml.fastinfoset.dom.DOMDocumentParser; -import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer; - -/** - * Test FastInfoset functionality - * - * @author Thomas.Diesler(a)jboss.com - * @since 12-Mar-2008 - */ -public class FastInfosetAPITestCase extends JBossWSTest -{ - public void testSimple() throws Exception - { - String srcXML = "<root>hello world</root>"; - ByteArrayInputStream bais = getFastInputStream(srcXML); - Document resDoc = getFastDocument(bais); - String resXML = DOMWriter.printNode(resDoc, false); - assertEquals(srcXML, resXML); - } - - public void testSimpleNamespace() throws Exception - { - String srcXML = "<root xmlns='http://somens'>hello world</root>"; - ByteArrayInputStream bais = getFastInputStream(srcXML); - Document resDoc = getFastDocument(bais); - String resXML = DOMWriter.printNode(resDoc, false); - assertEquals(srcXML, resXML); - } - - public void testPrefixedNamespace() throws Exception - { - String srcXML = "<ns1:root xmlns:ns1='http://somens'>hello world</ns1:root>"; - ByteArrayInputStream bais = getFastInputStream(srcXML); - Document resDoc = getFastDocument(bais); - String resXML = DOMWriter.printNode(resDoc, false); - assertEquals(srcXML, resXML); - } - - public void testMessageFactory() throws Exception - { - String srcXML = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Body>" + - " <ns1:echo xmlns:ns1='http://org.jboss.ws/fastinfoset'><arg0>hello world</arg0></ns1:echo>" + - " </env:Body>" + - "</env:Envelope>"; - - Element srcEnv = DOMUtils.parse(srcXML); - ByteArrayInputStream bais = getFastInputStream(srcXML); - - MessageFactoryImpl factory = new MessageFactoryImpl(); - factory.addFeature(new FastInfosetFeature()); - SOAPMessage soapMessage = factory.createMessage(null, bais); - SOAPEnvelope resEnv = soapMessage.getSOAPPart().getEnvelope(); - assertEquals(srcEnv, resEnv); - } - - private ByteArrayInputStream getFastInputStream(String srcXML) throws IOException - { - DOMDocumentSerializer serializer = new DOMDocumentSerializer(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - serializer.setOutputStream(baos); - Element srcRoot = DOMUtils.parse(srcXML); - serializer.serialize(srcRoot); - - ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); - return bais; - } - - private Document getFastDocument(ByteArrayInputStream bais) throws FastInfosetException, IOException - { - DOMDocumentParser parser = new DOMDocumentParser(); - Document resDoc = DOMUtils.getDocumentBuilder().newDocument(); - parser.parse(resDoc, bais); - return resDoc; - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetAPITestCase.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,120 @@ +/* + * 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.fastinfoset; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; + +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPMessage; + +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.core.soap.MessageFactoryImpl; +import org.jboss.ws.feature.FastInfosetFeature; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.common.DOMWriter; +import org.jboss.wsf.test.JBossWSTest; +import org.jvnet.fastinfoset.FastInfosetException; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import com.sun.xml.fastinfoset.dom.DOMDocumentParser; +import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer; + +/** + * Test FastInfoset functionality + * + * @author Thomas.Diesler(a)jboss.com + * @since 12-Mar-2008 + */ +public class FastInfosetAPITestCase extends JBossWSTest +{ + public void testSimple() throws Exception + { + String srcXML = "<root>hello world</root>"; + ByteArrayInputStream bais = getFastInputStream(srcXML); + Document resDoc = getFastDocument(bais); + String resXML = DOMWriter.printNode(resDoc, false); + assertEquals(srcXML, resXML); + } + + public void testSimpleNamespace() throws Exception + { + String srcXML = "<root xmlns='http://somens'>hello world</root>"; + ByteArrayInputStream bais = getFastInputStream(srcXML); + Document resDoc = getFastDocument(bais); + String resXML = DOMWriter.printNode(resDoc, false); + assertEquals(srcXML, resXML); + } + + public void testPrefixedNamespace() throws Exception + { + String srcXML = "<ns1:root xmlns:ns1='http://somens'>hello world</ns1:root>"; + ByteArrayInputStream bais = getFastInputStream(srcXML); + Document resDoc = getFastDocument(bais); + String resXML = DOMWriter.printNode(resDoc, false); + assertEquals(srcXML, resXML); + } + + public void testMessageFactory() throws Exception + { + String srcXML = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Body>" + + " <ns1:echo xmlns:ns1='http://org.jboss.ws/fastinfoset'><arg0>hello world</arg0></ns1:echo>" + + " </env:Body>" + + "</env:Envelope>"; + + Element srcEnv = DOMUtils.parse(srcXML); + ByteArrayInputStream bais = getFastInputStream(srcXML); + + MessageFactoryImpl factory = new MessageFactoryImpl(); + factory.addFeature(new FastInfosetFeature()); + SOAPMessage soapMessage = factory.createMessage(null, bais); + SOAPEnvelope resEnv = soapMessage.getSOAPPart().getEnvelope(); + assertEquals(srcEnv, resEnv); + } + + private ByteArrayInputStream getFastInputStream(String srcXML) throws IOException + { + DOMDocumentSerializer serializer = new DOMDocumentSerializer(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + serializer.setOutputStream(baos); + Element srcRoot = DOMUtils.parse(srcXML); + serializer.serialize(srcRoot); + + ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray()); + return bais; + } + + private Document getFastDocument(ByteArrayInputStream bais) throws FastInfosetException, IOException + { + DOMDocumentParser parser = new DOMDocumentParser(); + Document resDoc = DOMUtils.getDocumentBuilder().newDocument(); + parser.parse(resDoc, bais); + return resDoc; + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.fastinfoset; - -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.logging.Logger; -import org.jboss.ws.annotation.FastInfoset; - -@WebService(targetNamespace = "http://org.jboss.ws/fastinfoset") -@SOAPBinding(style = SOAPBinding.Style.RPC) -@FastInfoset -public class FastInfosetEndpoint -{ - // provide logging - private static Logger log = Logger.getLogger(FastInfosetEndpoint.class); - - @WebMethod - public String echo(String code) - { - log.info(code); - return code; - } -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetEndpoint.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.fastinfoset; + +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; +import org.jboss.ws.annotation.FastInfoset; + +@WebService(targetNamespace = "http://org.jboss.ws/fastinfoset") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@FastInfoset +public class FastInfosetEndpoint +{ + // provide logging + private static Logger log = Logger.getLogger(FastInfosetEndpoint.class); + + @WebMethod + public String echo(String code) + { + log.info(code); + return code; + } +} Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java =================================================================== --- stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -1,96 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.fastinfoset; - -import java.io.ByteArrayOutputStream; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLConnection; - -import javax.xml.namespace.QName; -import javax.xml.ws.Service21; - -import junit.framework.Test; - -import org.jboss.ws.feature.FastInfosetFeature; -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; -import org.w3c.dom.Element; - -import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer; - -/** - * Test FastInfoset functionality - * - * @author Thomas.Diesler(a)jboss.com - * @since 12-Mar-2008 - */ -public class FastInfosetTestCase extends JBossWSTest -{ - public static Test suite() - { - return new JBossWSTestSetup(FastInfosetTestCase.class, "jaxws-fastinfoset.war"); - } - - public void testURLConnection() throws Exception - { - String reqEnv = - "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + - " <env:Body>" + - " <ns1:echo xmlns:ns1='http://org.jboss.ws/fastinfoset'><arg0>hello world</arg0></ns1:echo>" + - " </env:Body>" + - "</env:Envelope>"; - - String targetAddress = "http://" + getServerHost() + ":8080/jaxws-fastinfoset"; - HttpURLConnection con = (HttpURLConnection)new URL(targetAddress).openConnection(); - con.setRequestProperty("Content-Type", "text/xml; charset=UTF-8"); - con.setRequestMethod("POST"); - con.setDoOutput(true); - con.connect(); - - OutputStream outs = con.getOutputStream(); - DOMDocumentSerializer serializer = new DOMDocumentSerializer(); - serializer.setOutputStream(outs); - - Element srcRoot = DOMUtils.parse(reqEnv); - serializer.serialize(srcRoot); - outs.close(); - - int resCode = con.getResponseCode(); - assertEquals(200, resCode); - } - - public void _testSimple() throws Exception - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-fastinfoset?wsdl"); - QName serviceName = new QName("http://org.jboss.ws/fastinfoset", "FastInfosetEndpointService"); - Service21 service = Service21.create(wsdlURL, serviceName); - - FastInfosetFeature feature = new FastInfosetFeature(false); - FastInfoset port = service.getPort(FastInfoset.class, feature); - String retStr = port.echo("hello world"); - assertEquals("hello world", retStr); - } - -} Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java (from rev 5948, stack/native/branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java) =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java (rev 0) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -0,0 +1,96 @@ +/* + * 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.fastinfoset; + +import java.io.ByteArrayOutputStream; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLConnection; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service21; + +import junit.framework.Test; + +import org.jboss.ws.feature.FastInfosetFeature; +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; +import org.w3c.dom.Element; + +import com.sun.xml.fastinfoset.dom.DOMDocumentSerializer; + +/** + * Test FastInfoset functionality + * + * @author Thomas.Diesler(a)jboss.com + * @since 12-Mar-2008 + */ +public class FastInfosetTestCase extends JBossWSTest +{ + public static Test suite() + { + return new JBossWSTestSetup(FastInfosetTestCase.class, "jaxws-fastinfoset.war"); + } + + public void testURLConnection() throws Exception + { + String reqEnv = + "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <env:Body>" + + " <ns1:echo xmlns:ns1='http://org.jboss.ws/fastinfoset'><arg0>hello world</arg0></ns1:echo>" + + " </env:Body>" + + "</env:Envelope>"; + + String targetAddress = "http://" + getServerHost() + ":8080/jaxws-fastinfoset"; + HttpURLConnection con = (HttpURLConnection)new URL(targetAddress).openConnection(); + con.setRequestProperty("Content-Type", "text/xml; charset=UTF-8"); + con.setRequestMethod("POST"); + con.setDoOutput(true); + con.connect(); + + OutputStream outs = con.getOutputStream(); + DOMDocumentSerializer serializer = new DOMDocumentSerializer(); + serializer.setOutputStream(outs); + + Element srcRoot = DOMUtils.parse(reqEnv); + serializer.serialize(srcRoot); + outs.close(); + + int resCode = con.getResponseCode(); + assertEquals(200, resCode); + } + + public void testRoundTrip() throws Exception + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-fastinfoset?wsdl"); + QName serviceName = new QName("http://org.jboss.ws/fastinfoset", "FastInfosetEndpointService"); + Service21 service = Service21.create(wsdlURL, serviceName); + + FastInfosetFeature feature = new FastInfosetFeature(); + FastInfoset port = service.getPort(FastInfoset.class, feature); + String retStr = port.echo("hello world"); + assertEquals("hello world", retStr); + } + +} Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java 2008-03-12 19:02:14 UTC (rev 5949) @@ -43,21 +43,21 @@ return new JBossWSTestSetup(AddressingClientTestCase.class, "jaxws-samples-dar.jar,jaxws-samples-dar-addressing-client.war"); } - public void testSync() throws Exception + public void _testSync() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/dar?wsdl"); AddressingClient client = new AddressingClient(wsdlURL); client.run(false); } - public void testAsync() throws Exception + public void _testAsync() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/dar?wsdl"); AddressingClient client = new AddressingClient(wsdlURL); client.run(true); } - public void testOneWay() throws Exception + public void _testOneWay() throws Exception { URL wsdlURL = new URL("http://" + getServerHost() + ":8080/dar?wsdl"); AddressingClient client = new AddressingClient(wsdlURL); Copied: stack/native/trunk/src/test/resources/jaxws/fastinfoset (from rev 5948, stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset) Copied: stack/native/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF (from rev 5948, stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF) Deleted: stack/native/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml =================================================================== --- stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml 2008-03-12 19:02:14 UTC (rev 5949) @@ -1,15 +0,0 @@ -<?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>FastInfosetEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.fastinfoset.FastInfosetEndpoint</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>FastInfosetEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> \ No newline at end of file Copied: stack/native/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml (from rev 5948, stack/native/branches/tdiesler/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml) =================================================================== --- stack/native/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml (rev 0) +++ stack/native/trunk/src/test/resources/jaxws/fastinfoset/WEB-INF/web.xml 2008-03-12 19:02:14 UTC (rev 5949) @@ -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>FastInfosetEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.fastinfoset.FastInfosetEndpoint</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>FastInfosetEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-03-12 18:34:32 UTC (rev 5948) +++ stack/native/trunk/version.properties 2008-03-12 19:02:14 UTC (rev 5949) @@ -62,6 +62,7 @@ junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4 +sun-fi=1.2.2 sun-jaf=1.1 sun-javamail=1.4 sun-servlet=2.4