Author: alessio.soldano(a)jboss.com Date: 2008-02-08 14:08:19 -0500 (Fri, 08 Feb 2008) New Revision: 5641 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/NewspaperSWAEndpoint.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/Printer.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePrinter.java Log: [JBWS-1895] Some final minor fixes Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/NewspaperSWAEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/NewspaperSWAEndpoint.java 2008-02-08 11:46:18 UTC (rev 5640) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/NewspaperSWAEndpoint.java 2008-02-08 19:08:19 UTC (rev 5641) @@ -27,7 +27,6 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.annotation.security.SecurityDomain; import org.jboss.wsf.spi.annotation.WebContext; /** @@ -43,7 +42,6 @@ serviceName = "NewspaperSWAService") @SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL) -@SecurityDomain("JBossWS") @WebContext(contextRoot="/news", urlPattern="/newspaper/swa") public class NewspaperSWAEndpoint extends AbstractNewspaperSWAEndpoint implements NewspaperSWA Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/Printer.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/Printer.java 2008-02-08 11:46:18 UTC (rev 5640) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/Printer.java 2008-02-08 19:08:19 UTC (rev 5641) @@ -90,7 +90,7 @@ System.out.println("Downloading newspaper document: " + id); EditionSWA edition = swaEndpoint.getNewspaperEdition(id); DataHandler dh = edition.getContent(); - System.out.println("Content: " + dh.getContentType()); + System.out.println("Content type: " + dh.getContentType()); System.out.println("Content: " + dh.getContent()); } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.java 2008-02-08 11:46:18 UTC (rev 5640) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePressReleaseEndpoint.java 2008-02-08 19:08:19 UTC (rev 5641) @@ -27,7 +27,6 @@ import javax.jws.WebService; import javax.jws.soap.SOAPBinding; -import org.jboss.annotation.security.SecurityDomain; import org.jboss.ws.annotation.EndpointConfig; import org.jboss.wsf.spi.annotation.WebContext; @@ -43,7 +42,6 @@ serviceName = "PressReleaseService") @SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL) -@SecurityDomain("JBossWS") @WebContext(contextRoot="/news", urlPattern="/pressRelease") @EndpointConfig(configName = "Standard WSSecurity Endpoint") Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePrinter.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePrinter.java 2008-02-08 11:46:18 UTC (rev 5640) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecurePrinter.java 2008-02-08 19:08:19 UTC (rev 5641) @@ -41,9 +41,6 @@ BindingProvider bp = mtom ? (BindingProvider)mtomEndpoint : (BindingProvider)swaEndpoint; bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "kermit"); bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "thefrog"); - System.setProperty("javax.net.ssl.trustStore", "/home/alessio/dati/jboss-4.2.2.GA/server/default/truststore_ale"); - System.setProperty("javax.net.ssl.trustStorePassword", "changeit"); - System.setProperty("javax.net.ssl.trustStoreType", "jks"); System.setProperty("org.jboss.security.ignoreHttpsHost", "true"); } @@ -59,9 +56,11 @@ else { System.out.println("SecurePrinter client usage:"); - System.out.println("wsrunclient.sh -classpath agency.jar org.jboss.test.ws.jaxws.samples.news.SecurePrinter http://host:port/news/newspaper/mtom?wsdl"); + System.out.println("wsrunclient.sh -classpath agency.jar -Djavax.net.ssl.trustStore=truststorePath -Djavax.net.ssl.trustStorePassword=truststorePwd " + + "org.jboss.test.ws.jaxws.samples.news.SecurePrinter http://host:port/news/newspaper/mtom?wsdl"); System.out.println("or"); - System.out.println("wsrunclient.sh -classpath agency.jar org.jboss.test.ws.jaxws.samples.news.SecurePrinter http://host:port/news/newspaper/swa?wsdl"); + System.out.println("wsrunclient.sh -classpath agency.jar -Djavax.net.ssl.trustStore=truststorePath -Djavax.net.ssl.trustStorePassword=truststorePwd " + + "org.jboss.test.ws.jaxws.samples.news.SecurePrinter http://host:port/news/newspaper/swa?wsdl"); } } catch (Exception e)