tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svkr...@apache.org
Subject svn commit: r522885 [4/4] - in /incubator/tuscany/branches/sca-java-integration: samples/sca/calculator/src/main/resources/ samples/sca/composite-impl/src/main/resources/ samples/sca/echo-binding/src/main/java/echo/ samples/sca/echo-binding/src/test/re...
Date Tue, 27 Mar 2007 12:18:58 GMT
Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ComponentType.java Tue Mar 27 05:18:53 2007
@@ -35,7 +35,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class ComponentType<S extends ServiceDefinition, R extends ReferenceDefinition, P extends Property<?>>
+public class ComponentType<S extends ServiceDefinition, R extends ComponentTypeReferenceDefinition, P extends Property<?>>
     extends ModelObject {
     protected Scope implementationScope = Scope.UNDEFINED;
     private int initLevel;

Added: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ComponentTypeReferenceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ComponentTypeReferenceDefinition.java?view=auto&rev=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ComponentTypeReferenceDefinition.java (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/ComponentTypeReferenceDefinition.java Tue Mar 27 05:18:53 2007
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.spi.model;
+
+
+
+/**
+ * Represents reference defintion that is part of a ComponentType definition
+ * 
+ */
+public class ComponentTypeReferenceDefinition extends AbstractReferenceDefinition {
+    public ComponentTypeReferenceDefinition() {
+        super();
+    }
+
+    public ComponentTypeReferenceDefinition(String name, ServiceContract serviceContract) {
+        super(name, serviceContract);
+    }
+
+    public ComponentTypeReferenceDefinition(String name, ServiceContract serviceContract, Multiplicity multiplicity) {
+        super(name, serviceContract, multiplicity);
+    }
+    
+}

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeComponentType.java Tue Mar 27 05:18:53 2007
@@ -30,7 +30,7 @@
  * @version $Rev$ $Date$
  */
 public class CompositeComponentType<S extends ServiceDefinition,
-    R extends ReferenceDefinition,
+    R extends CompositeReferenceDefinition,
     P extends Property<?>> extends ComponentType<S, R, P> {
 
     private String name;
@@ -38,6 +38,7 @@
         new HashMap<String, ComponentDefinition<? extends Implementation<?>>>();
     private final Map<String, Include> includes = new HashMap<String, Include>();
     private final List<WireDefinition> wires = new ArrayList<WireDefinition>();
+    private boolean autowire;
 
     public CompositeComponentType() {
         implementationScope = Scope.SYSTEM;
@@ -184,5 +185,13 @@
             view.putAll(i.getIncluded().getExtensions());
         }
         return Collections.unmodifiableMap(view);
+    }
+
+    public boolean isAutowire() {
+        return autowire;
+    }
+
+    public void setAutowire(boolean autowire) {
+        this.autowire = autowire;
     }
 }

Added: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeReferenceDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeReferenceDefinition.java?view=auto&rev=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeReferenceDefinition.java (added)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/CompositeReferenceDefinition.java Tue Mar 27 05:18:53 2007
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.spi.model;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+
+/**
+ * Represents reference defintion that is part of a Composite definition
+ * 
+ */
+public class CompositeReferenceDefinition extends ComponentTypeReferenceDefinition {
+    protected List<URI> promotedReferences = new ArrayList<URI>();
+    
+    public CompositeReferenceDefinition() {
+        super();
+    }
+
+    public CompositeReferenceDefinition(String name, ServiceContract serviceContract) {
+        super(name, serviceContract);
+    }
+
+    public CompositeReferenceDefinition(String name, ServiceContract serviceContract, Multiplicity multiplicity) {
+        super(name, serviceContract, multiplicity);
+    }
+    
+    public void addPromotedReference(URI refUri) {
+        this.promotedReferences.add(refUri);
+    }
+    
+    public List<URI> getPromotedReferences() {
+        return Collections.unmodifiableList(promotedReferences);
+    }
+    
+}

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/policy/PolicyBuilderRegistry.java Tue Mar 27 05:18:53 2007
@@ -19,7 +19,7 @@
 package org.apache.tuscany.spi.policy;
 
 import org.apache.tuscany.spi.builder.BuilderException;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.AbstractReferenceDefinition;
 import org.apache.tuscany.spi.model.ServiceDefinition;
 import org.apache.tuscany.spi.wire.InboundWire;
 import org.apache.tuscany.spi.wire.OutboundWire;
@@ -58,7 +58,7 @@
      *
      * @throws BuilderException
      */
-    void buildSource(ReferenceDefinition referenceDefinition, OutboundWire wire) throws BuilderException;
+    void buildSource(AbstractReferenceDefinition referenceDefinition, OutboundWire wire) throws BuilderException;
 
     /**
      * Evaluates target-side policy metadata for configured reference and updates the curresponding collection of wire

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/policy/SourcePolicyBuilder.java Tue Mar 27 05:18:53 2007
@@ -19,7 +19,7 @@
 package org.apache.tuscany.spi.policy;
 
 import org.apache.tuscany.spi.builder.BuilderException;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.AbstractReferenceDefinition;
 import org.apache.tuscany.spi.wire.OutboundWire;
 
 /**
@@ -36,6 +36,6 @@
      * @param wire       the wire to attach policy to
      * @throws BuilderException
      */
-    void build(ReferenceDefinition definition, OutboundWire wire) throws BuilderException;
+    void build(AbstractReferenceDefinition definition, OutboundWire wire) throws BuilderException;
 
 }

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/SourcePolicyBuilderExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/SourcePolicyBuilderExtensionTestCase.java?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/SourcePolicyBuilderExtensionTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/test/java/org/apache/tuscany/spi/policy/SourcePolicyBuilderExtensionTestCase.java Tue Mar 27 05:18:53 2007
@@ -19,7 +19,7 @@
 package org.apache.tuscany.spi.policy;
 
 import org.apache.tuscany.spi.builder.BuilderException;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
