You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/03/13 00:50:17 UTC

svn commit: r517467 - in /incubator/tuscany/branches/sca-java-integration: sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/ sca/kernel/core/src/main/java/org/...

Author: rfeng
Date: Mon Mar 12 16:50:15 2007
New Revision: 517467

URL: http://svn.apache.org/viewvc?view=rev&rev=517467
Log:
[sca-integration-branch] Use @Autowire to access SDO HelperContext 

Modified:
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/test/SCATestCaseRunner.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java
    incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/test/java/org/apache/tuscany/sca/itest/JaxbDatabindingTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClientImpl.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceImpl.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/test/java/org/apache/tuscany/sca/itest/SdoDatabindingTestCase.java

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/ConnectorImpl.java Mon Mar 12 16:50:15 2007
@@ -141,6 +141,15 @@
             // system services do not need to have their chains processed, return
             return;
         }
+
+        // FIXME: [rfeng] The targetWire is provided by the system
+        if (targetWire.getContainer() != null && targetWire.getContainer().isSystem()) {
+            sourceWire.setOptimizable(true);
+            sourceWire.setTargetWire(targetWire);
+            // system services do not need to have their chains processed, return
+            return;
+        }
+        
         // match outbound to inbound chains
         for (OutboundInvocationChain outboundChain : sourceWire.getInvocationChains().values()) {
             Operation<?> operation = outboundChain.getOperation();

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/SystemSingletonAtomicComponent.java Mon Mar 12 16:50:15 2007
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.tuscany.core.wire.jdk.JDKWireService;
 import org.apache.tuscany.spi.ObjectCreationException;
 import org.apache.tuscany.spi.component.AtomicComponent;
 import org.apache.tuscany.spi.component.CompositeComponent;
@@ -40,8 +41,6 @@
 import org.apache.tuscany.spi.wire.TargetInvoker;
 import org.apache.tuscany.spi.wire.WireService;
 
-import org.apache.tuscany.core.wire.jdk.JDKWireService;
-
 /**
  * An {@link org.apache.tuscany.spi.component.AtomicComponent} used when registering objects directly into a composite
  *
@@ -158,4 +157,8 @@
         inboundWires.put(wire.getServiceName(), wire);
     }
 
+    @Override
+    public boolean isOptimizable() {
+        return true;
+    }    
 }

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/test/SCATestCaseRunner.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/test/SCATestCaseRunner.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/test/SCATestCaseRunner.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/main/java/org/apache/tuscany/core/test/SCATestCaseRunner.java Mon Mar 12 16:50:15 2007
@@ -25,8 +25,7 @@
 import java.net.URLClassLoader;
 
 /**
- * A helper class that can be used to run an SCA JUnit test case. The test case
- * will run in an isolated class loader.
+ * A helper class that can be used to run an SCA JUnit test case. The test case will run in an isolated class loader.
  * 
  * @version $Rev$ $Date$
  */
@@ -38,7 +37,7 @@
     private Class<?> testResultClass;
     private Class<?> testCaseClass;
     private Object testCase;
-    
+
     private Class<?> beforeAnnotation;
     private Class<?> beforeClassAnnotation;
     private Class<?> afterAnnotation;
@@ -67,7 +66,7 @@
 
                 testCaseClass = Class.forName(testClass.getName(), true, classLoader);
                 testCase = testCaseClass.newInstance();
-                
+
                 junit3TestCaseClass = Class.forName("junit.framework.TestCase", true, classLoader);
 
                 testSuiteClass = Class.forName("junit.framework.TestSuite", true, classLoader);
@@ -77,12 +76,14 @@
                 testResultClass = Class.forName("junit.framework.TestResult", true, classLoader);
 
                 try {
-	                beforeAnnotation = Class.forName("org.junit.Before", true, classLoader);
-	                afterAnnotation = Class.forName("org.junit.After", true, classLoader);
-	                beforeClassAnnotation = Class.forName("org.junit.BeforeClass", true, classLoader);
-	                afterClassAnnotation = Class.forName("org.junit.AfterClass", true, classLoader);
-	                junit4AdapterClass = Class.forName("junit.framework.JUnit4TestAdapter", true, classLoader);
+                    beforeAnnotation = Class.forName("org.junit.Before", true, classLoader);
+                    afterAnnotation = Class.forName("org.junit.After", true, classLoader);
+                    beforeClassAnnotation = Class.forName("org.junit.BeforeClass", true, classLoader);
+                    afterClassAnnotation = Class.forName("org.junit.AfterClass", true, classLoader);
+                    junit4AdapterClass = Class.forName("junit.framework.JUnit4TestAdapter", true, classLoader);
                 } catch (Exception e) {
+                    // Unexpected
+                    throw new AssertionError(e);
                 }
 
             } finally {
@@ -100,13 +101,13 @@
         ClassLoader tccl = Thread.currentThread().getContextClassLoader();
         try {
             Thread.currentThread().setContextClassLoader(classLoader);
-            
+
             if (junit3TestCaseClass.isAssignableFrom(testCaseClass)) {
                 Object testResult = testResultClass.newInstance();
                 Method runMethod = testSuiteClass.getMethod("run", testResultClass);
                 runMethod.invoke(testSuite, testResult);
             } else {
-            	Object junit4Adapter = junit4AdapterClass.getConstructor(Class.class).newInstance(testCaseClass);
+                Object junit4Adapter = junit4AdapterClass.getConstructor(Class.class).newInstance(testCaseClass);
                 Object testResult = testResultClass.newInstance();
                 Method runMethod = junit4AdapterClass.getMethod("run", testResultClass);
                 runMethod.invoke(junit4Adapter, testResult);
@@ -122,68 +123,68 @@
      * Invoke the setUp method
      */
     public void setUp() {
-    	execute("setUp");
+        execute("setUp");
     }
 
     /**
      * Invoke the before methods
      */
     public void before() {
-    	execute(beforeAnnotation);
+        execute(beforeAnnotation);
     }
 
     /**
      * Invoke the beforeClass methods
      */
     public void beforeClass() {
-    	execute(beforeClassAnnotation);
+        execute(beforeClassAnnotation);
     }
 
     /**
      * Invoke the tearDown method
      */
     public void tearDown() {
-    	execute("tearDown");
+        execute("tearDown");
     }
 
     /**
      * Invoke the after methods
      */
     public void after() {
-    	execute(afterAnnotation);
+        execute(afterAnnotation);
     }
 
     /**
      * Invoke the afterClass methods
      */
     public void afterClass() {
-    	execute(afterClassAnnotation);
+        execute(afterClassAnnotation);
     }
 
     /**
      * Invoke the specified test method.
      */
     public void run(String methodName) {
-    	execute(methodName);
+        execute(methodName);
     }
 
     /**
      * Invoke the methods annotated with the specified annotation.
      */
     private void execute(Class<?> annotationClass) {
-    	if (annotationClass == null) {
-    		throw new RuntimeException(new NoSuchMethodException());
-    	}
+        if (annotationClass == null) {
+            throw new RuntimeException(new NoSuchMethodException());
+        }
         ClassLoader tccl = Thread.currentThread().getContextClassLoader();
         try {
             Thread.currentThread().setContextClassLoader(classLoader);
-            
-            for (Method method: testCaseClass.getDeclaredMethods()) {
-            	for (Annotation annotation: method.getAnnotations()) {
-            		if (annotation.annotationType() == annotationClass) {
-            			method.invoke(testCase);
-            		}
-            	}
+
+            for (Method method : testCaseClass.getDeclaredMethods()) {
+                for (Annotation annotation : method.getAnnotations()) {
+                    if (annotation.annotationType() == annotationClass) {
+                        method.invoke(testCase);
+                    }
+                }
             }
         } catch (Exception e) {
             throw new RuntimeException(e);

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ReferenceConnectorTestCase.java Mon Mar 12 16:50:15 2007
@@ -130,6 +130,7 @@
         EasyMock.replay(component);
 
         ReferenceBinding target = EasyMock.createMock(ReferenceBinding.class);
+        EasyMock.expect(target.isSystem()).andReturn(false);
         EasyMock.expect(target.createTargetInvoker(EasyMock.isA(ServiceContract.class), EasyMock.isA(Operation.class)))
             .andReturn(new MockInvoker());
         EasyMock.replay(target);

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/ServiceConnectorTestCase.java Mon Mar 12 16:50:15 2007
@@ -122,6 +122,7 @@
         AtomicComponent atomicTarget = EasyMock.createMock(AtomicComponent.class);
         EasyMock.expect(atomicTarget.getInboundWire(EasyMock.isA(String.class))).andReturn(inboundWire).atLeastOnce();
         EasyMock.expect(atomicTarget.getScope()).andReturn(Scope.COMPOSITE);
+        EasyMock.expect(atomicTarget.isSystem()).andReturn(false);
         EasyMock.expect(atomicTarget.createTargetInvoker(EasyMock.isA(String.class),
             EasyMock.isA(Operation.class),
             EasyMock.isA(InboundWire.class))).andReturn(new MockInvoker());

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/AutowireResolutionTestCase.java Mon Mar 12 16:50:15 2007
@@ -49,6 +49,7 @@
         CompositeComponent parent = createMock(CompositeComponent.class);
         InboundWire wire = TestUtils.createInboundWire(Foo.class, parent);
         EasyMock.expect(parent.resolveAutowire(eq(Foo.class))).andReturn(wire);
+        EasyMock.expect(parent.resolveSystemAutowire(eq(Foo.class))).andReturn(null);
         replay(parent);
         CompositeComponent component = new CompositeComponentImpl("test", parent, null, null);
         assertSame(wire, component.resolveAutowire(Foo.class));
@@ -74,7 +75,7 @@
         CompositeComponent parent = new CompositeComponentImpl("parent", null, null, null);
         parent.registerJavaObject("foo", Foo.class, foo);
         CompositeComponent component = new CompositeComponentImpl("test", parent, null, null);
-        assertNull(component.resolveAutowire(Foo.class));
+        assertNotNull(component.resolveAutowire(Foo.class));
     }
 
     protected void setUp() throws Exception {

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/JavaObjectRegistrationTestCase.java Mon Mar 12 16:50:15 2007
@@ -63,7 +63,7 @@
     public void testApplicationAutowireToObject() throws Exception {
         MockComponent instance = new MockComponent();
         composite.registerJavaObject("foo", MockComponent.class, instance);
-        assertNull(composite.resolveAutowire(MockComponent.class));
+        assertNotNull(composite.resolveAutowire(MockComponent.class));
         assertNull(composite.resolveExternalAutowire(MockComponent.class));
     }
 

Modified: incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/CompositeComponentExtension.java Mon Mar 12 16:50:15 2007
@@ -278,6 +278,13 @@
                 return service.getValue();
             }
         }
+        
+        // FIXME: [rfeng] Try to lookup from system. Is it reasonable?
+        InboundWire inboundWire = resolveSystemAutowire(instanceInterface);
+        
+        if (inboundWire != null) {
+            return inboundWire;
+        }
         if (getParent() != null) {
             return getParent().resolveAutowire(instanceInterface);
         }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/test/java/org/apache/tuscany/sca/itest/JaxbDatabindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/test/java/org/apache/tuscany/sca/itest/JaxbDatabindingTestCase.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/test/java/org/apache/tuscany/sca/itest/JaxbDatabindingTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/jaxb/src/test/java/org/apache/tuscany/sca/itest/JaxbDatabindingTestCase.java Mon Mar 12 16:50:15 2007
@@ -19,36 +19,29 @@
 
 package org.apache.tuscany.sca.itest;
 
-import org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterService;
-import org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClient;
-import org.apache.tuscany.test.SCATestCase;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
+import junit.framework.Assert;
+import junit.framework.TestCase;
 
+import org.apache.tuscany.api.SCARuntime;
+import org.apache.tuscany.sca.itest.jaxbdatabinding.GreeterServiceClient;
 import org.apache.tuscany.sca.itest.jaxbdatabinding.generated.ObjectFactory;
 import org.apache.tuscany.sca.itest.jaxbdatabinding.generated.PersonType;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.osoa.sca.CompositeContext;
+import org.osoa.sca.CurrentCompositeContext;
 
 /**
  * 
  */
-public class JaxbDatabindingTestCase extends SCATestCase {
-    
-    GreeterServiceClient greeterClient;
-    private static boolean initalised = false;
-    
-    protected void setUp() throws Exception{
-        if (!initalised) {
-            setApplicationSCDL("greeterws.composite");
-            super.setUp();
-            initalised = true;
-        }
-    }
+public class JaxbDatabindingTestCase {
+    private GreeterServiceClient greeterClient;
     
-    protected void tearDown(){
-        
+    @BeforeClass
+    public static void init() {
+        SCARuntime.start("greeterws.composite");
     }
-    
+
     private void setUpClient(String binding) throws Exception {
         CompositeContext ctx = CurrentCompositeContext.getContext();
         greeterClient = ctx.locateService(GreeterServiceClient.class, binding + "JAXBGreeterServiceClient");
@@ -56,31 +49,37 @@
 
     /**
      * Invokes the JAXB Greet service using web service bindings with JAXB payload
+     * 
      * @throws Exception
      */
+    @Test
     public void testWSGreet() throws Exception {
         setUpClient("WS");
         greet();
     }
-    
+
     /**
      * Invokes the JAXB Greet service using default with JAXB payload
+     * 
      * @throws Exception
      */
+    @Test
     public void testDefaultGreet() throws Exception {
         setUpClient("Default");
         greet();
     }
-    
+
     public void greet() {
         ObjectFactory factory = new ObjectFactory();
         PersonType person = factory.createPersonType();
         person.setFirstName("George");
         person.setLastName("Doors");
-        //System.out.println("Client side: " + person.getFirstName() + " " + person.getLastName() + " " + person.getGreeting());
+        // System.out.println("Client side: " + person.getFirstName() + " " + person.getLastName() + " " +
+        // person.getGreeting());
         PersonType greetedPerson = greeterClient.greet(person);
-        //System.out.println("Client side: " + greetedPerson.getFirstName() + " " + greetedPerson.getLastName() + " " + greetedPerson.getGreeting());
-        assertNotSame("greetedPerson.getGreeting() not set","", greetedPerson.getGreeting());
+        // System.out.println("Client side: " + greetedPerson.getFirstName() + " " + greetedPerson.getLastName() + " " +
+        // greetedPerson.getGreeting());
+        Assert.assertNotSame("greetedPerson.getGreeting() not set", "", greetedPerson.getGreeting());
     }
-    
+
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClientImpl.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClientImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceClientImpl.java Mon Mar 12 16:50:15 2007
@@ -28,7 +28,6 @@
  */
 @Service(GreeterServiceClient.class)
 public class GreeterServiceClientImpl implements GreeterServiceClient {
-
     private GreeterService service;
 
     @Reference

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceImpl.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/main/java/org/apache/tuscany/sca/itest/sdodatabinding/GreeterServiceImpl.java Mon Mar 12 16:50:15 2007
@@ -20,24 +20,33 @@
 package org.apache.tuscany.sca.itest.sdodatabinding;
 
 import org.apache.tuscany.sca.itest.databinding.types.PersonType;
+import org.apache.tuscany.spi.annotation.Autowire;
 import org.osoa.sca.annotations.Service;
 
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+
 /**
  * 
  */
 @Service(GreeterService.class)
 public class GreeterServiceImpl implements GreeterService {
-
+    /**
+     * It will be injected with a HelperContext for the composite
+     */
+    @Autowire
+    protected HelperContext helperContext;
     /*
      * (non-Javadoc)
      * 
      * @see org.apache.tuscany.sca.itest.sdodatabinding.GreeterService#greet(org.apache.tuscany.sca.itest.sdodatabinding.generated.PersonType)
      */
     public PersonType greet(PersonType who) {
+        System.out.println(helperContext.getXMLHelper().save((DataObject) who, "http://person/", "person"));
+        PersonType copy = (PersonType) helperContext.getCopyHelper().copy((DataObject) who);
+        copy.setGreeting("Hello");
         System.out.println(who.toString());
-        who.setGreeting("Hello");
-        System.out.println(who.toString());
-        return who;
+        return copy;
     }
 
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/test/java/org/apache/tuscany/sca/itest/SdoDatabindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/test/java/org/apache/tuscany/sca/itest/SdoDatabindingTestCase.java?view=diff&rev=517467&r1=517466&r2=517467
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/test/java/org/apache/tuscany/sca/itest/SdoDatabindingTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/sdo/src/test/java/org/apache/tuscany/sca/itest/SdoDatabindingTestCase.java Mon Mar 12 16:50:15 2007
@@ -19,25 +19,26 @@
 
 package org.apache.tuscany.sca.itest;
 
+import junit.framework.TestCase;
+
+import org.apache.tuscany.api.SCARuntime;
 import org.apache.tuscany.sca.itest.databinding.types.PersonType;
 import org.apache.tuscany.sca.itest.databinding.types.TypesFactory;
 import org.apache.tuscany.sca.itest.sdodatabinding.GreeterServiceClient;
-import org.apache.tuscany.test.SCATestCase;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 
 /**
  * 
  */
-public class SdoDatabindingTestCase extends SCATestCase {
+public class SdoDatabindingTestCase extends TestCase {
 
     GreeterServiceClient greeterClient;
     private static boolean initalised = false;
 
     protected void setUp() throws Exception {
         if (!initalised) {
-            setApplicationSCDL("greetersdo.composite");
-            super.setUp();
+            SCARuntime.start("greetersdo.composite");
             initalised = true;
         }
     }



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