[jbossws-commits] JBossWS SVN: r10729 - in stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817: modules/testsuite/native-tests/scripts and 1 other directories.

Author: darran.lofthouse(a)jboss.com Date: 2009-09-21 12:33:51 -0400 (Mon, 21 Sep 2009) New Revision: 10729 Removed: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBeanWrong.java Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/pom.xml Log: [JBPAPP-2817] Relax restriction on @WebContext(authMethod). Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-09-21 16:05:51 UTC (rev 10728) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2009-09-21 16:33:51 UTC (rev 10729) @@ -537,20 +537,6 @@ <include name="jboss-app.xml"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2565-wrong.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBeanWrong.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2565-wrong.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-jbws2565-wrong.jar"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2565/wrong/META-INF"> - <include name="application.xml"/> - <include name="jboss-app.xml"/> - </metainf> - </jar> <!-- jaxws-jbws2682 --> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2682.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2682/WEB-INF/web.xml"> Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java 2009-09-21 16:05:51 UTC (rev 10728) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java 2009-09-21 16:33:51 UTC (rev 10729) @@ -56,19 +56,6 @@ final String[] serviceArgs = {}; final String result = (String) call.invoke(serviceArgs); assertEquals("i've done stuff", result); - } + } - public void testWrongArchiveDeployment() throws Exception - { - try - { - this.deploy("jaxws-jbws2565-wrong.ear"); - fail("Deployment of this archive had to fail."); - } - catch (Exception ignore) - { - log.error("Expected exception caught:" + ignore.getMessage(), ignore); - } - } - } Deleted: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBeanWrong.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBeanWrong.java 2009-09-21 16:05:51 UTC (rev 10728) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/MyWebServiceBeanWrong.java 2009-09-21 16:33:51 UTC (rev 10729) @@ -1,43 +0,0 @@ -/** - * - */ -package org.jboss.test.ws.jaxws.jbws2565; - -import javax.annotation.security.PermitAll; -import javax.ejb.Stateless; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.wsf.spi.annotation.TransportGuarantee; -import org.jboss.wsf.spi.annotation.WebContext; - -@Stateless -@PermitAll -@WebService -( - name = "MyWebService", - targetNamespace = "http://my.services.web", - serviceName = "MyWebServiceName" -) -@WebContext -( - contextRoot = "/jaxws-jbws2565-wrong", - transportGuarantee = TransportGuarantee.NONE, - authMethod = "NONE" // this is wrong value, deployment should be rejected -) -@SOAPBinding -( - use = SOAPBinding.Use.LITERAL, - style = SOAPBinding.Style.DOCUMENT, - parameterStyle = SOAPBinding.ParameterStyle.WRAPPED -) -public final class MyWebServiceBeanWrong -{ - @WebMethod - @PermitAll - public final String doStuff() - { - return "i've done stuff"; - } -} Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/pom.xml 2009-09-21 16:05:51 UTC (rev 10728) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-2817/pom.xml 2009-09-21 16:33:51 UTC (rev 10729) @@ -49,7 +49,7 @@ <properties> <jbossws.common.version>1.1.0.SP2</jbossws.common.version> <jbossws.framework.version>3.1.2.SP4</jbossws.framework.version> - <jbossws.spi.version>1.1.2.SP1</jbossws.spi.version> + <jbossws.spi.version>1.1.2.SP1_JBPAPP-2817</jbossws.spi.version> <!-- [JBWS-2505] --> <!-- START --> <!--