Author: slaws
Date: Thu Feb 12 13:33:16 2009
New Revision: 743732
URL: http://svn.apache.org/viewvc?rev=743732&view=rev
Log:
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.
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/wspolicy/WSSecurityPolicyHandler.java
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
tuscany/branches/sca-java-1.x/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/wspolicy/WSSecurityPolicyHandler.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/wspolicy/WSSecurityPolicyHandler.java?rev=743732&r1=743731&r2=743732&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/wspolicy/WSSecurityPolicyHandler.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2-policy/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/policy/wspolicy/WSSecurityPolicyHandler.java
Thu Feb 12 13:33:16 2009
@@ -41,6 +41,15 @@
Policy wsPolicy = (Policy)policy;
try {
configContext.getAxisConfiguration().applyPolicy(wsPolicy);
+
+ // TUSCANY-2824
+ // hack to make service side pick up rampart
policies
+ // "rampartPolicy" comes from
RampartMessageData.KEY_RAMPART_POLICY
+ // but I'm avoiding adding an explicit dependency
just yet.
+ // There must be a proper way of getting rampart
to recognize
+ // these policies
+ configContext.setProperty("rampartPolicy",
wsPolicy);
+
} catch ( AxisFault e ) {
throw new RuntimeException(e);
}
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler?rev=743732&r1=743731&r2=743732&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2-policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
Thu Feb 12 13:33:16 2009
@@ -20,6 +20,6 @@
org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#authentication,model=org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicy
org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#integrity,model=org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicy
org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#confidentiality,model=org.apache.tuscany.sca.binding.ws.axis2.policy.configuration.Axis2ConfigParamPolicy
-#org.apache.tuscany.sca.binding.ws.axis2.policy.wspolicy.WSSecurityPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#authentication,model=org.apache.neethi.Policy
-#org.apache.tuscany.sca.binding.ws.axis2.policy.wspolicy.WSSecurityPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#integrity,model=org.apache.neethi.Policy
-#org.apache.tuscany.sca.binding.ws.axis2.policy.wspolicy.WSSecurityPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#confidentiality,model=org.apache.neethi.Policy
\ No newline at end of file
+org.apache.tuscany.sca.binding.ws.axis2.policy.wspolicy.WSSecurityPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#authentication,model=org.apache.neethi.Policy
+org.apache.tuscany.sca.binding.ws.axis2.policy.wspolicy.WSSecurityPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#integrity,model=org.apache.neethi.Policy
+org.apache.tuscany.sca.binding.ws.axis2.policy.wspolicy.WSSecurityPolicyHandler;intent=http://www.osoa.org/xmlns/sca/1.0#confidentiality,model=org.apache.neethi.Policy
\ No newline at end of file
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml?rev=743732&r1=743731&r2=743732&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
(original)
+++
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/definitions.xml
Thu Feb 12 13:33:16 2009
@@ -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"
Modified:
tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/wspolicy/tuscanyKeys.jks?rev=743732&r1=743731&r2=743732&view=diff
==============================================================================
Binary files - no diff available.
Modified:
tuscany/branches/sca-java-1.x/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-reference-secure/src/main/resources/helloworldKeys.jks?rev=743732&r1=743731&r2=743732&view=diff
==============================================================================
Binary files - no diff available.
Modified:
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-secure/src/main/resources/helloworldKeys.jks?rev=743732&r1=743731&r2=743732&view=diff
==============================================================================
Binary files - no diff available.
Modified:
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite?rev=743732&r1=743731&r2=743732&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
(original)
+++
tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
Thu Feb 12 13:33:16 2009
@@ -31,7 +31,8 @@
<service name="HelloWorldWsPolicyService"
promote="HelloWorldServiceComponent/HelloWorldService"
requires="integrity">
<interface.wsdl
interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws uri="http://localhost:8085/HelloWorldWsPolicyService"/>
+ <binding.ws
wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)"
+ uri="http://localhost:8085/HelloWorldWsPolicyService"/>
</service>
<component name="HelloWorldServiceComponent">