+import org.apache.tuscany.spi.model.AbstractReferenceDefinition;
 import static org.apache.tuscany.spi.policy.PolicyBuilderRegistry.EXTENSION;
 import org.apache.tuscany.spi.wire.OutboundWire;
 
@@ -43,7 +43,7 @@
 
     private static class MockPolicyBuilderExtension extends SourcePolicyBuilderExtension {
 
-        public void build(ReferenceDefinition definition, OutboundWire wire) throws BuilderException {
+        public void build(AbstractReferenceDefinition definition, OutboundWire wire) throws BuilderException {
 
         }
     }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingsclient/src/test/java/org/apache/tuscany/sca/itest/WSBindingsClientTestCase.java Tue Mar 27 05:18:53 2007
@@ -36,13 +36,13 @@
     private SCATestCaseRunner utilityServer;
 
     // Hops over one composite
-    public void testOneHopPing() throws Throwable {
+    /*public void testOneHopPing() throws Throwable {
         try {
             assertTrue(scaTestTool.doOneHopPing("brio").contains("brio"));
         } catch (UndeclaredThrowableException e) {
             throw (e.getCause());
         }
-    }
+    }*/
 
     // Hops over two composites
     public void testTwoHopPing() {

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingscomposite/src/main/resources/bindingscomposite.composite Tue Mar 27 05:18:53 2007
@@ -35,10 +35,10 @@
 
     <component name="SCATestToolWSServiceComponent">
         <implementation.java class="org.apache.tuscany.sca.itest.SCATestToolServiceImpl" />
-        <reference name="scaTestUtil">SCATestUtilityWSReference</reference>
+        <!--reference name="scaTestUtil">SCATestUtilityWSReference</reference-->
     </component>
 
-    <reference name="SCATestUtilityWSReference">
+    <reference name="SCATestUtilityWSReference" promote="SCATestToolWSServiceComponent">
         <interface.java interface="org.apache.tuscany.sca.util.SCATestUtilityService" />
         <binding.ws endpoint="http://scatestutil.scabeta1fvt#wsdl.endpoint(SCATestUtilityService/SCATestUtilityServiceSoapPort)"
             location="wsdl/testutility.wsdl" />

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite Tue Mar 27 05:18:53 2007
@@ -22,7 +22,7 @@
  	      
     <component name="CallBackApiClient">
 		<implementation.java class="org.apache.tuscany.sca.test.CallBackApiClientImpl"/>
-		<reference name="aCallBackService"> 
+		<reference target="CallBackApiService" name="aCallBackService"> 
 		   CallBackApiService 
 		</reference>
     </component> 

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite Tue Mar 27 05:18:53 2007
@@ -22,7 +22,7 @@
  	      
     <component name="CallBackBasicClient">
 		<implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
-		<reference name="aCallBackService"> 
+		<reference name="aCallBackService" target="CallBackBasicService"> 
 		   CallBackBasicService 
 		</reference>
     </component> 

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/main/resources/intracomposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/main/resources/intracomposite.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/main/resources/intracomposite.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/main/resources/intracomposite.composite Tue Mar 27 05:18:53 2007
@@ -23,7 +23,7 @@
 	<service name="exchangeJaxbService">
 		<interface.java class="org.apache.tuscany.sca.test.exceptions.impl.StockExceptionTestJAXB"/>
 		<binding.ws wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)" wsdlLocation="http://scatesttool.stockexceptiontestservice wsdl/StockExceptionTest.wsdl"/>
-		<reference>exchangeJaxbComponent</reference>
+		<reference target="exchangeJaxbComponent">exchangeJaxbComponent</reference>
 	</service>
 	
 	<component name="exchangeJaxbComponent">
@@ -32,10 +32,10 @@
 	
 	<component name="stockTraderSDOComponent">
 		<implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl"/>
-		<reference name="exchangeJaxb">stockTraderSDOReference</reference>
+		<reference name="exchangeJaxb"></reference>
 	</component>
 	
-	<reference name="stockTraderSDOReference">
+	<reference name="stockTraderSDOReference" promote="stockTraderSDOComponent">
 		<interface.java class="org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest"/>
 		<binding.ws wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)" wsdlLocation="http://scatesttool.stockexceptiontestservice wsdl/StockExceptionTest.wsdl"/>
    	</reference>

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java Tue Mar 27 05:18:53 2007
@@ -43,7 +43,7 @@
             assertEquals("IBM", sp.getSymbol());
         } catch (Exception e) {
 
-            e.printStackTrace();
+            e.printStackTrace(); 
             fail(e + "");
 
         }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding/src/main/resources/intracomposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding/src/main/resources/intracomposite.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding/src/main/resources/intracomposite.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding/src/main/resources/intracomposite.composite Tue Mar 27 05:18:53 2007
