Switch over to new endpoint reference/endpoint model. These are the changes required to exploit the model in the runtime up to the point were the old EndpointReference is retrieved from a wire. The next step is to convert this over too and exploit the new endpoint references fully. There is still tidying to do (search for TODO - EPR) in particular I haven't removed any of the old files yet. So beware don't put changes into CompositeActivator or RuntimeWire as the runtime isn't using them

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@756070 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 3 insertions, 13 deletions

diff --git a/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite b/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite
index 46cc6fa8da..5300107706 100644
--- a/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite
+++ b/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite
@@ -19,10 +19,6 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:foo="http://foo" targetNamespace="http://foo"

     name="AutowireReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true">

 

-    <service name="AComponent" promote="AComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.references.AComponent" />

-    </service>

-

     <component name="AComponent" autowire="false">

         <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" />

         <reference name="bReference" target="BComponent" />

diff --git a/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite b/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite
index 02ee7dd3f7..be4ac75b3c 100644
--- a/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite
+++ b/java/sca/itest/references/src/main/resources/InnerReferencesTest.composite
@@ -19,9 +19,6 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:foo="http://foo" targetNamespace="http://foo"

     name="InnerReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

 

-    <service name="AComponent" promote="AComponent">

-        <interface.java interface="org.apache.tuscany.sca.itest.references.AComponent" />

-    </service>

 

     <component name="AComponent">

         <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" />

diff --git a/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite b/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite
index 084b86a3b1..d5596e3da4 100644
--- a/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite
+++ b/java/sca/itest/references/src/main/resources/ManualWiredReferencesTest.composite
@@ -19,10 +19,6 @@
 <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903" xmlns:foo="http://foo" targetNamespace="http://foo"
     name="ManualWiredReferencesTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autowire="true">
 
-    <service name="AComponent" promote="AComponent">
-        <interface.java interface="org.apache.tuscany.sca.itest.references.AComponent" />
-    </service>
-
     <component name="AComponent" >
         <implementation.java class="org.apache.tuscany.sca.itest.references.AComponentImpl" />
         <reference name="bReference" target="BComponent" />
diff --git a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java b/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
index 1034bda02d..76264d308f 100644
--- a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
+++ b/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
@@ -28,6 +28,7 @@ import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.oasisopen.sca.ServiceUnavailableException;
 
 public class AutoWiredReferenceTestCase {
     private static Node node;
@@ -69,7 +70,7 @@ public class AutoWiredReferenceTestCase {
         assertEquals("BCComponent", acomponent.fooBC());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = Exception.class)
     public void testD1Reference() {
         acomponent.fooD1();
     }
diff --git a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java b/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
index db2e3f175d..6e4212fd9a 100644
--- a/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
+++ b/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
@@ -91,7 +91,7 @@ public class InnerReferenceTestCase {
         Assert.assertTrue(components.contains("DComponent1"));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test(expected = Exception.class)
     public void testRequiredFalseReference() {
         acomponent.getDReference().dFoo();
     }