Author: svkrish
Date: Tue Feb 12 08:59:37 2008
New Revision: 620864

URL: http://svn.apache.org/viewvc?rev=620864&view=rev
Log:
removing custom intents and replacing them with abstract ones.  Making 
policysets appliesTo target specific services / references

Modified:
    
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/BigBank.composite
    
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/CheckingsAccount.composite
    
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/SavingsAccount.composite
    
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/StockAccount.composite
    
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/definitions.xml
    
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-stockquote/src/main/resources/StockQuote.composite
    
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-stockquote/src/main/resources/definitions.xml

Modified: 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/BigBank.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/BigBank.composite?rev=620864&r1=620863&r2=620864&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/BigBank.composite
 (original)
+++ 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/BigBank.composite
 Tue Feb 12 08:59:37 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";
        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
        targetNamespace="http://bigbank";
        xmlns:bb="http://bigbank";
@@ -38,7 +39,7 @@
         <!-- reference name="accountDataService" 
target="AccountDataServiceComponent"/-->
         <reference name="savingsAcService" 
target="SavingsAccountServiceComponent"/>
         
-        <reference name="checkingAcService" 
requires="tuscany:wsAuthentication">
+        <reference name="checkingAcService" requires="authentication">
                <binding.ws 
uri="http://localhost:8085/services/CheckingAcWebService"/>
         </reference>
         

Modified: 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/CheckingsAccount.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/CheckingsAccount.composite?rev=620864&r1=620863&r2=620864&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/CheckingsAccount.composite
 (original)
+++ 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/CheckingsAccount.composite
 Tue Feb 12 08:59:37 2008
@@ -20,6 +20,7 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
        targetNamespace="http://bigbank/checkings";
        xmlns:bbck="http://bigbank/checkings";
+       xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
        name="CheckingsAccountDept">
        
     <service name="CheckingsAccountService" 
promote="CheckingAccountServiceComponent" requires="authentication">
@@ -28,6 +29,6 @@
     </service>
 
     <component name="CheckingAccountServiceComponent">
-        <implementation.java 
class="bigbank.account.checking.CheckingAccountServiceImpl" 
requires="bbck:chkDeptAuthorization"/>
+        <implementation.java 
class="bigbank.account.checking.CheckingAccountServiceImpl" 
requires="authorization"/>
     </component>
 </composite>

Modified: 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/SavingsAccount.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/SavingsAccount.composite?rev=620864&r1=620863&r2=620864&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/SavingsAccount.composite
 (original)
+++ 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/SavingsAccount.composite
 Tue Feb 12 08:59:37 2008
@@ -20,6 +20,7 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
        targetNamespace="http://bigbank/savings";
        xmlns:bbsv="http://bigbank/savings";
+       xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
        name="SavingsAccountDept">
 
     <service name="SavingsAccountService" 
promote="SavingsAccountServiceComponent">

Modified: 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/StockAccount.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/StockAccount.composite?rev=620864&r1=620863&r2=620864&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/StockAccount.composite
 (original)
+++ 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/StockAccount.composite
 Tue Feb 12 08:59:37 2008
@@ -20,6 +20,7 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
        targetNamespace="http://bigbank/stock";
        xmlns:bbst="http://bigbank/stock";
+       xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
        name="StockAccountDept">
 
     <service name="StockAccountService" promote="StockAccountServiceComponent">

Modified: 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/definitions.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/definitions.xml?rev=620864&r1=620863&r2=620864&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/definitions.xml
 (original)
+++ 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-account/src/main/resources/definitions.xml
 Tue Feb 12 08:59:37 2008
@@ -25,26 +25,17 @@
                        xmlns:bb="http://bigbank";>
 
   
- <sca:intent name="tuscany:wsAuthentication" 
-                        constrains="sca:binding.ws">
-                        <description>
-                        Communitcation thro this binding required 
Authentication.
-                        </description>
- </sca:intent>
- 
- <sca:intent name="chk:chkDeptAuthorization" 
+<sca:intent name="authorization" 
                         constrains="sca:implementation.java">
                         <description>
-                               Authorization enforced by checkings dept of 
bigbank
+                               Authorization Intent
                         </description>
- </sca:intent>
- 
- 
+</sca:intent>
  
  <!-- WS Security POLICY SETS -->
  <sca:policySet name="tuscany:wsIntegrityPolicy"
        provides="integrity"
-       appliesTo="binding.ws">
+       appliesTo="sca:binding.ws">
        <tuscany:wsConfigParam>
                <parameter name="InflowSecurity">
                    <action>
@@ -66,7 +57,7 @@
  
  <sca:policySet name="tuscany:wsAuthenticationPolicy"
        provides="authentication"
-       appliesTo="binding.ws">
+       appliesTo="sca:service/sca:binding.ws">
        <tuscany:wsConfigParam>
                <parameter name="InflowSecurity">
                        <action>
@@ -78,8 +69,8 @@
  </sca:policySet>
  
  <sca:policySet name="tuscany:wsClientAuthenticationPolicy"
-       provides="tuscany:wsAuthentication"
-       appliesTo="binding.ws">
+       provides="authentication"
+       appliesTo="sca:reference/sca:binding.ws">
        <tuscany:wsConfigParam>
                <parameter name="OutflowSecurity">
                        <action>
@@ -93,8 +84,8 @@
  </sca:policySet>
  
  <sca:policySet name="chk:chkDeptAuthorizationPolicy"
-       provides="chk:chkDeptAuthorization"
-       appliesTo="implementation.java">
+       provides="authorization"
+       appliesTo="sca:implementation.java">
        <chk:AuthPolicy>
                <!-- need to evolve what should go in here -->
        </chk:AuthPolicy>

Modified: 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-stockquote/src/main/resources/StockQuote.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-stockquote/src/main/resources/StockQuote.composite?rev=620864&r1=620863&r2=620864&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-stockquote/src/main/resources/StockQuote.composite
 (original)
+++ 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-stockquote/src/main/resources/StockQuote.composite
 Tue Feb 12 08:59:37 2008
@@ -19,6 +19,7 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
        targetNamespace="http://stockquote";
+       xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
        xmlns:hw="http://stockquote";
     name="StockQuote">
 

Modified: 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-stockquote/src/main/resources/definitions.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-stockquote/src/main/resources/definitions.xml?rev=620864&r1=620863&r2=620864&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-stockquote/src/main/resources/definitions.xml
 (original)
+++ 
incubator/tuscany/java/sca/demos/secure-bigbank/secure-bigbank-stockquote/src/main/resources/definitions.xml
 Tue Feb 12 08:59:37 2008
@@ -23,33 +23,6 @@
                        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
                        xmlns:bb="http://bigbank";>
 
- <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="integrity" 
-                        constrains="sca:binding.ws">
-                        <description>
-                               Protect messages from unauthorized reading or 
modification
-                        </description>
- </sca:intent>
  
  <!-- WS Security POLICY SETS -->
  <sca:policySet name="wsIntegrityPolicy"



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to