From 441f2a6396d90bccfa513f3789c26518732ea1f1 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 12 Feb 2009 13:33:16 +0000
Subject: TUSCANY-2824 - turn WSSecurity based policy back on. Two not so great
 fixes here. Firstly WSSecurityPolicyHandler pushes a property into the Axis
 configuration context to force Rampart to recognize the policy. I haven't
 discovered what part of our configuration is required to do this properly.
 Secondly I fixed the helloworld-ws-service-secure test case to reference the
 wsdl on binding.ws. Without this you get a NPE in axis/rampart as it fails to
 map binding operations to port type operation using QNames (don't know why it
 thinks these are QNames). Our generated WSDL has the generated binding in a
 different namespace to the port type. Associating the wsdl binding with
 binding.ws means that the binding is not generated at the made up QNames
 match. I also updated a few key stores as the runtime was complaining about
 X509 certificate version numbers.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@743732 13f79535-47bb-0310-9956-ffa450edef68
---
 .../ws/axis2/itests/policy/wspolicy/definitions.xml   |   3 ++-
 .../ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks   | Bin 1366 -> 1352 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca')

diff --git a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
index d7f40ccf0e..bfa9b1a222 100644
--- a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
+++ b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
@@ -43,11 +43,12 @@
 				<ramp:passwordType>PasswordText</ramp:passwordType>
 				<ramp:passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.wspolicy.ClientPWCBHandler</ramp:passwordCallbackClass>
 			</ramp:RampartConfig>
-			</wsp:All>
+	       </wsp:All>
 		</wsp:ExactlyOne>
 	</wsp:Policy>
  </sca:policySet>
  
+ 
   <!-- A policyset that uses WS Policy --> 
  <sca:policySet name="wsSecurityPolicyForIntegrity"
  	provides="sca:integrity"
diff --git a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
index 0b4f2399f0..d77c889141 100644
Binary files a/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks and b/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks differ
-- 
cgit v1.2.3