You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/12 17:23:01 UTC

svn commit: r527977 - in /incubator/tuscany/java/sca/samples/composite-impl/src/main/resources: InnerComposite.composite InnerComposite2.composite OuterComposite.composite

Author: jsdelfino
Date: Thu Apr 12 08:23:00 2007
New Revision: 527977

URL: http://svn.apache.org/viewvc?view=rev&rev=527977
Log:
Fixed errors in .composite files.

Modified:
    incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/InnerComposite.composite
    incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/InnerComposite2.composite
    incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/OuterComposite.composite

Modified: incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/InnerComposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/InnerComposite.composite?view=diff&rev=527977&r1=527976&r2=527977
==============================================================================
--- incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/InnerComposite.composite (original)
+++ incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/InnerComposite.composite Thu Apr 12 08:23:00 2007
@@ -18,27 +18,24 @@
  * under the License.    
  -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="InnerComposite">
+    targetNamespace="http://sample"
+    xmlns:sample="http://sample"
+    name="InnerComposite">
 
-    <service name="InnerSourceService" target="InnerSourceComponent">
+    <service name="InnerSourceService" promote="InnerSourceComponent">
         <interface.java interface="composite.Source"/>
-        <reference name="innerSource">InnerSourceComponent</reference>
     </service>
        
     <component name="InnerSourceComponent">
 		<implementation.java class="composite.SourceImpl"/>
-        <!--reference name="targetReference">TargetComponentRef</reference>
-        <reference name="targetReference2">TargetComponentRef2</reference-->
     </component>
 	    
     <reference name="TargetComponentRef" promote="InnerSourceComponent/targetReference">
-        <interface.java interface="composite.Target"
-                        callbackInterface="composite.SourceCallback"/>
+        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
     </reference>
     
     <reference name="TargetComponentRef2" promote="InnerSourceComponent/targetReference2">
-        <interface.java interface="composite.Target"
-                        callbackInterface="composite.SourceCallback"/>
+        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
     </reference>
     
 </composite>

Modified: incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/InnerComposite2.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/InnerComposite2.composite?view=diff&rev=527977&r1=527976&r2=527977
==============================================================================
--- incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/InnerComposite2.composite (original)
+++ incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/InnerComposite2.composite Thu Apr 12 08:23:00 2007
@@ -18,12 +18,12 @@
  * under the License.    
  -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="InnerComposite2">
+    targetNamespace="http://sample"
+    xmlns:sample="http://sample"
+    name="InnerComposite2">
 
-    <service name="InnerTargetService" target="InnerTargetComponent">
-        <interface.java interface="composite.Target"
-                        callbackInterface="composite.SourceCallback"/>
-        <reference name="innerSource">InnerTargetComponent</reference>
+    <service name="InnerTargetService" promote="InnerTargetComponent"> 
+        <interface.java interface="composite.Target" callbackInterface="composite.SourceCallback"/>
     </service>
        
     <component name="InnerTargetComponent">

Modified: incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/OuterComposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/OuterComposite.composite?view=diff&rev=527977&r1=527976&r2=527977
==============================================================================
--- incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/OuterComposite.composite (original)
+++ incubator/tuscany/java/sca/samples/composite-impl/src/main/resources/OuterComposite.composite Thu Apr 12 08:23:00 2007
@@ -18,12 +18,14 @@
  * under the License.    
  -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           name="OuterComposite">
+    targetNamespace="http://sample"
+    xmlns:sample="http://sample"
+    name="OuterComposite">
 
     <component name="SourceComponent">
-        <implementation.composite name="InnerComposite" scdlLocation="InnerComposite.composite"/>
-        <reference name="TargetComponentRef" target="TargetComponent"></reference>
-        <reference name="TargetComponentRef2" target="TargetComponent2/InnerTargetService"></reference>
+        <implementation.composite name="sample:InnerComposite"/>
+        <reference name="targetComponentRef" target="TargetComponent"/>
+        <reference name="targetComponentRef2" target="TargetComponent2/InnerTargetService"/>
     </component>
 
     <component name="TargetComponent">
@@ -31,7 +33,7 @@
     </component>
     
     <component name="TargetComponent2">
-        <implementation.composite name="InnerComposite2" scdlLocation="InnerComposite2.composite"/>
+        <implementation.composite name="sample:InnerComposite2"/>
     </component>
 
 </composite>



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