Author: maeste Date: 2007-05-07 05:47:19 -0400 (Mon, 07 May 2007) New Revision: 2987 Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java Log: Samples work continued Modified: branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java =================================================================== --- branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-05-06 22:32:28 UTC (rev 2986) +++ branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/core/server/UnifiedDeploymentInfo.java 2007-05-07 09:47:19 UTC (rev 2987) @@ -114,6 +114,9 @@ if (deploymentPath.startsWith("jar:") && deploymentPath.endsWith("!/") == false) deploymentPath += "!/"; + if (deploymentPath.startsWith("war:") && deploymentPath.endsWith("!/") == false) + deploymentPath += "!/"; + if (deploymentPath.endsWith("/") == false) deploymentPath += "/"; 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 22:32:28 UTC (rev 2986) +++ branches/JBWS-856/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-05-07 09:47:19 UTC (rev 2987) @@ -457,7 +457,7 @@ </webinf> </war> - <!-- jaxws-samples-wssecurity-encrypt --> + <!-- jaxws-samples-wssecuritypolicy-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"/> @@ -467,7 +467,7 @@ <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecuritypolicy"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> - <include name="PolicyAttachmetFragment.wsdl"/> + <include name="PolicyAttachmentFragment.wsdl"/> </webinf> </war> <!-- jaxws-samples-xop-doclit --> 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 22:32:28 UTC (rev 2986) +++ branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/HelloJavaBean.java 2007-05-07 09:47:19 UTC (rev 2987) @@ -31,7 +31,7 @@ import org.jboss.ws.annotation.Policy; @WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity") -@Policy(wsdlFragmentLocation="file://dati/PolicyAttachmentFragment.wsdl") +@Policy(wsdlFragmentLocation="WEB-INF/PolicyAttachmentFragment.wsdl") @SOAPBinding(style = SOAPBinding.Style.RPC) public class HelloJavaBean { Added: branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl =================================================================== --- branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl (rev 0) +++ branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecuritypolicy/PolicyAttachmentFragment.wsdl 2007-05-07 09:47:19 UTC (rev 2987) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name="TestService" targetNamespace="http://org.jboss.ws/jaxrpc" + xmlns:tns="http://org.jboss.ws/jaxrpc" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:fab="http://www.fabrikam123.example.com/stock" + xmlns:rmp="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" + xmlns:sp="http://www.jboss.com/ws-security/schema/jboss-ws-security_... + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <wsp:Policy wsu:Id="X509EndpointPolicy" > + <sp:jboss-ws-security> + <sp:key-store-file>WEB-INF/wsse.keystore</sp:key-store-file> + <sp:key-store-password>jbossws</sp:key-store-password> + <sp:trust-store-file>WEB-INF/wsse.truststore</sp:trust-store-file> + <sp:trust-store-password>jbossws</sp:trust-store-password> + <sp:config> + <sp:encrypt type="x509v3" alias="wsse"/> + <sp:requires> + <sp:encryption/> + </sp:requires> + </sp:config> + </sp:jboss-ws-security> + </wsp:Policy> + <binding name='HelloBinding' type='tns:Hello'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <wsp:PolicyReference URI="#X509EndpointPolicy" wsdl:required="true" /> + <operation name='echoUserType'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/> + </output> + </operation> + </binding> + <service name='HelloService'> + <port binding='tns:HelloBinding' name='HelloPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions>