Modified: tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java (original) +++ tuscany/sca-java-2.x/trunk/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java Tue Feb 9 21:46:04 2010 @@ -25,7 +25,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.io.StringReader; import java.io.StringWriter; import java.math.BigDecimal; import java.math.BigInteger; @@ -46,34 +45,25 @@ import javax.xml.transform.Result; import javax.xml.transform.Source; import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; import junit.framework.Assert; import org.apache.axiom.attachments.ByteArrayDataSource; -import org.apache.tuscany.sca.databinding.xml.String2Node; import org.apache.tuscany.sca.itest.databindings.jaxb.StandardTypesServiceClient; import org.apache.tuscany.sca.itest.databindings.jaxb.impl.StandardTypesTransformer; -import org.apache.tuscany.sca.node.Client; +import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; -import org.xml.sax.InputSource; -import org.junit.Ignore; /** * @version $Rev$ $Date$ */ public class StandardTypesDatabindingTestCase { - private static Client domain; private static Node node; /** @@ -85,7 +75,6 @@ node = factory.createNode(new File("src/main/resources/wsdl/wrapped/standard-types-service.composite").toURI().toURL().toString(), new Contribution("TestContribution", new File("src/main/resources/wsdl/wrapped/").toURI().toURL().toString())); node.start(); - domain = (Client)node; } /** @@ -103,7 +92,7 @@ @Test public void testW2WNewBigInteger() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewBigInteger(serviceClient); } @@ -114,7 +103,7 @@ @Test public void testW2WNewBigIntegerArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewBigIntegerArray(serviceClient); } @@ -125,7 +114,7 @@ @Test public void testW2WNewBigDecimal() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewBigDecimal(serviceClient); } @@ -136,7 +125,7 @@ @Test public void testW2WNewBigDecimalArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewBigDecimalArray(serviceClient); } @@ -147,7 +136,7 @@ @Test public void testW2WNewCalendar() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewCalendar(serviceClient); } @@ -158,7 +147,7 @@ @Test public void testW2WNewCalendarArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewCalendarArray(serviceClient); } @@ -169,7 +158,7 @@ @Test public void testW2WNewDate() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewDate(serviceClient); } @@ -180,7 +169,7 @@ @Test public void testW2WNewDateArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewDateArray(serviceClient); } @@ -191,7 +180,7 @@ @Test public void testW2WNewQName() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewQName(serviceClient); } @@ -202,7 +191,7 @@ @Test public void testW2WNewQNameArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewQNameArray(serviceClient); } @@ -213,7 +202,7 @@ @Test public void testW2WNewURI() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewURI(serviceClient); } @@ -224,7 +213,7 @@ @Test public void testW2WNewURIArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewURIArray(serviceClient); } @@ -235,7 +224,7 @@ @Test public void testW2WNewXMLGregorianCalendar() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewXMLGregorianCalendar(serviceClient); } @@ -246,7 +235,7 @@ @Test public void testW2WNewXMLGregorianCalendarArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewXMLGregorianCalendarArray(serviceClient); } @@ -257,7 +246,7 @@ @Test public void testW2WNewDuration() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewDuration(serviceClient); } @@ -268,7 +257,7 @@ @Test public void testW2WNewDurationArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewDurationArray(serviceClient); } @@ -279,7 +268,7 @@ @Test public void testW2WNewObject() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewObject(serviceClient); } @@ -290,7 +279,7 @@ @Test public void testW2WNewObjectArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewObjectArray(serviceClient); } @@ -301,7 +290,7 @@ @Test public void testW2WNewImage() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewImage(serviceClient); } @@ -312,7 +301,7 @@ @Test public void testW2WNewImageArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewImageArray(serviceClient); } @@ -323,7 +312,7 @@ @Test public void testW2WNewDataHandler() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewDataHandler(serviceClient); } @@ -334,7 +323,7 @@ @Test public void testW2WNewDataHandlerArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewDataHandlerArray(serviceClient); } @@ -346,7 +335,7 @@ //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\";>A</return]>>") public void testW2WNewSource() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewSource(serviceClient); }*/ @@ -358,7 +347,7 @@ @Ignore("TUSCANY-2452") public void testW2WNewSourceArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewSourceArray(serviceClient); }*/ @@ -369,7 +358,7 @@ @Test public void testW2WNewUUID() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewUUID(serviceClient); } @@ -380,7 +369,7 @@ @Test public void testW2WNewUUIDArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2WComponent"); performTestNewUUIDArray(serviceClient); } @@ -391,7 +380,7 @@ @Test public void testJ2WNewBigInteger() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewBigInteger(serviceClient); } @@ -402,7 +391,7 @@ @Test public void testJ2WNewBigIntegerArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewBigIntegerArray(serviceClient); } @@ -413,7 +402,7 @@ @Test public void testJ2WNewBigDecimal() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewBigDecimal(serviceClient); } @@ -424,7 +413,7 @@ @Test public void testJ2WNewBigDecimalArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewBigDecimalArray(serviceClient); } @@ -435,7 +424,7 @@ @Test public void testJ2WNewCalendar() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewCalendar(serviceClient); } @@ -446,7 +435,7 @@ @Test public void testJ2WNewCalendarArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewCalendarArray(serviceClient); } @@ -457,7 +446,7 @@ @Test public void testJ2WNewDate() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewDate(serviceClient); } @@ -468,7 +457,7 @@ @Test public void testJ2WNewDateArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewDateArray(serviceClient); } @@ -479,7 +468,7 @@ @Test public void testJ2WNewQName() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewQName(serviceClient); } @@ -490,7 +479,7 @@ @Test public void testJ2WNewQNameArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewQNameArray(serviceClient); } @@ -501,7 +490,7 @@ @Test public void testJ2WNewURI() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewURI(serviceClient); } @@ -512,7 +501,7 @@ @Test public void testJ2WNewURIArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewURIArray(serviceClient); } @@ -523,7 +512,7 @@ @Test public void testJ2WNewXMLGregorianCalendar() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewXMLGregorianCalendar(serviceClient); } @@ -534,7 +523,7 @@ @Test public void testJ2WNewXMLGregorianCalendarArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewXMLGregorianCalendarArray(serviceClient); } @@ -545,7 +534,7 @@ @Test public void testJ2WNewDuration() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewDuration(serviceClient); } @@ -556,7 +545,7 @@ @Test public void testJ2WNewDurationArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewDurationArray(serviceClient); } @@ -567,7 +556,7 @@ @Test public void testJ2WNewObject() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewObject(serviceClient); } @@ -578,7 +567,7 @@ @Test public void testJ2WNewObjectArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewObjectArray(serviceClient); } @@ -589,7 +578,7 @@ @Test public void testJ2WNewImage() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewImage(serviceClient); } @@ -600,7 +589,7 @@ @Test public void testJ2WNewImageArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewImageArray(serviceClient); } @@ -611,7 +600,7 @@ @Test public void testJ2WNewDataHandler() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewDataHandler(serviceClient); } @@ -622,7 +611,7 @@ @Test public void testJ2WNewDataHandlerArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewDataHandlerArray(serviceClient); } @@ -634,7 +623,7 @@ //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\";>A</return]>>") public void testJ2WNewSource() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewSource(serviceClient); }*/ @@ -646,7 +635,7 @@ @Ignore("TUSCANY-2452") public void testJ2WNewSourceArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewSourceArray(serviceClient); }*/ @@ -657,7 +646,7 @@ @Test public void testJ2WNewUUID() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewUUID(serviceClient); } @@ -668,7 +657,7 @@ @Test public void testJ2WNewUUIDArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientJ2WComponent"); performTestNewUUIDArray(serviceClient); } @@ -679,7 +668,7 @@ @Test public void testW2JNewBigInteger() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewBigInteger(serviceClient); } @@ -690,7 +679,7 @@ @Test public void testW2JNewBigIntegerArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewBigIntegerArray(serviceClient); } @@ -701,7 +690,7 @@ @Test public void testW2JNewBigDecimal() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewBigDecimal(serviceClient); } @@ -712,7 +701,7 @@ @Test public void testW2JNewBigDecimalArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewBigDecimalArray(serviceClient); } @@ -723,7 +712,7 @@ @Test public void testW2JNewCalendar() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewCalendar(serviceClient); } @@ -734,7 +723,7 @@ @Test public void testW2JNewCalendarArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewCalendarArray(serviceClient); } @@ -745,7 +734,7 @@ @Test public void testW2JNewDate() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewDate(serviceClient); } @@ -756,7 +745,7 @@ @Test public void testW2JNewDateArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewDateArray(serviceClient); } @@ -767,7 +756,7 @@ @Test public void testW2JNewQName() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewQName(serviceClient); } @@ -778,7 +767,7 @@ @Test public void testW2JNewQNameArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewQNameArray(serviceClient); } @@ -789,7 +778,7 @@ @Test public void testW2JNewURI() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewURI(serviceClient); } @@ -800,7 +789,7 @@ @Test public void testW2JNewURIArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewURIArray(serviceClient); } @@ -811,7 +800,7 @@ @Test public void testW2JNewXMLGregorianCalendar() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewXMLGregorianCalendar(serviceClient); } @@ -822,7 +811,7 @@ @Test public void testW2JNewXMLGregorianCalendarArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewXMLGregorianCalendarArray(serviceClient); } @@ -833,7 +822,7 @@ @Test public void testW2JNewDuration() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewDuration(serviceClient); } @@ -844,7 +833,7 @@ @Test public void testW2JNewDurationArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewDurationArray(serviceClient); } @@ -855,7 +844,7 @@ @Test public void testW2JNewObject() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewObject(serviceClient); } @@ -866,7 +855,7 @@ @Test public void testW2JNewObjectArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewObjectArray(serviceClient); } @@ -877,7 +866,7 @@ @Test public void testW2JNewImage() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewImage(serviceClient); } @@ -888,7 +877,7 @@ @Test public void testW2JNewImageArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewImageArray(serviceClient); } @@ -899,7 +888,7 @@ @Test public void testW2JNewDataHandler() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewDataHandler(serviceClient); } @@ -910,7 +899,7 @@ @Test public void testW2JNewDataHandlerArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewDataHandlerArray(serviceClient); } @@ -922,7 +911,7 @@ //@Ignore("junit.framework.ComparisonFailure: null expected:<... encoding=\"UTF-8\"?><[a>A</a]>> but was:<... encoding=\"UTF-8\"?><[return xmlns=\"http://jaxb.databindings.itest.sca.tuscany.apache.org/\";>A</return]>>") public void testW2JNewSource() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewSource(serviceClient); }*/ @@ -934,7 +923,7 @@ @Ignore("TUSCANY-2452") public void testW2JNewSourceArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewSourceArray(serviceClient); }*/ @@ -945,7 +934,7 @@ @Test public void testW2JNewUUID() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewUUID(serviceClient); } @@ -956,7 +945,7 @@ @Test public void testW2JNewUUIDArray() throws Exception { StandardTypesServiceClient serviceClient = - domain.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); + node.getService(StandardTypesServiceClient.class, "StandardTypesServiceClientW2JComponent"); performTestNewUUIDArray(serviceClient); }
Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java (original) +++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/context/access/SCAApplicationContextProvider.java Tue Feb 9 21:46:04 2010 @@ -18,8 +18,8 @@ */ package context.access; -import org.springframework.beans.BeansException; -import org.springframework.context.ApplicationContext; +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; public class SCAApplicationContextProvider implements ApplicationContextAware { Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java (original) +++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/main/java/spring/annotations/CalculatorServiceImpl.java Tue Feb 9 21:46:04 2010 @@ -18,12 +18,12 @@ */ package spring.annotations; +import org.oasisopen.sca.annotation.ComponentName; import org.oasisopen.sca.annotation.Destroy; import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Service; -import org.oasisopen.sca.annotation.Reference; import org.oasisopen.sca.annotation.Property; -import org.oasisopen.sca.annotation.ComponentName; +import org.oasisopen.sca.annotation.Reference; +import org.oasisopen.sca.annotation.Service; import calculator.AddService; import calculator.CalculatorService; Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java (original) +++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/access/CalculatorClient.java Tue Feb 9 21:46:04 2010 @@ -20,13 +20,12 @@ package context.access; import java.io.File; -import org.apache.tuscany.sca.node.Client; + +import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; import org.springframework.context.ApplicationContext; -import context.access.SCAApplicationContextProvider; import calculator.CalculatorService; /** @@ -47,7 +46,7 @@ System.out.println("CalculatorServiceBean is now available for use..."); CalculatorService calculatorService = - ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent"); + node.getService(CalculatorService.class, "CalculatorServiceComponent"); System.out.println("3 + 2=" + calculatorService.add(3, 2)); System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java (original) +++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/imports/CalculatorClient.java Tue Feb 9 21:46:04 2010 @@ -21,10 +21,10 @@ import java.io.File; -import org.apache.tuscany.sca.node.Client; +import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; + import calculator.CalculatorService; /** @@ -40,7 +40,7 @@ node.start(); CalculatorService calculatorService = - ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent"); + node.getService(CalculatorService.class, "CalculatorServiceComponent"); System.out.println("3 + 2=" + calculatorService.add(3, 2)); System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java (original) +++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/context/multiple/StockQuoteServer.java Tue Feb 9 21:46:04 2010 @@ -21,10 +21,10 @@ import java.io.File; import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; import org.springframework.context.ApplicationContext; + import context.access.SCAApplicationContextProvider; /** Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java (original) +++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/implementation/policies/CalculatorClient.java Tue Feb 9 21:46:04 2010 @@ -22,10 +22,11 @@ import java.io.File; import javax.security.auth.login.Configuration; -import org.apache.tuscany.sca.node.Client; + import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; + import calculator.CalculatorService; @@ -48,7 +49,7 @@ node.start(); CalculatorService calculatorService = - ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent"); + node.getService(CalculatorService.class, "CalculatorServiceComponent"); // Calculate System.out.println("Calling CalculatorServiceComponent configured with 'logging' " + @@ -59,7 +60,7 @@ System.out.println("3 / 2=" + calculatorService.divide(3, 2)); calculatorService = - ((Client)node).getService(CalculatorService.class, "AnotherCalculatorServiceComponent"); + node.getService(CalculatorService.class, "AnotherCalculatorServiceComponent"); // Calculate System.out.println("Calling CalculatorServiceComponent configured with 'logging' " + Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java (original) +++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java Tue Feb 9 21:46:04 2010 @@ -20,12 +20,10 @@ package org.apache.tuscany.sca.itest.spring; import java.io.File; + import junit.framework.TestCase; -import java.net.MalformedURLException; -import org.apache.tuscany.sca.node.Client; import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; @@ -48,7 +46,7 @@ node = factory.createNode(new File("src/main/resources/" + contributionLocation + compositeName).toURI().toURL().toString(), new Contribution("TestContribution", new File("src/main/resources/" + contributionLocation).toURI().toURL().toString())); node.start(); - service = ((Client)node).getService(getServiceClass(), "ClientComponent"); + service = node.getService(getServiceClass(), "ClientComponent"); } abstract protected Class<T> getServiceClass(); Modified: tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java (original) +++ tuscany/sca-java-2.x/trunk/itest/implementation-spring/src/test/java/spring/annotations/CalculatorClient.java Tue Feb 9 21:46:04 2010 @@ -21,10 +21,10 @@ import java.io.File; -import org.apache.tuscany.sca.node.Client; import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; + import calculator.CalculatorService; @@ -41,7 +41,7 @@ node.start(); CalculatorService calculatorService = - ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent"); + node.getService(CalculatorService.class, "CalculatorServiceComponent"); System.out.println("3 + 2=" + calculatorService.add(3, 2)); System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); Modified: tuscany/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java (original) +++ tuscany/sca-java-2.x/trunk/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java Tue Feb 9 21:46:04 2010 @@ -19,22 +19,21 @@ package org.apache.tuscany.sca.itest.oneway; +import java.io.File; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; -import java.io.File; import junit.framework.Assert; import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor; import org.apache.tuscany.sca.itest.oneway.impl.OneWayClientImpl; import org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl; -import org.apache.tuscany.sca.node.Client; +import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -87,7 +86,7 @@ @Test public void testOneWay() throws Exception { OneWayClient client = - ((Client)node).getService(OneWayClient.class, "OneWayClientComponent"); + node.getService(OneWayClient.class, "OneWayClientComponent"); int count = 100; @@ -123,7 +122,7 @@ @Test public void testOneWayUsingNonBlockingInterceptorThrowsAnException() { OneWayClient client = - ((Client)node).getService(OneWayClient.class, "OneWayClientComponentSCABinding"); + node.getService(OneWayClient.class, "OneWayClientComponentSCABinding"); // We need to modify the JDK Logger for the NonBlockingInterceptor so we // can check that it logs a message for the @OneWay invocation that throws Modified: tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java (original) +++ tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/Node.java Tue Feb 9 21:46:04 2010 @@ -19,9 +19,8 @@ package org.apache.tuscany.sca.node; -import java.util.List; - import org.apache.tuscany.sca.node.configuration.NodeConfiguration; +import org.oasisopen.sca.ServiceReference; @@ -32,7 +31,7 @@ * * @version $Rev$ $Date$ */ -public interface Node extends Client { +public interface Node { String DEFAULT_DOMAIN_URI = NodeConfiguration.DEFAULT_DOMAIN_URI; String DEFAULT_NODE_URI = NodeConfiguration.DEFAULT_NODE_URI; /** @@ -46,5 +45,41 @@ */ void stop(); - List<String> getServiceNames(); + /** + * Cast a type-safe reference to a CallableReference. Converts a type-safe + * reference to an equivalent CallableReference; if the target refers to a + * service then a ServiceReference will be returned, if the target refers to + * a callback then a CallableReference will be returned. + * + * @param target a reference proxy provided by the SCA runtime + * @param <B> the Java type of the business interface for the reference + * @param <R> the type of reference to be returned + * @return a CallableReference equivalent for the proxy + * @throws IllegalArgumentException if the supplied instance is not a + * reference supplied by the SCA runtime + */ + <B, R extends ServiceReference<B>> R cast(B target) throws IllegalArgumentException; + + /** + * Returns a proxy for a service provided by a component in the SCA domain. + * + * @param businessInterface the interface that will be used to invoke the + * service + * @param serviceName the name of the service + * @param <B> the Java type of the business interface for the service + * @return an object that implements the business interface + */ + <B> B getService(Class<B> businessInterface, String serviceName); + + /** + * Returns a ServiceReference for a service provided by a component in the + * SCA domain. + * + * @param businessInterface the interface that will be used to invoke the + * service + * @param serviceName the name of the service + * @param <B> the Java type of the business interface for the service + * @return a ServiceReference for the designated service + */ + <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String serviceName); } Modified: tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java (original) +++ tuscany/sca-java-2.x/trunk/modules/node-api/src/main/java/org/apache/tuscany/sca/node/NodeFactory.java Tue Feb 9 21:46:04 2010 @@ -62,7 +62,7 @@ NodeFactory.instance = factory; } - public static class NodeProxy implements Node, Client { + public static class NodeProxy implements Node { private Object node; private NodeProxy(Object node) { Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original) +++ tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Tue Feb 9 21:46:04 2010 @@ -44,7 +44,6 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint; import org.apache.tuscany.sca.core.invocation.ProxyFactory; import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.node.Client; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.configuration.NodeConfiguration; import org.apache.tuscany.sca.node.management.NodeManager; @@ -63,7 +62,7 @@ /** * An SCA Node that is managed by the NodeManager */ -public class NodeImpl implements Node, Client { +public class NodeImpl implements Node { private static final Logger logger = Logger.getLogger(NodeImpl.class.getName()); private ProxyFactory proxyFactory; private CompositeActivator compositeActivator; Modified: tuscany/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java?rev=908245&r1=908244&r2=908245&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java (original) +++ tuscany/sca-java-2.x/trunk/samples/calculator/src/main/java/calculator/CalculatorClient.java Tue Feb 9 21:46:04 2010 @@ -19,7 +19,6 @@ package calculator; -import org.apache.tuscany.sca.node.Client; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; @@ -32,7 +31,7 @@ Node node = NodeFactory.newInstance().createNode((String)null, new String[] {"target/classes"}).start(); - CalculatorService calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent"); + CalculatorService calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent"); // Calculate System.out.println("3 + 2=" + calculatorService.add(3, 2));
