You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/04/07 09:09:58 UTC

svn commit: r392204 - in /incubator/tuscany/java/sca: containers/container.java/src/main/java/org/apache/tuscany/container/java/context/ containers/container.java/src/test/java/org/apache/tuscany/container/java/context/ containers/container.js/src/main...

Author: jmarino
Date: Fri Apr  7 00:09:55 2006
New Revision: 392204

URL: http://svn.apache.org/viewcvs?rev=392204&view=rev
Log:
cleanup of AtomicContext API - rename getImplementationInstance

Modified:
    incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java
    incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java
    incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java
    incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java
    incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/rhino/RhinoTargetInvoker.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
    incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java
    incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java

Modified: incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java?rev=392204&r1=392203&r2=392204&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java Fri Apr  7 00:09:55 2006
@@ -118,7 +118,7 @@
 
     }
 
-    public Object getImplementationInstance() throws TargetException {
+    public Object getTargetInstance() throws TargetException {
         //TODO refactor when getInstance() returns a proxy
         return getInstance(null);
     }

Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java?rev=392204&r1=392203&r2=392204&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/DifferentInterfaceWireTestCase.java Fri Apr  7 00:09:55 2006
@@ -49,9 +49,9 @@
         context.start();
         context.registerModelObject(MockFactory.createModuleWithWiredComponentsOfDifferentInterface(Scope.MODULE, Scope.MODULE));
         context.fireEvent(EventContext.MODULE_START, null);
-        Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance();
+        Source source = (Source) ((AtomicContext) context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
-        OtherTarget target = (OtherTarget) ((AtomicContext)context.getContext("target")).getImplementationInstance();
+        OtherTarget target = (OtherTarget) ((AtomicContext)context.getContext("target")).getTargetInstance();
         Assert.assertNotNull(target);
         // test setter injection
         List<Target> targets = source.getTargets();

Modified: incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java?rev=392204&r1=392203&r2=392204&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.java/src/test/java/org/apache/tuscany/container/java/context/MultiplicityTestCase.java Fri Apr  7 00:09:55 2006
@@ -47,9 +47,9 @@
         context.start();
         context.registerModelObject(MockFactory.createModuleWithWiredComponents(Scope.MODULE, Scope.MODULE));
         context.fireEvent(EventContext.MODULE_START, null);
-        Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance();
+        Source source = (Source) ((AtomicContext) context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
-        Target target = (Target) ((AtomicContext)context.getContext("target")).getImplementationInstance();
+        Target target = (Target) ((AtomicContext)context.getContext("target")).getTargetInstance();
         Assert.assertNotNull(target);
         // test setter injection
         List<Target> targets = source.getTargets();

Modified: incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java?rev=392204&r1=392203&r2=392204&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java (original)
+++ incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/context/JavaScriptComponentContext.java Fri Apr  7 00:09:55 2006
@@ -89,7 +89,7 @@
         }
     }
 
-    public Object getImplementationInstance() throws TargetException {
+    public Object getTargetInstance() throws TargetException {
         rhinoInvoker.updateScriptScope(createServiceReferences()); // create references
         rhinoInvoker.updateScriptScope(properties); // create prop values
         return rhinoInvoker;

Modified: incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/rhino/RhinoTargetInvoker.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/rhino/RhinoTargetInvoker.java?rev=392204&r1=392203&r2=392204&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/rhino/RhinoTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/containers/container.js/src/main/java/org/apache/tuscany/container/js/rhino/RhinoTargetInvoker.java Fri Apr  7 00:09:55 2006
@@ -54,11 +54,11 @@
         RhinoScript rhinoScript;
         if (cacheable) {
             if (target == null) {
-                target = (RhinoScript) ((AtomicContext)container.getContext(serviceName)).getImplementationInstance();
+                target = (RhinoScript) ((AtomicContext)container.getContext(serviceName)).getTargetInstance();
             }
             rhinoScript = target;
         } else {
-            rhinoScript = (RhinoScript) ((AtomicContext)container.getContext(serviceName)).getImplementationInstance();
+            rhinoScript = (RhinoScript) ((AtomicContext)container.getContext(serviceName)).getTargetInstance();
         }
         return rhinoScript;
     }

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java?rev=392204&r1=392203&r2=392204&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/AtomicContext.java Fri Apr  7 00:09:55 2006
@@ -17,7 +17,7 @@
 package org.apache.tuscany.core.context;
 
 /**
- * A runtime entity that manages an atomic (i.e. leaf-type) instance.
+ * A runtime entity that manages an atomic (i.e. leaf-type) artifact.
  * 
  * @version $Rev$ $Date$
  */
@@ -40,10 +40,10 @@
     public boolean isDestroyable();
 
     /**
-     * Returns the implementation instance associated with the context. An implementation instance is the actual
+     * Returns the target instance associated with the context. A target instance is the actual
      * object a request is dispatched to sans proxy invocation chain.
      * @throws TargetException
      */
-    public Object getImplementationInstance() throws TargetException;
+    public Object getTargetInstance() throws TargetException;
 
 }

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java?rev=392204&r1=392203&r2=392204&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/Context.java Fri Apr  7 00:09:55 2006
@@ -96,7 +96,7 @@
 
 
         /**
-         * Returns the instance associated with the requested name, which may be in a simple or compound form. Atomic (i.e.
+         * Returns the instance associated with the requested name, which may be in a atomic or composite form. Atomic (i.e.
          * leaf) contexts will return an instance associated with the service name part of the compound name, which may be
          * null.
          * <p>
@@ -113,6 +113,6 @@
          * @see org.apache.tuscany.core.context.CompositeContext
          * @see org.apache.tuscany.model.assembly.EntryPoint
          */
-        Object getInstance(QualifiedName qName) throws TargetException;
+        public Object getInstance(QualifiedName qName) throws TargetException;
 
 }

Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java?rev=392204&r1=392203&r2=392204&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java Fri Apr  7 00:09:55 2006
@@ -123,7 +123,7 @@
 
     }
 
