tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svkr...@apache.org
Subject svn commit: r575268 - in /incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources: ./ org/apache/tuscany/sca/binding/ws/axis2/itests/policy/
Date Thu, 13 Sep 2007 11:38:17 GMT
Author: svkrish
Date: Thu Sep 13 04:38:16 2007
New Revision: 575268

URL: http://svn.apache.org/viewvc?rev=575268&view=rev
Log:
specifying intents instead of policysets so that policysets are determined, changing policyset
definitions in definitions.xml to provide more generic intents such as authentication instead
of wsAutthentication

Modified:
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/definitions.xml
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityAuthentication.composite
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityConfidentiality.composite
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityIntegrity.composite

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/definitions.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/definitions.xml?rev=575268&r1=575267&r2=575268&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/definitions.xml
(original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/definitions.xml
Thu Sep 13 04:38:16 2007
@@ -43,6 +43,13 @@
  			 </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="wsAuthentication" 
  			 constrains="sca:binding.ws">
  			 <description>
@@ -50,14 +57,14 @@
  			 </description>
  </sca:intent>	
  
- <sca:intent name="wsIntegrity" 
+ <sca:intent name="integrity" 
  			 constrains="sca:binding.ws">
  			 <description>
  			 	Protect messages from unauthorized reading or modification
  			 </description>
  </sca:intent>
  
-  <sca:intent name="wsConfidentiality" 
+  <sca:intent name="confidentiality" 
  			 constrains="sca:binding.ws">
  			 <description>
  			 	Communitcation thro this binding must prevent
@@ -67,7 +74,7 @@
  
  <!-- WS Security POLICY SETS -->
   <sca:policySet name="wsAuthenticationPolicy"
- 	provides="wsAuthentication"
+ 	provides="authentication"
  	appliesTo="sca:binding.ws"
  	>
  	<tuscany:wsConfigParam>
@@ -96,29 +103,7 @@
  </sca:policySet>
  
  <sca:policySet name="wsIntegrityPolicy"
- 	provides="wsIntegrity"
- 	appliesTo="sca:binding.ws">
- 	<tuscany:wsConfigParam>
- 		<parameter name="InflowSecurity">
-		    <action>
-		        <items>Timestamp Signature</items>
-		        <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile>
-		    </action>
-		</parameter>
- 		<parameter name="OutflowSecurity">
-      		<action>
-        		<items>Timestamp Signature</items>
-        		<user>TuscanyWsUser</user>
-        		<signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile>
-        		<passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.IntegrityPWCBHandler</passwordCallbackClass>"
+
-        		<signatureKeyIdentifier>DirectReference</signatureKeyIdentifier>
-      		</action>
-    	</parameter>
- 	</tuscany:wsConfigParam>
- </sca:policySet>
- 
- <sca:policySet name="wsIntegrityPolicy"
- 	provides="wsIntegrity"
+ 	provides="integrity"
  	appliesTo="sca:binding.ws">
  	<tuscany:wsConfigParam>
  		<parameter name="InflowSecurity">
@@ -139,8 +124,8 @@
  	</tuscany:wsConfigParam>
  </sca:policySet>
  
-  <sca:policySet name="wsConfidentialityPolicy"
- 	provides="wsConfidentiality"
+ <sca:policySet name="wsConfidentialityPolicy"
+ 	provides="confidentiality"
  	appliesTo="sca:binding.ws">
  	<tuscany:wsConfigParam>
  		<parameter name="InflowSecurity">

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityAuthentication.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityAuthentication.composite?rev=575268&r1=575267&r2=575268&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityAuthentication.composite
(original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityAuthentication.composite
Thu Sep 13 04:38:16 2007
@@ -26,7 +26,7 @@
     so for this composite the service is: http://localhost:8085/myExplicitURI 
     -->      
 
-    <service name="helloWorld" promote="HelloWorldService" policySets="wsAuthenticationPolicy">
+    <service name="helloWorld" promote="HelloWorldService" requires="authentication">
         <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)"
/>
         <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
     </service>

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityConfidentiality.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityConfidentiality.composite?rev=575268&r1=575267&r2=575268&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityConfidentiality.composite
(original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityConfidentiality.composite
Thu Sep 13 04:38:16 2007
@@ -26,7 +26,7 @@
     so for this composite the service is: http://localhost:8085/myExplicitURI 
     -->      
 
-    <service name="helloWorld" promote="HelloWorldService" policySets="wsConfidentialityPolicy">
+    <service name="helloWorld" promote="HelloWorldService" requires="confidentiality">
         <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)"
/>
         <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
     </service>
@@ -40,7 +40,7 @@
         <reference name="helloWorldWS" />
     </component>
 
-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" policySets="wsConfidentialityPolicy">
+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" requires="confidentiality">
         <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)"
/>
         <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"
                     uri="http://localhost:8085/myExplicitURI"/>

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityIntegrity.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityIntegrity.composite?rev=575268&r1=575267&r2=575268&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityIntegrity.composite
(original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/policy/WSSecurityIntegrity.composite
Thu Sep 13 04:38:16 2007
@@ -26,7 +26,7 @@
     so for this composite the service is: http://localhost:8085/myExplicitURI 
     -->      
 
-    <service name="helloWorld" promote="HelloWorldService" policySets="wsIntegrityPolicy">
+    <service name="helloWorld" promote="HelloWorldService" requires="integrity">
         <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)"
/>
         <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.port(HelloWorldService/HelloWorldSoapPort)"
/>
     </service>
@@ -40,7 +40,7 @@
         <reference name="helloWorldWS" />
     </component>
 
-    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" policySets="wsIntegrityPolicy">
+    <reference name="helloWorldWS" promote="HelloWorldComponent/helloWorldWS" requires="integrity">
         <interface.wsdl interface="http://helloworld-om-uri#wsdl.interface(HelloWorld)"
/>
         <binding.ws wsdlElement="http://helloworld-om-uri#wsdl.binding(HelloWorldSoapBinding)"
                     uri="http://localhost:8085/myExplicitURI"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message