[jbossws-commits] JBossWS SVN: r12191 - in stack/native/branches/jbossws-native-3.1.2: modules/client and 2 other directories.

Author: jim.ma Date: 2010-05-07 08:50:34 -0400 (Fri, 07 May 2010) New Revision: 12191 Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java stack/native/branches/jbossws-native-3.1.2/pom.xml Log: [JBPAPP-3813]:Fixed windows issues in test case and build system;Added jars to classpath entry in client menifest Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2010-05-07 12:44:00 UTC (rev 12190) +++ stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2010-05-07 12:50:34 UTC (rev 12191) @@ -49,7 +49,7 @@ <configuration> <archive> <manifestEntries> - <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-remoting.jar jboss-xml-binding.jar stax-api.jar wsdl4j.jar</Class-Path> + <Class-Path>jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jbossws-native-core.jar jbossws-native-jaxrpc.jar jbossws-native-jaxws.jar jaxws-api.jar jsr181-api.jar jbossws-native-jaxws-ext.jar jbossws-native-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jboss-remoting.jar stax-api.jar wsdl4j.jar</Class-Path> </manifestEntries> </archive> </configuration> Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2010-05-07 12:44:00 UTC (rev 12190) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2010-05-07 12:50:34 UTC (rev 12191) @@ -341,6 +341,11 @@ File locationFile = null; if (predefinedLocation == false) { + //JBWS-2829: windows issue + if (archiveName.startsWith("http://")) { + archiveName = archiveName.replace("http://", "http-"); + } + locationFile = new File(serverConfig.getServerDataDir().getCanonicalPath() + "/wsdl/" + archiveName); } else Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-05-07 12:44:00 UTC (rev 12190) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2010-05-07 12:50:34 UTC (rev 12191) @@ -100,7 +100,11 @@ { try { - String payload = "<ns1:getUsernameToken xmlns:ns1='http://org.jboss.ws/samples/wssecurity'/>"; + //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/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-05-07 12:44:00 UTC (rev 12190) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2010-05-07 12:50:34 UTC (rev 12191) @@ -71,7 +71,11 @@ public void testUsernameTokenNegative() throws Exception { 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/pom.xml =================================================================== --- stack/native/branches/jbossws-native-3.1.2/pom.xml 2010-05-07 12:44:00 UTC (rev 12190) +++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2010-05-07 12:50:34 UTC (rev 12191) @@ -339,6 +339,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>