@@ -22,7 +22,7 @@
 
     <component name="stockTraderSDOComponent">
         <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl" />
-        <reference name="exchangeJaxb">exchangeJaxbComponent</reference>
+        <reference name="exchangeJaxb" target="exchangeJaxbComponent">exchangeJaxbComponent</reference>
     </component>
 
     <component name="exchangeJaxbComponent">

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions/src/main/resources/intracomposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions/src/main/resources/intracomposite.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions/src/main/resources/intracomposite.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions/src/main/resources/intracomposite.composite Tue Mar 27 05:18:53 2007
@@ -23,7 +23,7 @@
    
     <component name="main">
         <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl"/>
-        <reference name="exceptionThrower">exceptionThrower</reference>
+        <reference name="exceptionThrower" target="exceptionThrower">exceptionThrower</reference>
     </component>
     
     <component name="exceptionThrower">

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/main/resources/PropertyTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/main/resources/PropertyTest.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/main/resources/PropertyTest.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/main/resources/PropertyTest.composite Tue Mar 27 05:18:53 2007
@@ -20,6 +20,7 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
        xmlns:foo="http://foo"
            name="PropertyTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+           
     <property name="number" type="xsd:int">1</property>
     <property name="complex" type="foo:MyComplexType" >
         <foo:MyComplexValue xsi:type="foo:MyComplexType" >
@@ -65,8 +66,8 @@
 
     <component name="ABCDComponent">
         <implementation.java class="org.apache.tuscany.sca.itest.ABCDComponentImpl"/>
-        <reference name="ab">ABComponent</reference>
-        <reference name="cd">CDComponent</reference>
+        <reference name="ab" target="ABComponent"></reference>
+        <reference name="cd" target="CDComponent"></reference>
     </component>
 
     <component name="ABComponent">

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java Tue Mar 27 05:18:53 2007
@@ -24,9 +24,6 @@
 
 import java.util.Iterator;
 
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
 import org.apache.tuscany.api.SCARuntime;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myListService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myListService.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myListService.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myListService.composite Tue Mar 27 05:18:53 2007
@@ -23,8 +23,8 @@
    
     <component name="MyNewListService">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyListServiceImpl"/>
-	<reference name="myListServiceList">MyNCService/MyListService</reference>
-	<reference name="myListServiceArray">MyListServiceFor2006/MyListService</reference>
+	<reference name="myListServiceList" target="MyNCService/MyListService"></reference>
+	<reference name="myListServiceArray" target="MyListServiceFor2006/MyListService"></reference>
 	<property name="serviceYear">2007</property>
     </component>
     

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalService.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalService.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalService.composite Tue Mar 27 05:18:53 2007
@@ -25,8 +25,8 @@
     
     <component name="MyTotalService">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
