April 2009 - jbossws-commits - Jboss List Archives

JBossWS SVN: r9829 - in stack/metro/branches/jbossws-metro-3.1.1: modules/client and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-04-15 04:41:28 -0400 (Wed, 15 Apr 2009) New Revision: 9829 Modified: stack/metro/branches/jbossws-metro-3.1.1/modules/client/pom.xml stack/metro/branches/jbossws-metro-3.1.1/modules/management/pom.xml stack/metro/branches/jbossws-metro-3.1.1/modules/resources/pom.xml stack/metro/branches/jbossws-metro-3.1.1/modules/server/pom.xml stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/framework-tests/pom.xml stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/metro-tests/pom.xml stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/pom.xml stack/metro/branches/jbossws-metro-3.1.1/modules/wsit/pom.xml stack/metro/branches/jbossws-metro-3.1.1/pom.xml Log: [JBWS-2604] Preparing for tagging Modified: stack/metro/branches/jbossws-metro-3.1.1/modules/client/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/modules/client/pom.xml 2009-04-15 08:31:11 UTC (rev 9828) +++ stack/metro/branches/jbossws-metro-3.1.1/modules/client/pom.xml 2009-04-15 08:41:28 UTC (rev 9829) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/metro/branches/jbossws-metro-3.1.1/modules/management/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/modules/management/pom.xml 2009-04-15 08:31:11 UTC (rev 9828) +++ stack/metro/branches/jbossws-metro-3.1.1/modules/management/pom.xml 2009-04-15 08:41:28 UTC (rev 9829) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/metro/branches/jbossws-metro-3.1.1/modules/resources/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/modules/resources/pom.xml 2009-04-15 08:31:11 UTC (rev 9828) +++ stack/metro/branches/jbossws-metro-3.1.1/modules/resources/pom.xml 2009-04-15 08:41:28 UTC (rev 9829) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/metro/branches/jbossws-metro-3.1.1/modules/server/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/modules/server/pom.xml 2009-04-15 08:31:11 UTC (rev 9828) +++ stack/metro/branches/jbossws-metro-3.1.1/modules/server/pom.xml 2009-04-15 08:41:28 UTC (rev 9829) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/framework-tests/pom.xml 2009-04-15 08:31:11 UTC (rev 9828) +++ stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/framework-tests/pom.xml 2009-04-15 08:41:28 UTC (rev 9829) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro-testsuite</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/metro-tests/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/metro-tests/pom.xml 2009-04-15 08:31:11 UTC (rev 9828) +++ stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/metro-tests/pom.xml 2009-04-15 08:41:28 UTC (rev 9829) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro-testsuite</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> </parent>  Modified: stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/pom.xml 2009-04-15 08:31:11 UTC (rev 9828) +++ stack/metro/branches/jbossws-metro-3.1.1/modules/testsuite/pom.xml 2009-04-15 08:41:28 UTC (rev 9829) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/metro/branches/jbossws-metro-3.1.1/modules/wsit/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/modules/wsit/pom.xml 2009-04-15 08:31:11 UTC (rev 9828) +++ stack/metro/branches/jbossws-metro-3.1.1/modules/wsit/pom.xml 2009-04-15 08:41:28 UTC (rev 9829) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.metro</groupId> <artifactId>jbossws-metro</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/metro/branches/jbossws-metro-3.1.1/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/pom.xml 2009-04-15 08:31:11 UTC (rev 9828) +++ stack/metro/branches/jbossws-metro-3.1.1/pom.xml 2009-04-15 08:41:28 UTC (rev 9829) @@ -17,7 +17,7 @@ <artifactId>jbossws-metro</artifactId> <packaging>pom</packaging> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version>  <parent> @@ -28,9 +28,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/metro/branches/jboss...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/metro/branches/jbossws-...</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/metro/branches/jbossws-met...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/metro/tags/jbossws-m...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/metro/tags/jbossws-metr...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/metro/tags/jbossws-metro-3...</url> </scm>

17 years

1
0
0 / 0

JBossWS SVN: r9828 - stack/metro/branches/jbossws-metro-3.1.1.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-04-15 04:31:11 -0400 (Wed, 15 Apr 2009) New Revision: 9828 Modified: stack/metro/branches/jbossws-metro-3.1.1/pom.xml Log: Using released framework Modified: stack/metro/branches/jbossws-metro-3.1.1/pom.xml =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/pom.xml 2009-04-15 08:23:03 UTC (rev 9827) +++ stack/metro/branches/jbossws-metro-3.1.1/pom.xml 2009-04-15 08:31:11 UTC (rev 9828) @@ -45,7 +45,7 @@  <properties> <jbossws.common.version>1.0.10.GA</jbossws.common.version> - <jbossws.framework.version>3.1.1-SNAPSHOT</jbossws.framework.version> + <jbossws.framework.version>3.1.1.GA</jbossws.framework.version> <jbossws.spi.version>1.1.1.GA</jbossws.spi.version> <jbossws.jboss423.version>3.1.1.GA</jbossws.jboss423.version> <jbossws.jboss500.version>3.1.1.GA</jbossws.jboss500.version>

