Author: jim.ma Date: 2010-02-23 23:57:12 -0500 (Tue, 23 Feb 2010) New Revision: 11666 Modified: stack/native/branches/jbossws-native-3.1.2.SP5-patch01/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java stack/native/branches/jbossws-native-3.1.2.SP5-patch01/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java stack/native/branches/jbossws-native-3.1.2.SP5-patch01/pom.xml Log: Merged [JBWS-2819] and [JBWS-2818] fix from trunk Modified: stack/native/branches/jbossws-native-3.1.2.SP5-patch01/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP5-patch01/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-02-24 01:49:48 UTC (rev 11665) +++ stack/native/branches/jbossws-native-3.1.2.SP5-patch01/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-02-24 04:57:12 UTC (rev 11666) @@ -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.SP5-patch01/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP5-patch01/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-02-24 01:49:48 UTC (rev 11665) +++ stack/native/branches/jbossws-native-3.1.2.SP5-patch01/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-02-24 04:57:12 UTC (rev 11666) @@ -72,6 +72,10 @@ { 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"); } Modified: stack/native/branches/jbossws-native-3.1.2.SP5-patch01/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2.SP5-patch01/pom.xml 2010-02-24 01:49:48 UTC (rev 11665) +++ stack/native/branches/jbossws-native-3.1.2.SP5-patch01/pom.xml 2010-02-24 04:57:12 UTC (rev 11666) @@ -339,6 +339,14 @@ <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> @@ -493,8 +501,6 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <compilerVersion>1.5</compilerVersion> - <executable>${java.jdk15.home}/bin/javac</executable> <fork>true</fork> </configuration> </plugin>