-    public Object getImplementationInstance() throws TargetException {
+    public Object getTargetInstance() throws TargetException {
         return getInstance(null);
     }
 

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java?rev=392204&r1=392203&r2=392204&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/integration/IntraCompositeWireIntegrationTestCase.java Fri Apr  7 00:09:55 2006
@@ -50,13 +50,13 @@
         CompositeContext context = (CompositeContext) runtime.getSystemContext().getContext("test.system");
         context.fireEvent(EventContext.MODULE_START, null);
         //context.registerModelObject(module);
-        Source source = (Source) ((AtomicContext)context.getContext("source")).getImplementationInstance();
+        Source source = (Source) ((AtomicContext)context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
         Target targetRef = source.getTarget();
         Assert.assertNotNull(targetRef);
-        Target target = (Target) ((AtomicContext)context.getContext("target")).getImplementationInstance();
+        Target target = (Target) ((AtomicContext)context.getContext("target")).getTargetInstance();
         Assert.assertSame(target, targetRef);
-        Source source2 = (Source) ((AtomicContext)context.getContext("source")).getImplementationInstance();
+        Source source2 = (Source) ((AtomicContext)context.getContext("source")).getTargetInstance();
         Assert.assertSame(target, source2.getTarget());
         context.fireEvent(EventContext.MODULE_STOP, null);
         context.stop();
@@ -91,13 +91,13 @@
 
         context.fireEvent(EventContext.MODULE_START, null);
         context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.MODULE,Scope.MODULE));
-        Source source = (Source) ((AtomicContext)context.getContext("source")).getImplementationInstance();
+        Source source = (Source) ((AtomicContext)context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
         Target targetRef = source.getTarget();
         Assert.assertNotNull(targetRef);
-        Target target = (Target) ((AtomicContext)context.getContext("target")).getImplementationInstance();
+        Target target = (Target) ((AtomicContext)context.getContext("target")).getTargetInstance();
         Assert.assertSame(target, targetRef);
-        Source source2 = (Source) ((AtomicContext)context.getContext("source")).getImplementationInstance();
+        Source source2 = (Source) ((AtomicContext)context.getContext("source")).getTargetInstance();
         Assert.assertSame(target, source2.getTarget());
         context.fireEvent(EventContext.MODULE_STOP, null);
         context.stop();

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java?rev=392204&r1=392203&r2=392204&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraCompositeWireTestCase.java Fri Apr  7 00:09:55 2006
@@ -38,11 +38,11 @@
         context.start();
         context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.MODULE, Scope.MODULE));
         context.fireEvent(EventContext.MODULE_START, null);
-        Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance();
+        Source source = (Source) ((AtomicContext) context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
         Target targetRef = source.getTarget();
         Assert.assertNotNull(targetRef);
-        Target target = (Target) ((AtomicContext) context.getContext("target")).getImplementationInstance();
+        Target target = (Target) ((AtomicContext) context.getContext("target")).getTargetInstance();
         Assert.assertSame(target, targetRef);
         Assert.assertSame(target, source.getTarget());
         context.fireEvent(EventContext.MODULE_STOP, null);
@@ -54,12 +54,12 @@
         context.start();
         context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.INSTANCE, Scope.MODULE));
         context.fireEvent(EventContext.MODULE_START, null);
-        Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance();
+        Source source = (Source) ((AtomicContext) context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
         Target targetRef = source.getTarget();
         Assert.assertNotNull(targetRef);
-        source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance();
-        Target target = (Target) ((AtomicContext) context.getContext("target")).getImplementationInstance();
+        source = (Source) ((AtomicContext) context.getContext("source")).getTargetInstance();
+        Target target = (Target) ((AtomicContext) context.getContext("target")).getTargetInstance();
         Assert.assertSame(target, targetRef);
         Assert.assertSame(target, source.getTarget());
         context.fireEvent(EventContext.MODULE_STOP, null);
@@ -71,13 +71,13 @@
         context.start();
         context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.MODULE, Scope.INSTANCE));
         context.fireEvent(EventContext.MODULE_START, null);
-        Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance();
+        Source source = (Source) ((AtomicContext) context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
         Target targetRef = source.getTarget();
         Assert.assertNotNull(targetRef);
-        Target target = (Target) ((AtomicContext) context.getContext("target")).getImplementationInstance();
+        Target target = (Target) ((AtomicContext) context.getContext("target")).getTargetInstance();
         Assert.assertNotSame(target, targetRef);
-        Source source2 = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance();
+        Source source2 = (Source) ((AtomicContext) context.getContext("source")).getTargetInstance();
         // should be the same since the module scope component was alreadyy created and the stateless
         // component will be "attached" to it
         Assert.assertSame(source.getTarget(), source2.getTarget());
@@ -90,9 +90,9 @@
         context.start();
         context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents("system.module",Scope.MODULE, Scope.MODULE));
         context.fireEvent(EventContext.MODULE_START, null);
-        Source source = (Source) ((AtomicContext) context.getContext("source")).getImplementationInstance();
+        Source source = (Source) ((AtomicContext) context.getContext("source")).getTargetInstance();
         Assert.assertNotNull(source);
-        Target target = (Target) ((AtomicContext) context.getContext("target")).getImplementationInstance();
+        Target target = (Target) ((AtomicContext) context.getContext("target")).getTargetInstance();
         Assert.assertNotNull(target);
         // test setter injection
         List<Target> targets = source.getTargets();