17 years

1
0
0 / 0

JBossWS SVN: r9827 - stack/metro/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-04-15 04:23:03 -0400 (Wed, 15 Apr 2009) New Revision: 9827 Modified: stack/metro/trunk/src/main/distro/ReleaseNotes.txt Log: [JBWS-2604] Updating release notes Modified: stack/metro/trunk/src/main/distro/ReleaseNotes.txt =================================================================== --- stack/metro/trunk/src/main/distro/ReleaseNotes.txt 2009-04-15 08:20:59 UTC (rev 9826) +++ stack/metro/trunk/src/main/distro/ReleaseNotes.txt 2009-04-15 08:23:03 UTC (rev 9827) @@ -52,6 +52,43 @@ Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +jbossws-metro-3.1.1.GA +---------------------- + +Bug + + * [JBWS-1665] - incorrect wsdl generation + * [JBWS-2555] - Miscellaneous issues reported by FindBugs + * [JBWS-2564] - Use Server MBean instead of ServerConfig to get JBoss version + * [JBWS-2573] - Fix JBossWS builds with Maven 2.0.10 + * [JBWS-2574] - Investigate why jbws2308 test case fails with Maven 2.0.10 + * [JBWS-2585] - JBossWS commandline tools reference not existing log4j config + * [JBWS-2589] - Some deployment failures prevent re-deployment + +Feature Request + + * [JBWS-2151] - Provide wsrunclient.sh(.bat) for Metro and CXF + +Task + + * [JBWS-2327] - Provide tests for wsrunclient shell script + * [JBWS-2524] - Sort out / remove GenericSOAPHandler duplicity + * [JBWS-2532] - Fix MTOM/XOP Content Type Testcase failure + * [JBWS-2537] - Simplify Hudson Jobs + * [JBWS-2566] - Add Maven Release plugin + * [JBWS-2568] - Remove AS 4.2 branch support (424 target) + +Errata + + See: https://jira.jboss.org/jira/browse/JBWS-2605 + + +This version of ${project.name} is based on the following Metro components: +* WSIT 1.3.1 +* JAX-WS RI 2.1.4 +* JAXB RI 2.1.9 + + jbossws-metro-3.1.0-GA ----------------------

17 years

1
0
0 / 0

JBossWS SVN: r9826 - stack/metro/branches/jbossws-metro-3.1.1/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-04-15 04:20:59 -0400 (Wed, 15 Apr 2009) New Revision: 9826 Modified: stack/metro/branches/jbossws-metro-3.1.1/src/main/distro/ReleaseNotes.txt Log: [JBWS-2604] Updating release notes Modified: stack/metro/branches/jbossws-metro-3.1.1/src/main/distro/ReleaseNotes.txt =================================================================== --- stack/metro/branches/jbossws-metro-3.1.1/src/main/distro/ReleaseNotes.txt 2009-04-14 16:15:17 UTC (rev 9825) +++ stack/metro/branches/jbossws-metro-3.1.1/src/main/distro/ReleaseNotes.txt 2009-04-15 08:20:59 UTC (rev 9826) @@ -27,19 +27,30 @@ Bug - TODO: enumerate + * [JBWS-1665] - incorrect wsdl generation + * [JBWS-2555] - Miscellaneous issues reported by FindBugs + * [JBWS-2564] - Use Server MBean instead of ServerConfig to get JBoss version + * [JBWS-2573] - Fix JBossWS builds with Maven 2.0.10 + * [JBWS-2574] - Investigate why jbws2308 test case fails with Maven 2.0.10 + * [JBWS-2585] - JBossWS commandline tools reference not existing log4j config + * [JBWS-2589] - Some deployment failures prevent re-deployment Feature Request - TODO: enumerate + * [JBWS-2151] - Provide wsrunclient.sh(.bat) for Metro and CXF Task - TODO: enumerate + * [JBWS-2327] - Provide tests for wsrunclient shell script + * [JBWS-2524] - Sort out / remove GenericSOAPHandler duplicity + * [JBWS-2532] - Fix MTOM/XOP Content Type Testcase failure + * [JBWS-2537] - Simplify Hudson Jobs + * [JBWS-2566] - Add Maven Release plugin + * [JBWS-2568] - Remove AS 4.2 branch support (424 target) Errata - See: TODO: reference to associated JIRA issue + See: https://jira.jboss.org/jira/browse/JBWS-2605 This version of ${project.name} is based on the following Metro components:

17 years

1
0
0 / 0