-        <reference name="myService">MyNCService/MyService</reference>
-        <reference name="myListService">MyNCService/MyListService</reference>
+        <reference name="myService" target="MyNCService/MyService"></reference>
+        <reference name="myListService" target="MyNCService/MyListService"></reference>
     </component>
     
 </composite>

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInComposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInComposite.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInComposite.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInComposite.composite Tue Mar 27 05:18:53 2007
@@ -28,15 +28,15 @@
    
     <component name="MyTotalServiceComponent">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
-		<reference name="myService">MyServiceRef</reference>
-		<reference name="myListService">MyListServiceRef</reference>
+		<reference name="myService"></reference>
+		<reference name="myListService"></reference>
     </component>
     
-    <reference name="MyServiceRef">
+    <reference name="MyServiceRef" promote="MyTotalServiceComponent/myService">
         <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
     </reference>
 
-    <reference name="MyListServiceRef">
+    <reference name="MyListServiceRef" promote="MyTotalServiceComponent/myListService">
         <interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
     </reference>
 

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite Tue Mar 27 05:18:53 2007
@@ -28,15 +28,15 @@
    
     <component name="MyTotalServiceComponentNo">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
-		<reference name="myService">MyServiceRefNo</reference>
-		<reference name="myListService">MyListServiceRefNo</reference>
+		<reference name="myService"></reference>
+		<reference name="myListService"></reference>
     </component>
     
-    <reference name="MyServiceRefNo" override="no">
+    <reference name="MyServiceRefNo" override="no" promote="MyTotalServiceComponentNo/myService">
         <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
     </reference>
 
-    <reference name="MyListServiceRefNo" override="no">
+    <reference name="MyListServiceRefNo" promote="MyTotalServiceComponentNo/myListService" override="no">
         <interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
     </reference>
 
@@ -47,15 +47,15 @@
    
     <component name="MyTotalServiceComponentMay">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
-		<reference name="myService">MyServiceRefMay</reference>
-		<reference name="myListService">MyListServiceRefMay</reference>
+		<reference name="myService"></reference>
+		<reference name="myListService"></reference>
     </component>
     
-    <reference name="MyServiceRefMay" override="may">
+    <reference name="MyServiceRefMay" override="may" promote="MyTotalServiceComponentMay/myService">
         <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
     </reference>
 
-    <reference name="MyListServiceRefMay" override="may">
+    <reference name="MyListServiceRefMay" override="may" promote="MyTotalServiceComponentMay/myListService">
         <interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
     </reference>
 
@@ -66,15 +66,15 @@
    
     <component name="MyTotalServiceComponentMust">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
-		<reference name="myService">MyServiceRefMust</reference>
-		<reference name="myListService">MyListServiceRefMust</reference>
+		<reference name="myService"></reference>
+		<reference name="myListService"></reference>
     </component>
     
-    <reference name="MyServiceRefMust" override="must">
+    <reference name="MyServiceRefMust" override="must" promote="MyTotalServiceComponentMust/myService">
         <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
     </reference>
 
-    <reference name="MyListServiceRefMust" override="must">
+    <reference name="MyListServiceRefMust" override="must" promote="MyTotalServiceComponentMust/myListService">
         <interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
     </reference>
 

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInRecursive.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInRecursive.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInRecursive.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInRecursive.composite Tue Mar 27 05:18:53 2007
@@ -27,8 +27,8 @@
     
     <component name="MyTotalServiceFromRecursive">
         <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
-		<reference name="myService">MyServiceInComposite/MyService</reference>
-		<reference name="myListService">MyServiceInComposite/MyListService</reference>
+		<reference name="myService" target="MyServiceInComposite/MyService"></reference>
+		<reference name="myListService" target="MyServiceInComposite/MyListServic">e</reference>
     </component>
     
  	<service name="MyTotalServiceInCompositeWithRecursiveUseService">
@@ -43,14 +43,14 @@
     
     <component name="MyTotalServiceInCompositeWithRecursive">
         <implementation.composite scdlLocation="myTotalServiceInComposite.composite"/>
