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

Author: mageshbk(a)jboss.com Date: 2010-03-22 02:36:43 -0400 (Mon, 22 Mar 2010) New Revision: 11831 Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/pom.xml Log: Fix test case failures Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2010-03-22 06:02:27 UTC (rev 11830) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2010-03-22 06:36:43 UTC (rev 11831) @@ -65,7 +65,7 @@ http://jira.codehaus.org/browse/MANTRUN-91 --> <javac destdir="${tests.output.dir}/test-classes" debug="true" encoding="utf-8" deprecation="true" fork="true" - executable="${java.jdk15.home}/bin/javac" compiler="javac1.5"> + source="1.5" target="1.5"> <src path="${tests.output.dir}/wstools/java"/> <classpath> <pathelement path="${maven.test.classpath}"/> Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-03-22 06:02:27 UTC (rev 11830) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-03-22 06:36:43 UTC (rev 11831) @@ -100,6 +100,11 @@ { try { + //When testUsernameToken() execute before, need to clear reqContext + Map<String, Object> reqContext = usernameDispatch.getRequestContext(); + reqContext.remove(BindingProvider.USERNAME_PROPERTY); + reqContext.remove(BindingProvider.PASSWORD_PROPERTY); + String payload = "<ns1:getUsernameToken xmlns:ns1='http://org.jboss.ws/samples/wssecurity'/>"; usernameDispatch.invoke(new StreamSource(new StringReader(payload))); fail("Server should respond with [401] - Unauthorized"); Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-03-22 06:02:27 UTC (rev 11830) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-03-22 06:36:43 UTC (rev 11831) @@ -72,6 +72,11 @@ { try { + //When testUsernameToken() execute before, need to clear reqContext + Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + reqContext.remove(BindingProvider.USERNAME_PROPERTY); + reqContext.remove(BindingProvider.PASSWORD_PROPERTY); + port.getUsernameToken(); fail("Server should respond with [401] - Unauthorized"); } @@ -90,4 +95,4 @@ String retObj = port.getUsernameToken(); assertEquals("kermit", retObj); } -} +} \ No newline at end of file Modified: stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/pom.xml 2010-03-22 06:02:27 UTC (rev 11830) +++ stack/native/branches/jbossws-native-3.1.2.SP3_JBPAPP-3943/pom.xml 2010-03-22 06:36:43 UTC (rev 11831) @@ -64,7 +64,7 @@ <jboss.common.version>1.2.1.GA</jboss.common.version> <jboss.jaxbintros.version>1.0.0.GA</jboss.jaxbintros.version> <jboss.logging.version>2.0.5.GA</jboss.logging.version> - <jboss.remoting.version>2.5.0.SP2</jboss.remoting.version> + <jboss.remoting.version>2.5.2</jboss.remoting.version> <jboss.jaxr.version>1.2.1.GA</jboss.jaxr.version> <apache.scout.version>0.7rc2</apache.scout.version> <juddi.version>0.9RC4</juddi.version> @@ -286,6 +286,13 @@ <build> <plugins> <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.4</version> + <configuration> + <escapeWindowsPaths>false</escapeWindowsPaths> + </configuration> + </plugin> + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -433,8 +440,8 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <compilerVersion>1.5</compilerVersion> - <executable>${java.jdk15.home}/bin/javac</executable> + <source>1.5</source> + <target>1.5</target> <fork>true</fork> </configuration> </plugin>