JBossWS SVN: r9825 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP: src/main/java/org/jboss/ws/core/server and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2009-04-14 12:15:17 -0400 (Tue, 14 Apr 2009) New Revision: 9825 Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/attach.jpeg Removed: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/attach.jpeg Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java Log: [JBPAPP-1773] Enable MTOM for incomming requests where the type of the content type is 'application/xop+xml' Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2009-04-14 13:22:31 UTC (rev 9824) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/ant-import-tests/build-jars-jaxws.xml 2009-04-14 16:15:17 UTC (rev 9825) @@ -546,6 +546,19 @@ </webinf> </war> +  + <war warfile="${tests.output.dir}/libs/jaxws-jbws2259.war" webxml="${tests.output.dir}/resources/jaxws/jbws2259/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws2259/Endpoint.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2259/CustomHandler.class"/> + <include name="org/jboss/test/ws/jaxws/jbws2259/Photo.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/jbws2259/WEB-INF"> + <include name="jaxws-endpoint-config.xml"/> + </webinf> + </war> +  <war warfile="${tests.output.dir}/libs/jaxws-jbws2285.war" webxml="${tests.output.dir}/resources/jaxws/jbws2285/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-04-14 13:22:31 UTC (rev 9824) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -166,6 +166,9 @@ CommonBinding binding = bindingProvider.getCommonBinding(); binding.setHeaderSource(delegate); + if (binding instanceof CommonSOAPBinding) + XOPContext.setMTOMEnabled(((CommonSOAPBinding)binding).isMTOMEnabled()); + // call the request handler chain boolean handlersPass = callRequestHandlerChain(sepMetaData, handlerType[0]); @@ -239,10 +242,7 @@ // Set the required outbound context properties setOutboundContextProperties(); - - if (binding instanceof CommonSOAPBinding) - XOPContext.setMTOMEnabled(((CommonSOAPBinding)binding).isMTOMEnabled()); - + // Bind the response message MessageAbstraction resMessage = binding.bindResponseMessage(opMetaData, sepInv); msgContext.setMessageAbstraction(resMessage); Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2009-04-14 13:22:31 UTC (rev 9824) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -242,6 +242,10 @@ inputStream = decoder.getRootPart().getDataHandler().getInputStream(); attachments = decoder.getRelatedParts(); + if (isXOPContent(contentType)) + { + soapMessage.setXOPMessage(true); + } } else if (isSoapContent(contentType) == false) { @@ -298,4 +302,10 @@ String baseType = type.getBaseType(); return MimeConstants.TYPE_MULTIPART_RELATED.equalsIgnoreCase(baseType); } + + private boolean isXOPContent(ContentType type) + { + String paramType = type.getParameter("type"); + return MimeConstants.TYPE_APPLICATION_XOP_XML.endsWith(paramType); + } } Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259 (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java 2009-03-30 14:16:54 UTC (rev 9689) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.jbws2259; - -import java.io.ByteArrayOutputStream; - -import javax.xml.soap.SOAPMessage; -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.wsf.common.handler.GenericSOAPHandler; - -/** - * Test handker to test MTOM detection. - * - * @author darran.lofthouse(a)jboss.com - * @since 27th March 2009 - * @see https://jira.jboss.org/jira/browse/JBWS-2259 - */ -public class CustomHandler extends GenericSOAPHandler -{ - private static final Logger log = Logger.getLogger(CustomHandler.class); - - public boolean handleMessage(final MessageContext msgContext) - { - - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - try - { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - soapMessage.writeTo(baos); - log.info("Wrote message."); - } - catch (Exception e) - { - throw new WSException("Unable to write message.", e); - } - - return true; - } -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/CustomHandler.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2259; + +import java.io.ByteArrayOutputStream; + +import javax.xml.soap.SOAPMessage; +import javax.xml.ws.handler.MessageContext; +import javax.xml.ws.handler.soap.SOAPMessageContext; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler; + +/** + * Test handker to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +public class CustomHandler extends GenericSOAPHandler +{ + private static final Logger log = Logger.getLogger(CustomHandler.class); + + public boolean handleMessage(final MessageContext msgContext) + { + + SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); + try + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + soapMessage.writeTo(baos); + log.info("Wrote message."); + } + catch (Exception e) + { + throw new WSException("Unable to write message.", e); + } + + return true; + } +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java 2009-03-30 14:16:54 UTC (rev 9689) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.jbws2259; - -import javax.jws.WebService; -import javax.xml.ws.BindingType; - -/** - * Test Endpoint to test MTOM detection. - * - * @author darran.lofthouse(a)jboss.com - * @since 27th March 2009 - * @see https://jira.jboss.org/jira/browse/JBWS-2259 - */ -@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2259") -@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") -public interface Endpoint -{ - - public Photo echo(final Photo photo); - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Endpoint.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -0,0 +1,41 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2259; + +import javax.jws.WebService; +import javax.xml.ws.BindingType; + +/** + * Test Endpoint to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbws2259") +@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") +public interface Endpoint +{ + + public Photo echo(final Photo photo); + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2009-03-30 14:16:54 UTC (rev 9689) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.jbws2259; - -import java.awt.Image; -import java.io.IOException; - -import javax.jws.WebService; -import javax.xml.ws.BindingType; -import javax.activation.DataHandler; - -import org.jboss.logging.Logger; -import org.jboss.ws.WSException; -import org.jboss.ws.annotation.EndpointConfig; - -/** - * Test Endpoint to test MTOM detection. - * - * @author darran.lofthouse(a)jboss.com - * @since 27th March 2009 - * @see https://jira.jboss.org/jira/browse/JBWS-2259 - */ -@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2259", endpointInterface = "org.jboss.test.ws.jaxws.jbws2259.Endpoint") -@EndpointConfig(configName = "Custom Client Config", configFile = "WEB-INF/jaxws-endpoint-config.xml") -@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") -public class EndpointImpl implements Endpoint -{ - - private static final Logger log = Logger.getLogger(EndpointImpl.class); - - public Photo echo(Photo photo) - { - - DataHandler dh = photo.getImage(); - String contentType = dh.getContentType(); - log.info("Actual content-type " + contentType); - String expectedContentType = photo.getExpectedContentType(); - log.info("Expected content-type " + expectedContentType); - - if (expectedContentType.equals(contentType) == false) - { - throw new WSException("Expected content-type '" + expectedContentType + "' Actual content-type '" + contentType + "'"); - } - - try - { - Object content = dh.getContent(); - log.info("Content - " + content.toString()); - if (content instanceof Image == false) - { - throw new WSException("Unexpected content '" + content.getClass().getName() + "'"); - } - } - catch (IOException e) - { - throw new WSException("Unable to getContent()", e); - } - - return photo; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2259; + +import java.awt.Image; +import java.io.IOException; + +import javax.jws.WebService; +import javax.xml.ws.BindingType; +import javax.activation.DataHandler; + +import org.jboss.logging.Logger; +import org.jboss.ws.WSException; +import org.jboss.ws.annotation.EndpointConfig; + +/** + * Test Endpoint to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbws2259", endpointInterface = "org.jboss.test.ws.jaxws.jbws2259.Endpoint") +@EndpointConfig(configName = "Custom Client Config", configFile = "WEB-INF/jaxws-endpoint-config.xml") +@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") +public class EndpointImpl implements Endpoint +{ + + private static final Logger log = Logger.getLogger(EndpointImpl.class); + + public Photo echo(Photo photo) + { + + DataHandler dh = photo.getImage(); + String contentType = dh.getContentType(); + log.info("Actual content-type " + contentType); + String expectedContentType = photo.getExpectedContentType(); + log.info("Expected content-type " + expectedContentType); + + if (expectedContentType.equals(contentType) == false) + { + throw new WSException("Expected content-type '" + expectedContentType + "' Actual content-type '" + contentType + "'"); + } + + try + { + Object content = dh.getContent(); + log.info("Content - " + content.toString()); + if (content instanceof Image == false) + { + throw new WSException("Unexpected content '" + content.getClass().getName() + "'"); + } + } + catch (IOException e) + { + throw new WSException("Unable to getContent()", e); + } + + return photo; + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2009-03-30 14:16:54 UTC (rev 9689) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -1,95 +0,0 @@ -/* -* JBoss, Home of Professional Open Source. -* Copyright 2009, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file 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.jbws2259; - -import java.io.File; -import java.net.URL; - -import javax.activation.DataHandler; -import javax.activation.DataSource; -import javax.activation.FileDataSource; -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPBinding; - -import junit.framework.Test; - -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * Test case to test MTOM detection. - * - * @author darran.lofthouse(a)jboss.com - * @since 30th March 2009 - * @see https://jira.jboss.org/jira/browse/JBWS-2259 - */ -public class JBWS2259TestCase extends JBossWSTest -{ - - private static Endpoint port; - - public static Test suite() throws Exception - { - return new JBossWSTestSetup(JBWS2259TestCase.class, "jaxws-jbws2259.war"); - } - - public void setUp() throws Exception - { - super.setUp(); - - if (port == null) - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2259?wsdl"); - QName serviceName = new QName("http://ws.jboss.org/jbws2259", "EndpointService"); - - Service service = Service.create(wsdlURL, serviceName); - port = service.getPort(Endpoint.class); - - BindingProvider bindingProvider = (BindingProvider)port; - SOAPBinding soapBinding = (SOAPBinding)bindingProvider.getBinding(); - soapBinding.setMTOMEnabled(true); - } - } - - public void testCall() throws Exception - { - File sharkFile = getResourceFile("jaxws/jbws2259/attach.jpeg"); - DataSource ds = new FileDataSource(sharkFile); - DataHandler handler = new DataHandler(ds); - - String expectedContentType = "image/jpeg"; - - Photo p = new Photo(); - p.setCaption("JBWS2259 Smile :-)"); - p.setExpectedContentType(expectedContentType); - p.setImage(handler); - - Photo reponse = port.echo(p); - DataHandler dhResponse = reponse.getImage(); - - String contentType = dhResponse.getContentType(); - assertEquals("content-type", expectedContentType, contentType); - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/JBWS2259TestCase.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -0,0 +1,95 @@ +/* +* JBoss, Home of Professional Open Source. +* Copyright 2009, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file 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.jbws2259; + +import java.io.File; +import java.net.URL; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.activation.FileDataSource; +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test case to test MTOM detection. + * + * @author darran.lofthouse(a)jboss.com + * @since 30th March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +public class JBWS2259TestCase extends JBossWSTest +{ + + private static Endpoint port; + + public static Test suite() throws Exception + { + return new JBossWSTestSetup(JBWS2259TestCase.class, "jaxws-jbws2259.war"); + } + + public void setUp() throws Exception + { + super.setUp(); + + if (port == null) + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2259?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbws2259", "EndpointService"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(Endpoint.class); + + BindingProvider bindingProvider = (BindingProvider)port; + SOAPBinding soapBinding = (SOAPBinding)bindingProvider.getBinding(); + soapBinding.setMTOMEnabled(true); + } + } + + public void testCall() throws Exception + { + File sharkFile = new File("resources/jaxws/jbws2259/attach.jpeg"); + DataSource ds = new FileDataSource(sharkFile); + DataHandler handler = new DataHandler(ds); + + String expectedContentType = "image/jpeg"; + + Photo p = new Photo(); + p.setCaption("JBWS2259 Smile :-)"); + p.setExpectedContentType(expectedContentType); + p.setImage(handler); + + Photo reponse = port.echo(p); + DataHandler dhResponse = reponse.getImage(); + + String contentType = dhResponse.getContentType(); + assertEquals("content-type", expectedContentType, contentType); + } + +} Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java 2009-03-30 14:16:54 UTC (rev 9689) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -1,73 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.jbws2259; - -import javax.activation.DataHandler; -import javax.xml.bind.annotation.XmlMimeType; - -/** - * Representation of a photo to test marshalling. - * - * @author darran.lofthouse(a)jboss.com - * @since 27th March 2009 - */ -public class Photo -{ - - private String caption; - - private String expectedContentType; - - private DataHandler image; - - public String getCaption() - { - return caption; - } - - public void setCaption(String caption) - { - this.caption = caption; - } - - public String getExpectedContentType() - { - return expectedContentType; - } - - public void setExpectedContentType(String expectedContentType) - { - this.expectedContentType = expectedContentType; - } - - @XmlMimeType("*/*") - public DataHandler getImage() - { - return image; - } - - public void setImage(DataHandler image) - { - this.image = image; - } - -} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2259/Photo.java 2009-04-14 16:15:17 UTC (rev 9825) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbws2259; + +import javax.activation.DataHandler; +import javax.xml.bind.annotation.XmlMimeType; + +/** + * Representation of a photo to test marshalling. + * + * @author darran.lofthouse(a)jboss.com + * @since 27th March 2009 + */ +public class Photo +{ + + private String caption; + + private String expectedContentType; + + private DataHandler image; + + public String getCaption() + { + return caption; + } + + public void setCaption(String caption) + { + this.caption = caption; + } + + public String getExpectedContentType() + { + return expectedContentType; + } + + public void setExpectedContentType(String expectedContentType) + { + this.expectedContentType = expectedContentType; + } + + @XmlMimeType("*/*") + public DataHandler getImage() + { + return image; + } + + public void setImage(DataHandler image) + { + this.image = image; + } + +} Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259 (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/WEB-INF) Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml 2009-03-30 14:16:54 UTC (rev 9689) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml 2009-04-14 16:15:17 UTC (rev 9825) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" - xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> - - <client-config> - <config-name>Custom Server Config</config-name> - - <post-handler-chains> - <javaee:handler-chain> - <javaee:handler> - <javaee:handler-name> CustomHandler </javaee:handler-name> - <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2259.CustomHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - -</jaxws-config> Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/jaxws-endpoint-config.xml 2009-04-14 16:15:17 UTC (rev 9825) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Custom Server Config</config-name> + + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name> CustomHandler </javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2259.CustomHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + +</jaxws-config> Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml 2009-03-30 14:16:54 UTC (rev 9689) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml 2009-04-14 16:15:17 UTC (rev 9825) @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jbws2259.EndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> - - -</web-app> - Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml) =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml (rev 0) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/WEB-INF/web.xml 2009-04-14 16:15:17 UTC (rev 9825) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>TestEndpoint</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.jbws2259.EndpointImpl</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>TestEndpoint</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + + +</web-app> + Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/attach.jpeg =================================================================== (Binary files differ) Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2259/attach.jpeg (from rev 9689, stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/attach.jpeg) =================================================================== (Binary files differ)

17 years

1
0
0 / 0

JBossWS SVN: r9824 - in stack/native: tags and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-04-14 09:22:31 -0400 (Tue, 14 Apr 2009) New Revision: 9824 Added: stack/native/tags/jbossws-native-3.1.1.GA/ Removed: stack/native/branches/jbossws-native-3.1.1/ Log: [JBWS-2607] Tagging jbossws-native-3.1.1.GA Copied: stack/native/tags/jbossws-native-3.1.1.GA (from rev 9823, stack/native/branches/jbossws-native-3.1.1)

17 years

1
0
0 / 0

JBossWS SVN: r9823 - in stack/native/branches/jbossws-native-3.1.1: modules/client and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2009-04-14 09:20:18 -0400 (Tue, 14 Apr 2009) New Revision: 9823 Modified: stack/native/branches/jbossws-native-3.1.1/modules/client/pom.xml stack/native/branches/jbossws-native-3.1.1/modules/core/pom.xml stack/native/branches/jbossws-native-3.1.1/modules/jaxrpc/pom.xml stack/native/branches/jbossws-native-3.1.1/modules/jaxws-ext/pom.xml stack/native/branches/jbossws-native-3.1.1/modules/jaxws/pom.xml stack/native/branches/jbossws-native-3.1.1/modules/management/pom.xml stack/native/branches/jbossws-native-3.1.1/modules/resources/pom.xml stack/native/branches/jbossws-native-3.1.1/modules/saaj/pom.xml stack/native/branches/jbossws-native-3.1.1/modules/testsuite/framework-tests/pom.xml stack/native/branches/jbossws-native-3.1.1/modules/testsuite/native-tests/pom.xml stack/native/branches/jbossws-native-3.1.1/modules/testsuite/pom.xml stack/native/branches/jbossws-native-3.1.1/pom.xml Log: [JBWS-2607] Tagging jbossws-native-3.1.1.GA Modified: stack/native/branches/jbossws-native-3.1.1/modules/client/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/client/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/client/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/modules/core/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/core/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/core/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/modules/jaxrpc/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/jaxrpc/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/jaxrpc/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/modules/jaxws/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/jaxws/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/jaxws/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/modules/jaxws-ext/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/jaxws-ext/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/jaxws-ext/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/modules/management/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/management/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/management/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/modules/resources/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/resources/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/resources/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/modules/saaj/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/saaj/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/saaj/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/testsuite/framework-tests/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/testsuite/framework-tests/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/testsuite/native-tests/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/testsuite/native-tests/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/modules/testsuite/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/modules/testsuite/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/branches/jbossws-native-3.1.1/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.1/pom.xml 2009-04-14 12:30:13 UTC (rev 9822) +++ stack/native/branches/jbossws-native-3.1.1/pom.xml 2009-04-14 13:20:18 UTC (rev 9823) @@ -17,7 +17,7 @@ <artifactId>jbossws-native</artifactId> <packaging>pom</packaging> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1.GA</version>  <parent> @@ -28,9 +28,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/branches/jbos...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws...</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/branches/jbossws-na...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url> </scm>

17 years

1
0
0 / 0

JBossWS SVN: r9822 - stack/native/branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2009-04-14 08:30:13 -0400 (Tue, 14 Apr 2009) New Revision: 9822 Removed: stack/native/branches/dlofthouse/JBPAPP-1844/ Log: Delete working branch.

17 years

1
0
0 / 0

JBossWS SVN: r9821 - in stack/native/branches/dlofthouse/JBPAPP-1844: ant-import-tests and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2009-04-14 08:28:10 -0400 (Tue, 14 Apr 2009) New Revision: 9821 Added: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/ stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/CustomHandler.java stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/Endpoint.java stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/EndpointImpl.java stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/JBPAPP1844TestCase.java stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/ stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/ stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/jaxws-endpoint-config.xml stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/jboss.xml Modified: stack/native/branches/dlofthouse/JBPAPP-1844/.classpath stack/native/branches/dlofthouse/JBPAPP-1844/ant-import-tests/build-jars-jaxws.xml stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java Log: Test case and partial backport. Modified: stack/native/branches/dlofthouse/JBPAPP-1844/.classpath =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/.classpath 2009-04-14 12:26:30 UTC (rev 9820) +++ stack/native/branches/dlofthouse/JBPAPP-1844/.classpath 2009-04-14 12:28:10 UTC (rev 9821) @@ -38,7 +38,7 @@ <classpathentry kind="lib" path="thirdparty/concurrent.jar"/> <classpathentry kind="lib" path="thirdparty/junit.jar"/> <classpathentry kind="lib" path="thirdparty/jbossws-common.jar" sourcepath="thirdparty/jbossws-common-src.zip"/> - <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3.jar"/> + <classpathentry kind="lib" path="thirdparty/ejb3.deployer/jboss-ejb3.jar" sourcepath="/ejb3/src/resources/43specific"/> <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-jaxb-intros.jar"/> <classpathentry kind="output" path="output/eclipse"/> Modified: stack/native/branches/dlofthouse/JBPAPP-1844/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/ant-import-tests/build-jars-jaxws.xml 2009-04-14 12:26:30 UTC (rev 9820) +++ stack/native/branches/dlofthouse/JBPAPP-1844/ant-import-tests/build-jars-jaxws.xml 2009-04-14 12:28:10 UTC (rev 9821) @@ -130,7 +130,20 @@ <include name="**/*.wsdl"/> </webinf> </war> - + +  + <jar destfile="${tests.output.dir}/libs/jaxws-jbpapp1844.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbpapp1844/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbpapp1844/*TestCase.class"/> + </fileset> + + <metainf dir="${tests.output.dir}/resources/jaxws/jbpapp1844/META-INF"> + <include name="jboss.xml"/> + <include name="jaxws-endpoint-config.xml"/> + </metainf> + </jar> +  <jar destfile="${tests.output.dir}/libs/jaxws-jbws771.jar"> <fileset dir="${tests.output.dir}/classes"> Modified: stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2009-04-14 12:26:30 UTC (rev 9820) +++ stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2009-04-14 12:28:10 UTC (rev 9821) @@ -134,7 +134,7 @@ processHandlerChain(sepMetaData, sepClass); // process config - processEndpointConfig(sepClass, linkName, sepMetaData); + processEndpointConfig(dep, sepMetaData, sepClass, linkName); // Set the endpoint address processWebContext(dep, sepClass, linkName, sepMetaData); Modified: stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2009-04-14 12:26:30 UTC (rev 9820) +++ stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2009-04-14 12:28:10 UTC (rev 9821) @@ -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.builder.jaxws; // $Id$ @@ -33,6 +33,8 @@ import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; /** * Builds ServiceEndpointMetaData for a JAX-WS endpoint. @@ -56,22 +58,39 @@ } } - protected void processEndpointConfig(Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData) + protected void processEndpointConfig(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> wsClass, String linkName) { - EndpointConfig anEndpointConfig = wsClass.getAnnotation(EndpointConfig.class); - - if (anEndpointConfig== null) - return; - String configName = null; String configFile = null; - if (anEndpointConfig.configName().length() > 0) - configName = anEndpointConfig.configName(); + EndpointConfig anEndpointConfig = wsClass.getAnnotation(EndpointConfig.class); + if (anEndpointConfig != null) + { + if (anEndpointConfig.configName().length() > 0) + configName = anEndpointConfig.configName(); - if (anEndpointConfig.configFile().length() > 0) - configFile = anEndpointConfig.configFile(); - + if (anEndpointConfig.configFile().length() > 0) + configFile = anEndpointConfig.configFile(); + } + + JSEArchiveMetaData jseMetaData = dep.getAttachment(JSEArchiveMetaData.class); + if (jseMetaData != null) + { + if (jseMetaData.getConfigName() != null) + configName = jseMetaData.getConfigName(); + if (jseMetaData.getConfigFile() != null) + configFile = jseMetaData.getConfigFile(); + } + + EJBArchiveMetaData ejbMetaData = dep.getAttachment(EJBArchiveMetaData.class); + if (ejbMetaData != null) + { + if (ejbMetaData.getConfigName() != null) + configName = ejbMetaData.getConfigName(); + if (ejbMetaData.getConfigFile() != null) + configFile = ejbMetaData.getConfigFile(); + } + if (configName != null || configFile != null) sepMetaData.setConfigName(configName, configFile); } @@ -82,7 +101,7 @@ if (anWebContext == null) return; - + boolean isJSEEndpoint = (dep.getType() == DeploymentType.JAXWS_JSE); // context-root @@ -143,7 +162,7 @@ sepMetaData.setTransportGuarantee(transportGuarantee); } } - + // secure wsdl access sepMetaData.setSecureWSDLAccess(anWebContext.secureWSDLAccess()); } Modified: stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2009-04-14 12:26:30 UTC (rev 9820) +++ stack/native/branches/dlofthouse/JBPAPP-1844/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2009-04-14 12:28:10 UTC (rev 9821) @@ -134,7 +134,7 @@ processBindingType(sepMetaData, seiClass); // process config - processEndpointConfig(sepClass, linkName, sepMetaData); + processEndpointConfig(dep, sepMetaData, sepClass, linkName); // Process web methods processWebMethods(sepMetaData, seiClass); Added: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/CustomHandler.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/CustomHandler.java (rev 0) +++ stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/CustomHandler.java 2009-04-14 12:28:10 UTC (rev 9821) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbpapp1844; + +import javax.xml.transform.dom.DOMSource; +import javax.xml.ws.LogicalMessage; +import javax.xml.ws.handler.LogicalMessageContext; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.jbws2285.LogicalHandler; +import org.jboss.ws.WSException; +import org.jboss.wsf.common.DOMWriter; +import org.jboss.wsf.test.GenericLogicalHandler; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * Test handler to test jboss.xml configuration. + * + * @author darran.lofthouse(a)jboss.com + * @since 31st March 2009 + * @see https://jira.jboss.org/jira/browse/JBPAPP-1844 + */ +public class CustomHandler extends GenericLogicalHandler +{ + private static final Logger log = Logger.getLogger(LogicalHandler.class); + + @Override + protected boolean handleInbound(final MessageContext msgContext) + { + log.info("handleInbound()"); + + LogicalMessageContext lmc = (LogicalMessageContext)msgContext; + LogicalMessage message = lmc.getMessage(); + + Object payload = message.getPayload(); + + if (payload instanceof DOMSource == false) + { + throw new WSException("Test requires DOMSource payload"); + } + + DOMSource domPayload = (DOMSource)payload; + Node node = domPayload.getNode(); + + NodeList nodes = node.getChildNodes(); + for (int i = 0; i < nodes.getLength(); i++) + { + Node current = nodes.item(i); + if ("arg0".equals(current.getLocalName())) + { + current.setTextContent("XXX"); + } + } + + log.info(DOMWriter.printNode(node, false)); + + return true; + } + +} Property changes on: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/CustomHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/Endpoint.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/Endpoint.java (rev 0) +++ stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/Endpoint.java 2009-04-14 12:28:10 UTC (rev 9821) @@ -0,0 +1,39 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbpapp1844; + +import javax.jws.WebService; + +/** + * Test Endpoint to configuration using jboss.xml + * + * @author darran.lofthouse(a)jboss.com + * @since 31st March 2009 + * @see https://jira.jboss.org/jira/browse/JBPAPP-1844 + */ +@WebService(name = "Endpoint", targetNamespace = "http://ws.jboss.org/jbpapp1844") +public interface Endpoint +{ + + public String echo(final String message); + +} Property changes on: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/Endpoint.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/EndpointImpl.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/EndpointImpl.java (rev 0) +++ stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/EndpointImpl.java 2009-04-14 12:28:10 UTC (rev 9821) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbpapp1844; + +import javax.jws.WebService; + +import org.jboss.ws.annotation.EndpointConfig; +import javax.ejb.Stateless; + +/** + * Test Endpoint to test jboss.xml configuration + * + * @author darran.lofthouse(a)jboss.com + * @since 31st March 2009 + * @see https://jira.jboss.org/jira/browse/JBWS-2259 + */ +@WebService(name = "Endpoint", serviceName = "EndpointService", targetNamespace = "http://ws.jboss.org/jbpapp1844", endpointInterface = "org.jboss.test.ws.jaxws.jbpapp1844.Endpoint") +@Stateless +public class EndpointImpl implements Endpoint +{ + + public String echo(final String message) + { + return message; + } + +} Property changes on: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/EndpointImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/JBPAPP1844TestCase.java =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/JBPAPP1844TestCase.java (rev 0) +++ stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/JBPAPP1844TestCase.java 2009-04-14 12:28:10 UTC (rev 9821) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.jbpapp1844; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test case to test jboss.xml configuration. + * + * @author darran.lofthouse(a)jboss.com + * @since 31st March 2009 + * @see https://jira.jboss.org/jira/browse/JBPAPP-1844 + */ +public class JBPAPP1844TestCase extends JBossWSTest +{ + + private static Endpoint port; + + public static Test suite() + { + return new JBossWSTestSetup(JBPAPP1844TestCase.class, "jaxws-jbpapp1844.jar"); + } + + public void setUp() throws Exception + { + super.setUp(); + + if (port == null) + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbpapp1844/EndpointImpl?wsdl"); + QName serviceName = new QName("http://ws.jboss.org/jbpapp1844", "EndpointService"); + + Service service = Service.create(wsdlURL, serviceName); + port = service.getPort(Endpoint.class); + } + } + + public void testCall() throws Exception + { + String response = port.echo("Hello !!"); + assertEquals("Response", "XXX", response); + } + +} Property changes on: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/java/org/jboss/test/ws/jaxws/jbpapp1844/JBPAPP1844TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/jaxws-endpoint-config.xml =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/jaxws-endpoint-config.xml (rev 0) +++ stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/jaxws-endpoint-config.xml 2009-04-14 12:28:10 UTC (rev 9821) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jaxws-config xmlns="urn:jboss:jaxws-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd"> + + <client-config> + <config-name>Custom Server Config</config-name> + + <post-handler-chains> + <javaee:handler-chain> + <javaee:handler> + <javaee:handler-name> CustomHandler </javaee:handler-name> + <javaee:handler-class>org.jboss.test.ws.jaxws.jbpapp1844.CustomHandler</javaee:handler-class> + </javaee:handler> + </javaee:handler-chain> + </post-handler-chains> + </client-config> + +</jaxws-config> Property changes on: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/jaxws-endpoint-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/jboss.xml =================================================================== --- stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/jboss.xml (rev 0) +++ stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/jboss.xml 2009-04-14 12:28:10 UTC (rev 9821) @@ -0,0 +1,17 @@ +<?xml version='1.0' encoding='UTF-8' ?> + +<!DOCTYPE jboss PUBLIC + "-//JBoss//DTD JBOSS 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss_4_2.dtd"> + +<jboss> + + <webservices> + <webservice-description> + <webservice-description-name>JBPAPP-1844 - WS</webservice-description-name> + <config-name>Custom Server Config</config-name> + <config-file>META-INF/jaxws-endpoint-config.xml</config-file> + </webservice-description> + </webservices> + +</jboss> \ No newline at end of file Property changes on: stack/native/branches/dlofthouse/JBPAPP-1844/src/test/resources/jaxws/jbpapp1844/META-INF/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years

1
0
0 / 0

JBossWS SVN: r9820 - stack/native/branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2009-04-14 08:26:30 -0400 (Tue, 14 Apr 2009) New Revision: 9820 Added: stack/native/branches/dlofthouse/JBPAPP-1844/ Log: Branch to test backport. Copied: stack/native/branches/dlofthouse/JBPAPP-1844 (from rev 9819, stack/native/branches/jbossws-native-2.0.1.SP2_CP)

17 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2009