-		<reference name="MyServiceRef">MyServiceInComposite/MyService</reference>
-		<reference name="MyListServiceRef">MyServiceInComposite/MyListService</reference>
+		<reference name="MyServiceRef" target="MyServiceInComposite/MyService"></reference>
+		<reference name="MyListServiceRef" target="MyServiceInComposite/MyListService"></reference>
     </component>
 
     <component name="MyTotalServiceInCompositeWithComponentService">
         <implementation.composite scdlLocation="myTotalServiceInComposite.composite"/>
-		<reference name="MyServiceRef">MyServiceInComponent/MyService</reference>
-		<reference name="MyListServiceRef">MyServiceInComponent/MyListService</reference>
+		<reference name="MyServiceRef" target="MyServiceInComponent/MyService"></reference>
+		<reference name="MyListServiceRef" target="MyServiceInComponent/MyListService"></reference>
     </component>
 
     <component name="MyServiceInComponent">

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite Tue Mar 27 05:18:53 2007
@@ -38,12 +38,12 @@
       
     <component name="MyTotalServiceForReferenceComponent">
         <implementation.composite scdlLocation="myTotalServiceInCompositeForReferenceOverride.composite"/>
-		<reference name="MyServiceRefNo">MyServiceInComposite/MyService</reference>
-		<reference name="MyListServiceRefNo">MyServiceInComposite/MyListService</reference>
-		<reference name="MyServiceRefMay">MyServiceInComposite/MyService</reference>
-		<reference name="MyListServiceRefMay">MyServiceInComposite/MyListService</reference>
-		<reference name="MyServiceRefMust">MyServiceInComposite/MyService</reference>
-		<reference name="MyListServiceRefMust">MyServiceInComposite/MyListService</reference>
+		<reference name="MyServiceRefNo" target="MyServiceInComposite/MyService"></reference>
+		<reference name="MyListServiceRefNo" target="MyServiceInComposite/MyListService"></reference>
+		<reference name="MyServiceRefMay" target="MyServiceInComposite/MyService"></reference>
+		<reference name="MyListServiceRefMay" target="MyServiceInComposite/MyListService"></reference>
+		<reference name="MyServiceRefMust" target="MyServiceInComposite/MyService"></reference>
+		<reference name="MyListServiceRefMust" target="MyServiceInComposite/MyListService"></reference>
     </component>
 
     <component name="MyServiceInComponent">

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite Tue Mar 27 05:18:53 2007
@@ -129,53 +129,53 @@
 
     <component name="Component2a3a4a">
         <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService">Component3a4a</reference>
+        <reference name="accountService" target="Component3a4a">Component3a4a</reference>
     </component>
     <component name="Component2a3a4b">
         <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService">Component3a4b</reference>
+        <reference name="accountService" target="Component3a4b">Component3a4b</reference>
     </component>
     <component name="Component2a3b4a">
         <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService">Component3b4a</reference>
+        <reference name="accountService" target="Component3b4a">Component3b4a</reference>
     </component>
     <component name="Component2a3b4b">
         <implementation.java class="bigbank.account.services.accountdata.Component2aImpl" />
-        <reference name="accountService">Component3b4b</reference>
+        <reference name="accountService" target="Component3b4b">Component3b4b</reference>
     </component>
 
     <component name="Component2b3a4a">
         <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService">Component3a4a</reference>
+        <reference name="accountService" target="Component3a4a">Component3a4a</reference>
     </component>
     <component name="Component2b3a4b">
         <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService">Component3a4b</reference>
+        <reference name="accountService" target="Component3a4b">Component3a4b</reference>
     </component>
     <component name="Component2b3b4a">
         <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService">Component3b4a</reference>
+        <reference name="accountService" target="Component3b4a">Component3b4a</reference>
     </component>
     <component name="Component2b3b4b">
         <implementation.java class="bigbank.account.services.accountdata.Component2bImpl" />
-        <reference name="accountService">Component3b4b</reference>
+        <reference name="accountService" target="Component3b4b">Component3b4b</reference>
     </component>
 
     <component name="Component3a4a">
         <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" />
-        <reference name="accountService">Ref4a</reference>
+        <reference name="accountService" target="Ref4a">Ref4a</reference>
     </component>
     <component name="Component3a4b">
         <implementation.java class="bigbank.account.services.accountdata.Component3aImpl" />
-        <reference name="accountService">Ref4b</reference>
+        <reference name="accountService" target="Ref4b">Ref4b</reference>
     </component>
     <component name="Component3b4a">
         <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" />
