Author: svkrish
Date: Sun Feb 10 11:08:27 2008
New Revision: 620309
URL: http://svn.apache.org/viewvc?rev=620309&view=rev
Log:
cascading changes resulting from changes in trunk for handling appliesTo
attribute of PolicySets
Modified:
incubator/tuscany/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
incubator/tuscany/java/sca/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
incubator/tuscany/java/sca/samples/binding-echo-extension/src/test/resources/definitions.xml
incubator/tuscany/java/sca/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
incubator/tuscany/java/sca/samples/calculator-implementation-policies/src/main/resources/definitions.xml
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/build.xml
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
incubator/tuscany/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
Modified:
incubator/tuscany/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
(original)
+++
incubator/tuscany/java/sca/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingImpl.java
Sun Feb 10 11:08:27 2008
@@ -38,6 +38,7 @@
private String uri;
private List<Intent> requiredIntents = new ArrayList<Intent>();
private List<PolicySet> policySets = new ArrayList<PolicySet>();
+ private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
private IntentAttachPointType bindingType = null;
public IntentAttachPointType getType() {
@@ -95,5 +96,9 @@
public Object clone() throws CloneNotSupportedException {
return super.clone();
}
+
+ public List<PolicySet> getApplicablePolicySets() {
+ return this.applicablePolicySets;
+ }
}
Modified:
incubator/tuscany/java/sca/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo-extension/src/test/resources/EchoBinding.composite?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
(original)
+++
incubator/tuscany/java/sca/samples/binding-echo-extension/src/test/resources/EchoBinding.composite
Sun Feb 10 11:08:27 2008
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://sample/echo";
xmlns:se="http://sample/echo";
xmlns:e="http://echo";
Modified:
incubator/tuscany/java/sca/samples/binding-echo-extension/src/test/resources/definitions.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/binding-echo-extension/src/test/resources/definitions.xml?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/binding-echo-extension/src/test/resources/definitions.xml
(original)
+++
incubator/tuscany/java/sca/samples/binding-echo-extension/src/test/resources/definitions.xml
Sun Feb 10 11:08:27 2008
@@ -18,181 +18,16 @@
* under the License.
-->
<sca:definitions xmlns="http://test";
- targetNamespace="http://test";
- xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";>
-
- <!-- qualified intents -->
- <sca:intent name="confidentiality.transport" />
- <sca:intent name="confidentiality.message" />
- <sca:intent name="confidentiality.message.whole" />
- <sca:intent name="confidentiality.message.body" />
-
- <!-- POLICY SETS -->
- <sca:policySet name="p:EncryptionPolicy"
- provides="confidentiality"
- appliesTo="sca:binding.echo"
- xmlns="http://test";
- xmlns:p="http://sample/policy";>
- <p:echoBindingPolicy name="Encryption"
strategy="echo.provider.policy.ReverseEncryptionStrategy" />
- </sca:policySet>
-
- <sca:policySet name="SecureReliablePolicy"
- provides="confidentiality.transport integrity"
- appliesTo="sca:binding.ws"
- xmlns="http://test";
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for
- "basic authentication" -->
- </wsp:PolicyAttachment>
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for
- "reliability" -->
- </wsp:PolicyAttachment>
- </sca:policySet>
-
- <sca:policySet name="SecureReliablePolicy"
- provides="confidentiality.transport integrity"
- appliesTo="sca:binding.ws"
- xmlns="http://test";
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for
- "basic authentication" -->
- </wsp:PolicyAttachment>
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for
- "reliability" -->
- </wsp:PolicyAttachment>
- </sca:policySet>
-
- <sca:policySet name="SecureMessagingPolicies"
- provides="confidentiality"
- appliesTo="binding.ws"
- xmlns="http://test";
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
- <sca:intentMap provides="confidentiality" default="transport">
- <sca:qualifier name="transport">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for "transport"
alternative -->
- </wsp:PolicyAttachment>
- <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
- </sca:qualifier>
- <sca:qualifier name="message">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for "message"
alternative" -->
- </wsp:PolicyAttachment>
- </sca:qualifier>
- </sca:intentMap>
-</sca:policySet>
-
-<sca:policySet name="SecurityPolicy" provides="confidentiality"
- xmlns="http://test";
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"; >
- <sca:intentMap provides="confidentiality" default="message">
- <sca:qualifier name="message">
- <sca:intentMap provides="message" default="whole">
- <sca:qualifier name="body">
- <wsp:PolicyAttachment>
- <!-- policy attachment for body encryption -->
- </wsp:PolicyAttachment>
- </sca:qualifier>
- <sca:qualifier name="whole">
- <wsp:PolicyAttachment>
- <!-- policy attachment for whole message
encryption -->
- </wsp:PolicyAttachment>
- </sca:qualifier>
- </sca:intentMap>
- </sca:qualifier>
- <sca:qualifier name="transport">
- <wsp:PolicyAttachment>
- <!-- policy attachment for transport encryption -->
- </wsp:PolicyAttachment>
- </sca:qualifier>
- </sca:intentMap>
-</sca:policySet>
-
-<sca:policySet name="BasicAuthMsgProtSecurity"
- provides="authentication confidentiality"
- appliesTo="binding.ws"
- xmlns="http://test";>
- <sca:policySetReference name="AuthenticationPolicies"/>
- <sca:policySetReference name="ConfidentialityPolicies"/>
-</sca:policySet>
-
-<sca:policySet name="AuthenticationPolicies"
- provides="authentication"
- appliesTo="binding.ws"
- xmlns="http://test";
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for "basic
- authentication" -->
- </wsp:PolicyAttachment>
-</sca:policySet>
-
-<sca:policySet name="ConfidentialityPolicies"
- provides="confidentiality"
- bindings="binding.ws"
- xmlns="http://test";
- xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
- <sca:intentMap provides="confidentiality" default="transport">
- <sca:qualifier name="transport">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for "transport"
- alternative -->
- </wsp:PolicyAttachment>
- <wsp:PolicyAttachment>...</wsp:PolicyAttachment>
- </sca:qualifier>
- <sca:qualifier name="message">
- <wsp:PolicyAttachment>
- <!-- policy expression and policy subject for "message"
- alternative" -->...
- </wsp:PolicyAttachment>
- </sca:qualifier>
- </sca:intentMap>
-</sca:policySet>
-
-<!-- profile intent -->
- <sca:intent name="reliableMessageProtection"
- constrains="sca:binding"
- requires="messageProtection">
- <sca:description>
- Protect messages from unauthorized reading or
modification
- </sca:description>
- </sca:intent>
-
- <sca:intent name="messageProtection"
- constrains="sca:binding"
- requires="confidentiality integrity">
- <sca:description>
- Protect messages from unauthorized reading or
modification
- </sca:description>
- </sca:intent>
-
-<!-- simple intent -->
- <sca:intent name="confidentiality"
- constrains="sca:binding">
- <sca:description>
- Communitcation thro this binding must prevent
- unauthorized users from reading the messages.
- </sca:description>
- </sca:intent>
-
- <sca:intent name="integrity"
- constrains="sca:binding">
- <sca:description>
- Communitcation thro this binding must prevent
- unauthorized modification of the messages.
- </sca:description>
- </sca:intent>
-
- <sca:intent name="authentication"
- constrains="sca:binding">
- <sca:description>
- Communitcation thro this binding required
- Authentication.
- </sca:description>
- </sca:intent>
-
+ targetNamespace="http://test";
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:e="http://echo";
+ xmlns:p="http://sample/policy";>
+ <!-- POLICY SETS -->
+ <sca:policySet name="p:EncryptionPolicy"
+ provides="sca:confidentiality"
+ appliesTo="e:binding.echo"
+ xmlns="http://test";
+ >
+ <p:echoBindingPolicy name="Encryption"
strategy="echo.provider.policy.ReverseEncryptionStrategy" />
+ </sca:policySet>
</sca:definitions>
Modified:
incubator/tuscany/java/sca/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-implementation-policies/src/main/resources/Calculator.composite?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
(original)
+++
incubator/tuscany/java/sca/samples/calculator-implementation-policies/src/main/resources/Calculator.composite
Sun Feb 10 11:08:27 2008
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://sample";
xmlns:sample="http://sample";
name="Calculator"
Modified:
incubator/tuscany/java/sca/samples/calculator-implementation-policies/src/main/resources/definitions.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-implementation-policies/src/main/resources/definitions.xml?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-implementation-policies/src/main/resources/definitions.xml
(original)
+++
incubator/tuscany/java/sca/samples/calculator-implementation-policies/src/main/resources/definitions.xml
Sun Feb 10 11:08:27 2008
@@ -53,9 +53,8 @@
provides="tuscany:logging"
appliesTo="sca:implementation.java"
xmlns="http://www.osoa.org/xmlns/sca/1.0";>
- <tuscany:jdkLogger
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"; name="calculator">
+ <tuscany:jdkLogger name="calculator">
<logLevel>FINER</logLevel>
</tuscany:jdkLogger>
</policySet>
-
</definitions>
Modified:
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/build.xml?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/build.xml
(original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/build.xml
Sun Feb 10 11:08:27 2008
@@ -61,6 +61,7 @@
<include name="tuscany-contribution-impl-1.2-incubating-SNAPSHOT.jar"/>
<include name="tuscany-contribution-java-1.2-incubating-SNAPSHOT.jar"/>
<include
name="tuscany-contribution-namespace-1.2-incubating-SNAPSHOT.jar"/>
+ <include name="tuscany-contribution-xml-1.2-incubating-SNAPSHOT.jar"/>
<include name="tuscany-core-1.2-incubating-SNAPSHOT.jar"/>
<include name="tuscany-core-databinding-1.2-incubating-SNAPSHOT.jar"/>
<include name="tuscany-core-spi-1.2-incubating-SNAPSHOT.jar"/>
@@ -147,7 +148,6 @@
<include name="wss4j-1.5.3.jar"/>
<include name="wstx-asl-3.2.1.jar"/>
<include name="xalan-2.7.0.jar"/>
- <include name="xbean-2.1.0.jar"/>
<include name="xercesImpl-2.8.1.jar"/>
<include name="xml-apis-1.3.03.jar"/>
<include name="xmlsec-1.4.0.jar"/>
Modified:
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
(original)
+++
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/Calculator.composite
Sun Feb 10 11:08:27 2008
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://sample";
xmlns:sample="http://sample";
xmlns:calc="http://calculator";
@@ -28,12 +29,12 @@
<reference name="addService" >
<interface.java interface="calculator.AddService" />
<binding.ws
uri="http://localhost:8080/sample-calculator-ws-secure-webapp/AddServiceComponent";
- requires="calc:wsAuthentication" />
+ requires="authentication" />
</reference>
<reference name="subtractService">
<interface.java interface="calculator.SubtractService" />
<binding.ws
uri="http://localhost:8080/sample-calculator-ws-secure-webapp/SubtractServiceComponent";
- requires="calc:wsIntegrity" />
+ requires="integrity" />
</reference>
<reference name="multiplyService"
target="MultiplyServiceComponent"></reference>
<reference name="divideService"
target="DivideServiceComponent"></reference>
Modified:
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
(original)
+++
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/src/main/resources/definitions.xml
Sun Feb 10 11:08:27 2008
@@ -24,46 +24,10 @@
xmlns:calc="http://calculator";>
- <sca:intent name="authentication"
- constrains="sca:binding.ws">
- <description>
- Communitcation thro this binding required
Authentication.
- </description>
- </sca:intent>
-
- <sca:intent name="integrity"
- constrains="sca:binding.ws">
- <description>
- Protect messages from unauthorized reading or
modification
- </description>
- </sca:intent>
-
- <sca:intent name="confidentiality"
- constrains="sca:binding.ws">
- <description>
- Communitcation thro this binding must prevent
- unauthorized users from reading the messages.
- </description>
- </sca:intent>
-
- <sca:intent name="calc:wsAuthentication"
- constrains="sca:binding.ws">
- <description>
- Communitcation thro this binding required
Authentication.
- </description>
- </sca:intent>
-
- <sca:intent name="calc:wsIntegrity"
- constrains="sca:binding.ws">
- <description>
- Protect messages from unauthorized reading or
modification
- </description>
- </sca:intent>
-
<!-- WS Security POLICY SETS -->
<sca:policySet name="calc:wsAuthenticationPolicy"
- provides="authentication"
- appliesTo="sca:binding.ws"
+ provides="sca:authentication"
+ appliesTo="sca:service/sca:binding.ws"
>
<tuscany:wsConfigParam>
<parameter name="InflowSecurity">
@@ -76,8 +40,8 @@
</sca:policySet>
<sca:policySet name="calc:wsClientAuthenticationPolicy"
- provides="calc:wsAuthentication"
- appliesTo="sca:binding.ws">
+ provides="sca:authentication"
+ appliesTo="sca:reference/sca:binding.ws">
<tuscany:wsConfigParam>
<parameter name="OutflowSecurity">
<action>
@@ -90,55 +54,10 @@
</tuscany:wsConfigParam>
</sca:policySet>
- <!-- sca:policySet name="wsIntegrityPolicy"
- provides="integrity"
- appliesTo="sca:binding.ws">
- <tuscany:wsConfigParam>
- <parameter name="InflowSecurity">
- <action>
- <items>UsernameToken Timestamp Signature</items>
-
<signaturePropFile>security.properties</signaturePropFile>
-
<passwordCallbackClass>calculator.security.ServerPWCBHandler</passwordCallbackClass>
- </action>
- </parameter>
- <parameter name="OutflowSecurity">
- <action>
- <items>Timestamp Signature</items>
- <user>CalculatorAdmin</user>
-
<signaturePropFile>security.properties</signaturePropFile>
-
<passwordCallbackClass>calculator.security.ServerPWCBHandler</passwordCallbackClass>
-
<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
- </action>
- </parameter>
- </tuscany:wsConfigParam>
- </sca:policySet>
-
- <sca:policySet name="wsClientIntegrityPolicy"
- provides="calc:wsIntegrity"
- appliesTo="sca:binding.ws">
- <tuscany:wsConfigParam>
- <parameter name="InflowSecurity">
- <action>
- <items>Timestamp Signature</items>
-
<signaturePropFile>security.properties</signaturePropFile>
- </action>
- </parameter>
- <parameter name="OutflowSecurity">
- <action>
- <items>UsernameToken Timestamp Signature</items>
- <user>CalculatorUser</user>
- <passwordType>PasswordText</passwordType>
-
<signaturePropFile>security.properties</signaturePropFile>
-
<passwordCallbackClass>calculator.security.ClientPWCBHandler</passwordCallbackClass>
-
<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
- </action>
- </parameter>
- </tuscany:wsConfigParam>
- </sca:policySet-->
<sca:policySet name="tuscany:wsSecurityPolicyForIntegrity"
provides="sca:integrity"
- appliesTo="sca:binding.ws">
+ appliesTo="sca:service/sca:binding.ws">
<wsp:Policy wsu:Id="SignOnly"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
@@ -207,8 +126,8 @@
</sca:policySet>
<sca:policySet name="tuscany:wsSecurityPolicyForClientIntegrity"
- provides="calc:wsIntegrity"
- appliesTo="sca:binding.ws">
+ provides="sca:integrity"
+ appliesTo="sca:reference/sca:binding.ws">
<wsp:Policy wsu:Id="SignOnly"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
Modified:
incubator/tuscany/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-service-jms/src/main/resources/helloworldjmsservice.composite
Sun Feb 10 11:08:27 2008
@@ -18,6 +18,7 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://helloworld";
xmlns:hw="http://helloworld";
name="helloworldws">
Modified:
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml
Sun Feb 10 11:08:27 2008
@@ -22,68 +22,11 @@
xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
xmlns:hw="http://helloworld";>
-
- <sca:intent name="soap"
- constrains="sca:binding.ws">
- <sca:description>
- Communitcation thro this binding requires SOAP
- </sca:description>
- </sca:intent>
-
- <sca:intent name="soap11"
- constrains="sca:binding.ws">
- <sca:description>
- Communitcation thro this binding requires SOAP 1.1
- </sca:description>
- </sca:intent>
-
- <sca:intent name="soap12"
- constrains="sca:binding.ws">
- <sca:description>
- Communitcation thro this binding requires SOAP 1.2
- </sca:description>
- </sca:intent>
-
- <sca:intent name="authentication"
- constrains="sca:binding.ws">
- <description>
- Communitcation thro this binding required
Authentication.
- </description>
- </sca:intent>
-
- <sca:intent name="hw:wsAuthentication"
- constrains="sca:binding.ws">
- <description>
- Communitcation thro this binding required
Authentication.
- </description>
- </sca:intent>
-
- <sca:intent name="integrity"
- constrains="sca:binding.ws">
- <description>
- Protect messages from unauthorized reading or
modification
- </description>
- </sca:intent>
-
- <sca:intent name="hw:wsIntegrity"
- constrains="sca:binding.ws">
- <description>
- Protect messages from unauthorized reading or
modification
- </description>
- </sca:intent>
-
- <sca:intent name="confidentiality"
- constrains="sca:binding.ws">
- <description>
- Communitcation thro this binding must prevent
- unauthorized users from reading the messages.
- </description>
- </sca:intent>
<!-- WS Security POLICY SETS -->
<sca:policySet name="hw:wsClientAuthenticationPolicy"
- provides="hw:wsAuthentication"
- appliesTo="sca:binding.ws">
+ provides="authentication"
+ appliesTo="sca:reference/sca:binding.ws">
<tuscany:wsConfigParam>
<parameter name="OutflowSecurity">
<action>
@@ -98,8 +41,8 @@
<!-- A policyset that uses WS Policy -->
<sca:policySet name="hw:wsSecurityPolicyForIntegrity"
- provides="hw:wsIntegrity"
- appliesTo="sca:binding.ws">
+ provides="integrity"
+ appliesTo="sca:reference/sca:binding.ws">
<wsp:Policy wsu:Id="SignOnly"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
@@ -175,7 +118,7 @@
composite in the helloworld-ws-service uses. -->
<sca:policySet name="hw:wsAuthenticationPolicy"
provides="authentication"
- appliesTo="sca:binding.ws"
+ appliesTo="sca:service/sca:binding.ws"
>
<tuscany:wsConfigParam>
<parameter name="InflowSecurity">
@@ -189,7 +132,7 @@
<sca:policySet name="hw:wsServerSecurityPolicyForIntegrity"
provides="integrity"
- appliesTo="sca:binding.ws">
+ appliesTo="sca:service/sca:binding.ws">
<wsp:Policy wsu:Id="SignOnly"
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
Modified:
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite
Sun Feb 10 11:08:27 2008
@@ -20,6 +20,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://helloworld";
xmlns:hw="http://helloworld";
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
name="helloworldwsclient">
<!-- A component with an embedded reference definition connecting to an
external webservice
@@ -27,7 +28,7 @@
-->
<component name="HelloTuscanyServiceComponent">
<implementation.java class="helloworld.HelloWorldServiceComponent"/>
- <reference name="helloWorldService" requires="hw:wsAuthentication">
+ <reference name="helloWorldService" requires="authentication">
<binding.ws
wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
</reference>
</component>
@@ -43,13 +44,13 @@
</component>
<reference name="HelloWorldService"
promote="HelloWorldServiceComponent/helloWorldService"
- requires="hw:wsAuthentication">
+ requires="authentication">
<interface.java interface="helloworld.HelloWorldService" />
<binding.ws
wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
</reference>
<reference name="HelloWorldWsPolicyService"
promote="HelloWorldWsPolicyServiceComponent/helloWorldService"
- requires="hw:wsIntegrity">
+ requires="integrity">
<interface.java interface="helloworld.HelloWorldService" />
<binding.ws
wsdlElement="http://helloworld#wsdl.port(HelloWorldWsPolicyService/HelloWorldSoapPort)"/>
</reference>
Modified:
incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service-jms/src/main/resources/definitions.xml
Sun Feb 10 11:08:27 2008
@@ -53,7 +53,7 @@
<sca:policySet name="wsJMSTransportPolicy"
provides="transport.jms"
- appliesTo="sca:binding.ws">
+ appliesTo="binding.ws">
<tuscany:wsConfigParam>
<parameter name="TuscanyQueueConnectionFactory">
<parameter
name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
Modified:
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml
Sun Feb 10 11:08:27 2008
@@ -23,49 +23,6 @@
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
xmlns:hw="http://helloworld";>
- <sca:intent name="soap"
- constrains="sca:binding.ws">
- <sca:description>
- Communitcation thro this binding requires SOAP
- </sca:description>
- </sca:intent>
-
- <sca:intent name="soap11"
- constrains="sca:binding.ws">
- <sca:description>
- Communitcation thro this binding requires SOAP 1.1
- </sca:description>
- </sca:intent>
-
- <sca:intent name="soap12"
- constrains="sca:binding.ws">
- <sca:description>
- Communitcation thro this binding requires SOAP 1.2
- </sca:description>
- </sca:intent>
-
- <sca:intent name="authentication"
- constrains="sca:binding.ws">
- <description>
- Communitcation thro this binding required
Authentication.
- </description>
- </sca:intent>
-
- <sca:intent name="integrity"
- constrains="sca:binding.ws">
- <description>
- Protect messages from unauthorized reading or
modification
- </description>
- </sca:intent>
-
- <sca:intent name="confidentiality"
- constrains="sca:binding.ws">
- <description>
- Communitcation thro this binding must prevent
- unauthorized users from reading the messages.
- </description>
- </sca:intent>
-
<!-- WS Security POLICY SETS -->
<sca:policySet name="hw:wsAuthenticationPolicy"
provides="authentication"
Modified:
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite?rev=620309&r1=620308&r2=620309&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite
Sun Feb 10 11:08:27 2008
@@ -19,6 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://helloworld";
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
xmlns:hw="http://helloworld";
name="helloworldws">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
