[jbossws-commits] JBossWS SVN: r2983 - in branches/JBWS-856/jbossws-tests: ant-import and 2 other directories.

Author: maeste Date: 2007-05-06 16:59:10 -0400 (Sun, 06 May 2007) New Revision: 2983 Modified: branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml branches/JBWS-856/jbossws-tests/build.xml branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml Log: work on samples continuing Modified: branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-06 13:14:16 UTC (rev 2982) +++ branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-06 20:59:10 UTC (rev 2983) @@ -457,6 +457,19 @@ </webinf> </war> + <!-- jaxws-samples-wssecurity-encrypt --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecuritypolicy-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecuritypolicy/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + <include name="PolicyAttachmetFragment.wsdl"/> + </webinf> + </war> <!-- jaxws-samples-xop-doclit --> <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -469,4 +482,4 @@ </target> -</project> \ No newline at end of file +</project> Modified: branches/JBWS-856/jbossws-tests/build.xml =================================================================== --- branches/JBWS-856/jbossws-tests/build.xml 2007-05-06 13:14:16 UTC (rev 2982) +++ branches/JBWS-856/jbossws-tests/build.xml 2007-05-06 20:59:10 UTC (rev 2983) @@ -354,6 +354,7 @@ </taskdef> <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> + <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecuritypolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecuritypolicy.HelloJavaBean"/> </target> <target name="generate-resources" depends="servicegen,wstools,wsprovide"> Modified: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java =================================================================== --- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2007-05-06 13:14:16 UTC (rev 2982) +++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2007-05-06 20:59:10 UTC (rev 2983) @@ -28,9 +28,10 @@ import org.jboss.logging.Logger; import org.jboss.ws.annotation.EndpointConfig; +import org.jboss.ws.annotation.Policy; @WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity") -@EndpointConfig(configName = "Standard WSSecurity Endpoint") +@Policy(wsdlFragmentLocation="file://dati/PolicyAttachmentFragment.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) public class HelloJavaBean { Modified: branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java =================================================================== --- branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-05-06 13:14:16 UTC (rev 2982) +++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2007-05-06 20:59:10 UTC (rev 2983) @@ -50,7 +50,7 @@ /** Deploy the test */ public static Test suite() throws Exception { - return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecurity-encrypt.war"); + return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecuritypolicy-encrypt.war"); } /** @@ -68,18 +68,18 @@ private Hello getPort() throws Exception { - URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); - URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); - QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); + URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecuritypolicy/HelloService.wsdl").toURL(); + URL securityURL = new File("resources/jaxws/samples/wssecuritypolicy/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); + QName serviceName = new QName("http://org.jboss.ws/samples/wssecuritypolicy", "HelloService"); Service service = Service.create(wsdlURL, serviceName); ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm()); Hello port = (Hello)service.getPort(Hello.class); - ((StubExt)port).setConfigName("Standard WSSecurity Client"); + ((StubExt)port).setConfigName("Standard wssecuritypolicy Client"); Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); - reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-encrypt"); + reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecuritypolicy-encrypt"); return port; } Modified: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml 2007-05-06 13:14:16 UTC (rev 2982) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/WEB-INF/web.xml 2007-05-06 20:59:10 UTC (rev 2983) @@ -7,7 +7,7 @@ <servlet> <servlet-name>HelloService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.samples.wssecuritypolicy.HelloJavaBean</servlet-class> </servlet> <servlet-mapping> <servlet-name>HelloService</servlet-name>