-        <reference name="accountService">Ref4a</reference>
+        <reference name="accountService" target="Ref4a">Ref4a</reference>
     </component>
     <component name="Component3b4b">
         <implementation.java class="bigbank.account.services.accountdata.Component3bImpl" />
-        <reference name="accountService">Ref4b</reference>
+        <reference name="accountService" target="Ref4b">Ref4b</reference>
     </component>
 
     <reference name="Ref4a">
@@ -211,7 +211,7 @@
 
     <component name="AccountServiceClient">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">AccountServiceRef</reference>
+        <reference name="accountService" target="AccountServiceRef">AccountServiceRef</reference>
     </component>
 
     <reference name="AccountServiceRef">
@@ -225,7 +225,7 @@
 
     <component name="Client1a2a3a4a">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1a2a3a4a</reference>
+        <reference name="accountService" target="ClientRef1a2a3a4a">ClientRef1a2a3a4a</reference>
     </component>
 
     <reference name="ClientRef1a2a3a4a">
@@ -236,7 +236,7 @@
 
     <component name="Client1a2a3a4b">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1a2a3a4b</reference>
+        <reference name="accountService" target="ClientRef1a2a3a4b">ClientRef1a2a3a4b</reference>
     </component>
 
     <reference name="ClientRef1a2a3a4b">
@@ -247,7 +247,7 @@
 
     <component name="Client1a2a3b4a">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1a2a3b4a</reference>
+        <reference name="accountService" target="ClientRef1a2a3b4a">ClientRef1a2a3b4a</reference>
     </component>
 
     <reference name="ClientRef1a2a3b4a">
@@ -258,7 +258,7 @@
 
     <component name="Client1a2a3b4b">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1a2a3b4b</reference>
+        <reference name="accountService" target="ClientRef1a2a3b4b">ClientRef1a2a3b4b</reference>
     </component>
 
     <reference name="ClientRef1a2a3b4b">
@@ -269,7 +269,7 @@
 
     <component name="Client1a2b3a4a">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1a2b3a4a</reference>
+        <reference name="accountService" target="ClientRef1a2b3a4a">ClientRef1a2b3a4a</reference>
     </component>
 
     <reference name="ClientRef1a2b3a4a">
@@ -280,7 +280,7 @@
 
     <component name="Client1a2b3a4b">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1a2b3a4b</reference>
+        <reference name="accountService" target="ClientRef1a2b3a4b">ClientRef1a2b3a4b</reference>
     </component>
 
     <reference name="ClientRef1a2b3a4b">
@@ -291,7 +291,7 @@
 
     <component name="Client1a2b3b4a">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1a2b3b4a</reference>
+        <reference name="accountService" target="ClientRef1a2b3b4a">ClientRef1a2b3b4a</reference>
     </component>
 
     <reference name="ClientRef1a2b3b4a">
@@ -302,7 +302,7 @@
 
     <component name="Client1a2b3b4b">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1a2b3b4b</reference>
+        <reference name="accountService" target="ClientRef1a2b3b4b">ClientRef1a2b3b4b</reference>
     </component>
 
     <reference name="ClientRef1a2b3b4b">
@@ -313,7 +313,7 @@
 
     <component name="Client1b2a3a4a">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1b2a3a4a</reference>
+        <reference name="accountService" target="ClientRef1b2a3a4a">ClientRef1b2a3a4a</reference>
     </component>
 
     <reference name="ClientRef1b2a3a4a">
@@ -324,7 +324,7 @@
 
     <component name="Client1b2a3a4b">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1b2a3a4b</reference>
+        <reference name="accountService" target="ClientRef1b2a3a4b">ClientRef1b2a3a4b</reference>
     </component>
 
     <reference name="ClientRef1b2a3a4b">
@@ -335,7 +335,7 @@
 
     <component name="Client1b2a3b4a">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1b2a3b4a</reference>
+        <reference name="accountService" target="ClientRef1b2a3b4a">ClientRef1b2a3b4a</reference>
     </component>
 
     <reference name="ClientRef1b2a3b4a">
@@ -346,7 +346,7 @@
 
     <component name="Client1b2a3b4b">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1b2a3b4b</reference>
+        <reference name="accountService" target="ClientRef1b2a3b4b">ClientRef1b2a3b4b</reference>
     </component>
 
     <reference name="ClientRef1b2a3b4b">
@@ -357,7 +357,7 @@
 
     <component name="Client1b2b3a4a">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1b2b3a4a</reference>
