Author: maeste
Date: 2007-05-17 07:55:45 -0400 (Thu, 17 May 2007)
New Revision: 3121
Removed:
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml
Modified:
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java
Log:
wsprovide still don't work with @Policy annotation, but file reading seems correct
Modified:
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java
===================================================================
---
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-17
11:53:42 UTC (rev 3120)
+++
branches/JBWS-856/jbossws-core/src/java/org/jboss/ws/extensions/policy/metadata/PolicyMetaDataBuilder.java 2007-05-17
11:55:45 UTC (rev 3121)
@@ -96,6 +96,11 @@
InputStream is = null;
try
{
+
System.out.println("++++++++++++++++++++"+policy.policyFileLocation());
+ System.out.println("++++++++++++++++++++"+toolMode);
+
System.out.println("++++++++++++++++++++"+Thread.currentThread().getContextClassLoader().getResource(policy.policyFileLocation()));
+
+
DOMPolicyReader reader = (DOMPolicyReader)
PolicyFactory.getPolicyReader(PolicyFactory.DOM_POLICY_READER);
if (toolMode)
{
@@ -112,6 +117,7 @@
PolicyScopeLevel.WSDL_BINDING.equals(scope))
{
deployPolicy(normPolicy, scope, epMetaData);
+
System.out.println("++++++++++++++++++++"+epMetaData.getExtensions());
}
else
{
@@ -205,6 +211,7 @@
normPolicy = null;
}
deployPolicy(normPolicy, scope, extMetaData);
+
}
}
}
Modified:
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java
===================================================================
---
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-17
11:53:42 UTC (rev 3120)
+++
branches/JBWS-856/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/SimpleEncryptTestCase.java 2007-05-17
11:55:45 UTC (rev 3121)
@@ -69,14 +69,12 @@
private Hello getPort() throws Exception
{
URL wsdlURL = new
File("wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy/HelloService.wsdl").toURL();
- URL securityURL = new
File("resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL();
QName serviceName = new
QName("http://org.jboss.ws/samples/wssecurityAnnotatedpolicy",
"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");
Map<String, Object> reqContext =
((BindingProvider)port).getRequestContext();
reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" +
getServerHost() + ":8080/jaxws-samples-wssecurityAnnotatedpolicy-encrypt");
Deleted:
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml
===================================================================
---
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml 2007-05-17
11:53:42 UTC (rev 3120)
+++
branches/JBWS-856/jbossws-tests/src/resources/jaxws/samples/wssecurityAnnotatedpolicy/simple-encrypt/META-INF/jboss-wsse-client.xml 2007-05-17
11:55:45 UTC (rev 3121)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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">
- <config>
- <encrypt type="x509v3" alias="wsse"/>
- <requires>
- <encryption/>
- </requires>
- </config>
-</jboss-ws-security>
\ No newline at end of file