Author: bmaxwell Date: 2010-12-17 11:58:43 -0500 (Fri, 17 Dec 2010) New Revision: 13520 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java Log: [JBPAPP-5597] MTOM + WS-Security not working Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java 2010-12-17 16:48:44 UTC (rev 13519) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/EncryptTestCase.java 2010-12-17 16:58:43 UTC (rev 13520) @@ -90,15 +90,15 @@ private TestEndpoint getPort() throws Exception { - System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("jaxws/jbws2014/wsse.keystore").getPath()); - System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("jaxws/jbws2014/wsse.truststore").getPath()); + System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("resources/jaxws/jbws2014/wsse.keystore").getPath()); + System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("resources/jaxws/jbws2014/wsse.truststore").getPath()); System.setProperty("org.jboss.ws.wsse.keyStorePassword", "jbossws"); System.setProperty("org.jboss.ws.wsse.trustStorePassword", "jbossws"); System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks"); System.setProperty("org.jboss.ws.wsse.trustStoreType", "jks"); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2014?wsdl"); - URL securityURL = getResourceURL("jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml"); + URL securityURL = getResourceURL("resources/jaxws/jbws2014/encrypt/META-INF/jboss-wsse-client.xml"); QName serviceName = new QName("http://org.jboss.ws/jbws2014", "TestService"); Service service = Service.create(wsdlURL, serviceName); @@ -112,17 +112,16 @@ return port; } - /** Try to discover the URL for the test resource */ - public URL getResourceURL(String resource) throws MalformedURLException - { - return getResourceFile(resource).toURL(); - } + /** Try to discover the URL for the test resource */ + public URL getResourceURL(String resource) throws MalformedURLException + { + return getResourceFile(resource).toURL(); + } - /** Try to discover the File for the test resource */ - public File getResourceFile(String resource) - { - File file = new File(resource); - return file; - } - + /** Try to discover the File for the test resource */ + public File getResourceFile(String resource) + { + File file = new File(resource); + return file; + } } Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java 2010-12-17 16:48:44 UTC (rev 13519) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2014/SignTestCase.java 2010-12-17 16:58:43 UTC (rev 13520) @@ -86,15 +86,15 @@ private TestEndpoint getPort() throws Exception { - System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("jaxws/jbws2014/wsse.keystore").getPath()); - System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("jaxws/jbws2014/wsse.truststore").getPath()); + System.setProperty("org.jboss.ws.wsse.keyStore", getResourceFile("resources/jaxws/jbws2014/wsse.keystore").getPath()); + System.setProperty("org.jboss.ws.wsse.trustStore", getResourceFile("resources/jaxws/jbws2014/wsse.truststore").getPath()); System.setProperty("org.jboss.ws.wsse.keyStorePassword", "jbossws"); System.setProperty("org.jboss.ws.wsse.trustStorePassword", "jbossws"); System.setProperty("org.jboss.ws.wsse.keyStoreType", "jks"); System.setProperty("org.jboss.ws.wsse.trustStoreType", "jks"); URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2014?wsdl"); - URL securityURL = getResourceURL("jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml"); + URL securityURL = getResourceURL("resources/jaxws/jbws2014/sign/META-INF/jboss-wsse-client.xml"); QName serviceName = new QName("http://org.jboss.ws/jbws2014", "TestService"); Service service = Service.create(wsdlURL, serviceName); @@ -108,16 +108,16 @@ return port; } - /** Try to discover the URL for the test resource */ - public URL getResourceURL(String resource) throws MalformedURLException - { - return getResourceFile(resource).toURL(); - } + /** Try to discover the URL for the test resource */ + public URL getResourceURL(String resource) throws MalformedURLException + { + return getResourceFile(resource).toURL(); + } - /** Try to discover the File for the test resource */ - public File getResourceFile(String resource) - { - File file = new File(resource); - return file; - } + /** Try to discover the File for the test resource */ + public File getResourceFile(String resource) + { + File file = new File(resource); + return file; + } }