+        <reference name="accountService" target="ClientRef1b2b3a4a">ClientRef1b2b3a4a</reference>
     </component>
 
     <reference name="ClientRef1b2b3a4a">
@@ -368,7 +368,7 @@
 
     <component name="Client1b2b3a4b">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1b2b3a4b</reference>
+        <reference name="accountService" target="ClientRef1b2b3a4b">ClientRef1b2b3a4b</reference>
     </component>
 
     <reference name="ClientRef1b2b3a4b">
@@ -379,7 +379,7 @@
 
     <component name="Client1b2b3b4a">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1b2b3b4a</reference>
+        <reference name="accountService" target="ClientRef1b2b3b4a">ClientRef1b2b3b4a</reference>
     </component>
 
     <reference name="ClientRef1b2b3b4a">
@@ -390,7 +390,7 @@
 
     <component name="Client1b2b3b4b">
         <implementation.java class="bigbank.account.services.accountdata.AccountServiceClientImpl" />
-        <reference name="accountService">ClientRef1b2b3b4b</reference>
+        <reference name="accountService" target="ClientRef1b2b3b4b">ClientRef1b2b3b4b</reference>
     </component>
 
     <reference name="ClientRef1b2b3b4b">

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/WSDLTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/WSDLTest.composite?view=diff&rev=522885&r1=522884&r2=522885
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/WSDLTest.composite (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/WSDLTest.composite Tue Mar 27 05:18:53 2007
@@ -106,53 +106,53 @@
 
     <component name="Component2a3a4a">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp">Component3a4a</reference>
+        <reference name="comp" target="Component3a4a">Component3a4a</reference>
     </component> 
     <component name="Component2a3a4b">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp">Component3a4b</reference>
+        <reference name="comp" target="Component3a4b">Component3a4b</reference>
     </component> 
     <component name="Component2a3b4a">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp">Component3b4a</reference>
+        <reference name="comp" target="Component3b4a">Component3b4a</reference>
     </component> 
     <component name="Component2a3b4b">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component2aImpl"/>
-        <reference name="comp">Component3b4b</reference>
+        <reference name="comp" target="Component3b4b">Component3b4b</reference>
     </component> 
 
     <component name="Component2b3a4a">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp">Component3a4a</reference>
+        <reference name="comp" target="Component3a4a">Component3a4a</reference>
     </component> 
     <component name="Component2b3a4b">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp">Component3a4b</reference>
+        <reference name="comp" target="Component3a4b">Component3a4b</reference>
     </component> 
     <component name="Component2b3b4a">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp">Component3b4a</reference>
+        <reference name="comp" target="Component3b4a">Component3b4a</reference>
     </component> 
     <component name="Component2b3b4b">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component2bImpl"/>
-        <reference name="comp">Component3b4b</reference>
+        <reference name="comp" target="Component3b4b">Component3b4b</reference>
     </component> 
 
     <component name="Component3a4a">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/>
-        <reference name="comp">Ref4a</reference>
+        <reference name="comp" target="Ref4a">Ref4a</reference>
     </component> 
     <component name="Component3a4b">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component3aImpl"/>
-        <reference name="comp">Ref4b</reference>
+        <reference name="comp" target="Ref4b">Ref4b</reference>
     </component> 
     <component name="Component3b4a">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/>
-        <reference name="comp">Ref4a</reference>
+        <reference name="comp" target="Ref4a">Ref4a</reference>
     </component> 
     <component name="Component3b4b">
     	<implementation.java class="org.apache.tuscany.sca.itest.Component3bImpl"/>
-        <reference name="comp">Ref4b</reference>
+        <reference name="comp" target="Ref4b">Ref4b</reference>
     </component> 
 
     <reference name="Ref4a">
@@ -187,7 +187,7 @@
 
     <component name="Client1a2a3a4a">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1a2a3a4a</reference>
+      <reference name="helloWorldService"  target="ClientRef1a2a3a4a">ClientRef1a2a3a4a</reference>
     </component>
 
     <reference name="ClientRef1a2a3a4a">
@@ -201,7 +201,7 @@
     
     <component name="Client1a2a3a4b">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1a2a3a4b</reference>
+      <reference name="helloWorldService"  target="ClientRef1a2a3a4b">ClientRef1a2a3a4b</reference>
     </component>
 
     <reference name="ClientRef1a2a3a4b">
@@ -215,7 +215,7 @@
     
     <component name="Client1a2a3b4a">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1a2a3b4a</reference>
+      <reference name="helloWorldService"  target="ClientRef1a2a3b4a">ClientRef1a2a3b4a</reference>
     </component>
 
     <reference name="ClientRef1a2a3b4a">
@@ -229,7 +229,7 @@
     
     <component name="Client1a2a3b4b">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1a2a3b4b</reference>
+      <reference name="helloWorldService"  target="ClientRef1a2a3b4b">ClientRef1a2a3b4b</reference>
     </component>
 
     <reference name="ClientRef1a2a3b4b">
@@ -243,7 +243,7 @@
     
     <component name="Client1a2b3a4a">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1a2b3a4a</reference>
+      <reference name="helloWorldService"  target="ClientRef1a2b3a4a">ClientRef1a2b3a4a</reference>
     </component>
 
     <reference name="ClientRef1a2b3a4a">
@@ -257,7 +257,7 @@
     
     <component name="Client1a2b3a4b">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1a2b3a4b</reference>
+      <reference name="helloWorldService"  target="ClientRef1a2b3a4b">ClientRef1a2b3a4b</reference>
     </component>
 
     <reference name="ClientRef1a2b3a4b">
@@ -271,7 +271,7 @@
     
     <component name="Client1a2b3b4a">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1a2b3b4a</reference>
+      <reference name="helloWorldService"  target="ClientRef1a2b3b4a">ClientRef1a2b3b4a</reference>
     </component>
 
     <reference name="ClientRef1a2b3b4a">
@@ -285,7 +285,7 @@
     
     <component name="Client1a2b3b4b">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1a2b3b4b</reference>
+      <reference name="helloWorldService"  target="ClientRef1a2b3b4b">ClientRef1a2b3b4b</reference>
     </component>
 
     <reference name="ClientRef1a2b3b4b">
@@ -299,7 +299,7 @@
     
     <component name="Client1b2a3a4a">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1b2a3a4a</reference>
+      <reference name="helloWorldService"  target="ClientRef1b2a3a4a">ClientRef1b2a3a4a</reference>
     </component>
 
     <reference name="ClientRef1b2a3a4a">
@@ -313,7 +313,7 @@
     
     <component name="Client1b2a3a4b">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1b2a3a4b</reference>
+      <reference name="helloWorldService"  target="ClientRef1b2a3a4b">ClientRef1b2a3a4b</reference>
     </component>
 
     <reference name="ClientRef1b2a3a4b">
@@ -327,7 +327,7 @@
     
     <component name="Client1b2a3b4a">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1b2a3b4a</reference>
+      <reference name="helloWorldService"  target="ClientRef1b2a3b4a">ClientRef1b2a3b4a</reference>
     </component>
 
     <reference name="ClientRef1b2a3b4a">
@@ -341,7 +341,7 @@
     
     <component name="Client1b2a3b4b">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1b2a3b4b</reference>
+      <reference name="helloWorldService"  target="ClientRef1b2a3b4b">ClientRef1b2a3b4b</reference>
     </component>
 
     <reference name="ClientRef1b2a3b4b">
@@ -355,7 +355,7 @@
     
     <component name="Client1b2b3a4a">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1b2b3a4a</reference>
+      <reference name="helloWorldService"  target="ClientRef1b2b3a4a">ClientRef1b2b3a4a</reference>
     </component>
 
     <reference name="ClientRef1b2b3a4a">
@@ -369,7 +369,7 @@
     
     <component name="Client1b2b3a4b">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1b2b3a4b</reference>
+      <reference name="helloWorldService"  target="ClientRef1b2b3a4b">ClientRef1b2b3a4b</reference>
     </component>
 
     <reference name="ClientRef1b2b3a4b">
@@ -383,7 +383,7 @@
     
     <component name="Client1b2b3b4a">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1b2b3b4a</reference>
+      <reference name="helloWorldService"  target="ClientRef1b2b3b4a">ClientRef1b2b3b4a</reference>
     </component>
 
     <reference name="ClientRef1b2b3b4a">
@@ -397,7 +397,7 @@
     
     <component name="Client1b2b3b4b">
       <implementation.java class="helloworld.HelloWorldServiceComponent"/>
-      <reference name="helloWorldService">ClientRef1b2b3b4b</reference>
+      <reference name="helloWorldService"  target="ClientRef1b2b3b4b">ClientRef1b2b3b4b</reference>
     </component>
 
     <reference name="ClientRef1b2b3b4b">



---------------------------------------------------------------------
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