Author: svkrish
Date: Wed Nov 28 01:15:55 2007
New Revision: 598922

URL: http://svn.apache.org/viewvc?rev=598922&view=rev
Log:
general cleaning up

Modified:
    
incubator/tuscany/java/sca/samples/calculator-impl-policies/src/main/resources/Calculator.composite
    
incubator/tuscany/java/sca/samples/calculator-impl-policies/src/main/resources/definitions.xml

Modified: 
incubator/tuscany/java/sca/samples/calculator-impl-policies/src/main/resources/Calculator.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-impl-policies/src/main/resources/Calculator.composite?rev=598922&r1=598921&r2=598922&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/samples/calculator-impl-policies/src/main/resources/Calculator.composite
 (original)
+++ 
incubator/tuscany/java/sca/samples/calculator-impl-policies/src/main/resources/Calculator.composite
 Wed Nov 28 01:15:55 2007
@@ -20,12 +20,13 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
            targetNamespace="http://sample";
            xmlns:sample="http://sample";
-           name="Calculator">
+           name="Calculator"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";>
 
     <component name="CalculatorServiceComponent">
                <implementation.java class="calculator.CalculatorServiceImpl">
-                       <operation name="divide" requires="logging"/>
-                       <operation name="subtract" requires="logging"/>
+                       <operation name="divide" requires="tuscany:logging"/>
+                       <operation name="subtract" requires="tuscany:logging"/>
                </implementation.java>
         <reference name="addService" target="AddServiceComponent" />
         <reference name="subtractService" target="SubtractServiceComponent" />
@@ -34,7 +35,7 @@
     </component>
 
     <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl" 
requires="logging"/>
+        <implementation.java class="calculator.AddServiceImpl" 
requires="tuscany:logging"/>
     </component>
 
     <component name="SubtractServiceComponent">
@@ -50,7 +51,7 @@
     </component>
     
     <component name="AnotherCalculatorServiceComponent">
-               <implementation.java class="calculator.CalculatorServiceImpl" 
requires="logging"/>
+               <implementation.java class="calculator.CalculatorServiceImpl" 
requires="tuscany:logging"/>
         <reference name="addService" target="AddServiceComponent" />
         <reference name="subtractService" target="SubtractServiceComponent" />
         <reference name="multiplyService" target="MultiplyServiceComponent" />

Modified: 
incubator/tuscany/java/sca/samples/calculator-impl-policies/src/main/resources/definitions.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-impl-policies/src/main/resources/definitions.xml?rev=598922&r1=598921&r2=598922&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/samples/calculator-impl-policies/src/main/resources/definitions.xml
 (original)
+++ 
incubator/tuscany/java/sca/samples/calculator-impl-policies/src/main/resources/definitions.xml
 Wed Nov 28 01:15:55 2007
@@ -20,38 +20,24 @@
 <definitions xmlns="http://www.osoa.org/xmlns/sca/1.0";
                        targetNamespace="http://test";
                        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0";
-                       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";>
+                       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
+                       xmlns:calc="http://calculator";>
 
-<!-- Extension Types Metadata -->
-<!-- implementationType type="sca:implementation.java" alwaysProvides="logging"
-                                       mayProvide="tracing"/>
-<bindingType type="sca:binding.ws" alwaysProvides="confidentiality"
-                                       mayProvide="integrity"/-->              
                        
+<!-- Policy Intents -->
+<intent name="tuscany:logging" 
+               constrains="sca:implementation.java">
+       <description>
+               All messages to and from this implementation must be logged
+       </description>
+</intent>
 
- <!-- POLICY SETS -->
+<!-- PolicySets -->
 <policySet name="tuscany:JDKLoggingPolicy"
-       provides="logging"
+       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">
                <logLevel>INFO</logLevel>
-               <resourceBundle>CalculatorLogMessages</resourceBundle>
        </tuscany:jdkLogger>
 </policySet>
-
-<!-- simple intent -->
- <intent name="logging" 
-                        constrains="sca:implementation">
-                        <description>
-                               All messages to and from this implementation 
must be logged
-                        </description>
- </intent>
- 
- <intent name="tracing" 
-                        constrains="sca:implementation.java">
-                        <description>
-                               Need to figure out some description for this 
-                        </description>
- </intent>
- 
 </definitions>



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

Reply via email to