Author: alessio.soldano(a)jboss.com Date: 2008-02-08 06:11:55 -0500 (Fri, 08 Feb 2008) New Revision: 5639 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureAgency.java stack/native/trunk/src/test/resources/jaxws/samples/news/META-INF/jboss-wsse-client.xml Log: [JBWS-1895] Setting client side keystore/truststore in jboss-wsse-client.xml Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureAgency.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureAgency.java 2008-02-08 10:57:11 UTC (rev 5638) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureAgency.java 2008-02-08 11:11:55 UTC (rev 5639) @@ -31,20 +31,6 @@ { super(url); ((StubExt)endpoint).setConfigName("Standard WSSecurity Client"); - if (System.getProperty("org.jboss.ws.wsse.keyStore") == null) - { - System.setProperty("org.jboss.ws.wsse.keyStore", "alice-sign_enc.jks"); - System.setProperty("org.jboss.ws.wsse.keyStorePassword", "password"); - } - if (System.getProperty("org.jboss.ws.wsse.trustStore") == null) - { - System.setProperty("org.jboss.ws.wsse.trustStore", "wsse10.truststore"); - System.setProperty("org.jboss.ws.wsse.trustStorePassword", "password"); - } - System.out.println("keystore: " + System.getProperty("org.jboss.ws.wsse.keyStore")); - System.out.println("truststore: " + System.getProperty("org.jboss.ws.wsse.trustStore")); - System.out.println("keystore password: " + System.getProperty("org.jboss.ws.wsse.keyStorePassword")); - System.out.println("truststore password: " + System.getProperty("org.jboss.ws.wsse.trustStorePassword")); } public static void main(String[] args) Modified: stack/native/trunk/src/test/resources/jaxws/samples/news/META-INF/jboss-wsse-client.xml =================================================================== --- stack/native/trunk/src/test/resources/jaxws/samples/news/META-INF/jboss-wsse-client.xml 2008-02-08 10:57:11 UTC (rev 5638) +++ stack/native/trunk/src/test/resources/jaxws/samples/news/META-INF/jboss-wsse-client.xml 2008-02-08 11:11:55 UTC (rev 5639) @@ -2,6 +2,13 @@ <jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + + <key-store-file>META-INF/alice-sign_enc.jks</key-store-file> + <key-store-password>password</key-store-password> + <key-store-type>jks</key-store-type> + <trust-store-file>META-INF/wsse10.truststore</trust-store-file> + <trust-store-password>password</trust-store-password> + <config> <timestamp ttl="300"/> <sign type="x509v3" alias="1" includeTimestamp="true"/>