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/05/15 20:17:27 UTC

svn commit: r538270 - in /incubator/tuscany/java/sca/modules: core-spi/src/main/java/org/apache/tuscany/sca/core/ core-spi/src/main/java/org/apache/tuscany/sca/factory/ core-spi/src/main/java/org/apache/tuscany/sca/provider/ core-spi/src/main/java/org/...

Author: rfeng
Date: Tue May 15 11:17:26 2007
New Revision: 538270

URL: http://svn.apache.org/viewvc?view=rev&rev=538270
Log: (empty)

Added:
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/factory/
      - copied from r538237, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/factory/
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/
      - copied from r538237, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java
      - copied, changed from r538237, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ScopedImplementationProvider.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java   (with props)
    incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/factory/
      - copied from r538237, incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/sca/factory/
    incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/scope/
      - copied from r538237, incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/sca/scope/
Removed:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/factory/
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ScopedImplementationProvider.java
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/sca/factory/
    incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/sca/scope/
Modified:
    incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeComponent.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
    incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
    incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
    incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
    incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java

Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeComponent.java?view=diff&rev=538270&r1=538269&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeComponent.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeComponent.java Tue May 15 11:17:26 2007
@@ -21,7 +21,6 @@
 
 import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.scope.ScopeContainer;
 import org.osoa.sca.ComponentContext;
 
 /**
@@ -40,15 +39,4 @@
      * @return
      */
     ImplementationProvider getImplementationProvider();
-    
-    /**
-     * Set the associated scope container
-     * @param scopeContainer
-     */
-    void setScopeContainer(ScopeContainer scopeContainer);
-    /**
-     * Get the assoicated scope container
-     * @return
-     */
-    ScopeContainer getScopeContainer();
 }

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java?view=diff&rev=538270&r1=538269&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java Tue May 15 11:17:26 2007
@@ -51,6 +51,7 @@
 import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
 import org.apache.tuscany.sca.provider.ServiceBindingProvider;
 import org.apache.tuscany.sca.scope.ScopeRegistry;
+import org.apache.tuscany.sca.scope.ScopedRuntimeComponent;
 import org.apache.tuscany.sca.work.WorkScheduler;
 
 /**
@@ -178,8 +179,8 @@
                 }
             }
 
-            if (component instanceof RuntimeComponent) {
-                RuntimeComponent runtimeComponent = (RuntimeComponent)component;
+            if (component instanceof ScopedRuntimeComponent) {
+                ScopedRuntimeComponent runtimeComponent = (ScopedRuntimeComponent)component;
                 if (runtimeComponent.getScopeContainer() != null) {
                     runtimeComponent.getScopeContainer().start();
                 }
@@ -217,8 +218,8 @@
                 }
             }
 
-            if (component instanceof RuntimeComponent) {
-                RuntimeComponent runtimeComponent = (RuntimeComponent)component;
+            if (component instanceof ScopedRuntimeComponent) {
+                ScopedRuntimeComponent runtimeComponent = (ScopedRuntimeComponent)component;
                 if (runtimeComponent.getScopeContainer() != null) {
                     runtimeComponent.getScopeContainer().stop();
                 }
@@ -522,10 +523,10 @@
     }
 
     private void setScopeContainer(Component component) {
-        if (!(component instanceof RuntimeComponent)) {
+        if (!(component instanceof ScopedRuntimeComponent)) {
             return;
         }
-        RuntimeComponent runtimeComponent = (RuntimeComponent)component;
+        ScopedRuntimeComponent runtimeComponent = (ScopedRuntimeComponent)component;
         runtimeComponent.setScopeContainer(scopeRegistry.getScopeContainer(runtimeComponent));
     }    
     

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java?view=diff&rev=538270&r1=538269&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java Tue May 15 11:17:26 2007
@@ -32,6 +32,7 @@
 import org.apache.tuscany.sca.core.invocation.WireObjectFactory;
 import org.apache.tuscany.sca.provider.ImplementationProvider;
 import org.apache.tuscany.sca.scope.ScopeContainer;
+import org.apache.tuscany.sca.scope.ScopedRuntimeComponent;
 import org.osoa.sca.CallableReference;
 import org.osoa.sca.RequestContext;
 import org.osoa.sca.ServiceReference;
@@ -39,7 +40,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class RuntimeComponentImpl extends ComponentImpl implements RuntimeComponent {
+public class RuntimeComponentImpl extends ComponentImpl implements RuntimeComponent, ScopedRuntimeComponent {
     public static final String SELF_REFERENCE_PREFIX = "$self$.";
     protected ImplementationProvider implementationProvider;
     protected ProxyFactory proxyService;

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java?view=diff&rev=538270&r1=538269&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java Tue May 15 11:17:26 2007
@@ -24,12 +24,12 @@
 import org.apache.tuscany.sca.core.RuntimeComponent;
 import org.apache.tuscany.sca.event.Event;
 import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ScopedImplementationProvider;
 import org.apache.tuscany.sca.scope.AbstractLifecycle;
 import org.apache.tuscany.sca.scope.InstanceWrapper;
 import org.apache.tuscany.sca.scope.PersistenceException;
 import org.apache.tuscany.sca.scope.Scope;
 import org.apache.tuscany.sca.scope.ScopeContainer;
+import org.apache.tuscany.sca.scope.ScopedImplementationProvider;
 import org.apache.tuscany.sca.scope.TargetDestructionException;
 import org.apache.tuscany.sca.scope.TargetResolutionException;
 

Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java?view=diff&rev=538270&r1=538269&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java Tue May 15 11:17:26 2007
@@ -23,11 +23,12 @@
 
 import org.apache.tuscany.sca.core.RuntimeComponent;
 import org.apache.tuscany.sca.provider.ImplementationProvider;
-import org.apache.tuscany.sca.provider.ScopedImplementationProvider;
 import org.apache.tuscany.sca.scope.Scope;
 import org.apache.tuscany.sca.scope.ScopeContainer;
 import org.apache.tuscany.sca.scope.ScopeContainerFactory;
 import org.apache.tuscany.sca.scope.ScopeRegistry;
+import org.apache.tuscany.sca.scope.ScopedImplementationProvider;
+import org.apache.tuscany.sca.scope.ScopedRuntimeComponent;
 
 /**
  * The default implementation of a scope registry
@@ -41,7 +42,11 @@
         scopeCache.put(factory.getScope(), factory);
     }
 
-    public ScopeContainer getScopeContainer(RuntimeComponent component) {
+    public ScopeContainer getScopeContainer(RuntimeComponent runtimeComponent) {
+        if (!(runtimeComponent instanceof ScopedRuntimeComponent)) {
+            return null;
+        }
+        ScopedRuntimeComponent component = (ScopedRuntimeComponent)runtimeComponent;
         if (component.getScopeContainer() != null) {
             return component.getScopeContainer();
         }

Copied: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java (from r538237, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ScopedImplementationProvider.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java?view=diff&rev=538270&p1=incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ScopedImplementationProvider.java&r1=538237&p2=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ScopedImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java Tue May 15 11:17:26 2007
@@ -17,10 +17,9 @@
  * under the License.    
  */
 
-package org.apache.tuscany.sca.provider;
+package org.apache.tuscany.sca.scope;
 
-import org.apache.tuscany.sca.scope.InstanceWrapper;
-import org.apache.tuscany.sca.scope.Scope;
+import org.apache.tuscany.sca.provider.ImplementationProvider;
 
 /**
  * A component implementation can implement this interface to provide scope

Added: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java?view=auto&rev=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java (added)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java Tue May 15 11:17:26 2007
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.scope;
+
+import org.apache.tuscany.sca.core.RuntimeComponent;
+
+/**
+ * Scoped runtime component
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface ScopedRuntimeComponent extends RuntimeComponent {
+    /**
+     * Set the associated scope container
+     * @param scopeContainer
+     */
+    void setScopeContainer(ScopeContainer scopeContainer);
+    /**
+     * Get the assoicated scope container
+     * @return
+     */
+    ScopeContainer getScopeContainer();
+}

Propchange: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java?view=diff&rev=538270&r1=538269&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java Tue May 15 11:17:26 2007
@@ -24,9 +24,9 @@
 
 import org.apache.tuscany.sca.assembly.Implementation;
 import org.apache.tuscany.sca.core.RuntimeComponent;
-import org.apache.tuscany.sca.provider.ScopedImplementationProvider;
 import org.apache.tuscany.sca.scope.InstanceWrapper;
 import org.apache.tuscany.sca.scope.ScopeContainer;
+import org.apache.tuscany.sca.scope.ScopedImplementationProvider;
 import org.easymock.EasyMock;
 import org.easymock.IMocksControl;
 

Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java?view=diff&rev=538270&r1=538269&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java Tue May 15 11:17:26 2007
@@ -21,11 +21,8 @@
 import java.beans.Introspector;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.net.URI;
 
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.factory.ObjectCreationException;
-import org.apache.tuscany.sca.factory.ObjectFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
 import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;
@@ -95,6 +92,7 @@
         }
     }
 
+    /*
     private class HelperContextFactory implements ObjectFactory<HelperContext> {
         private URI id;
 
@@ -108,4 +106,5 @@
         }
 
     }
+    */
 }

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java?view=diff&rev=538270&r1=538269&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java Tue May 15 11:17:26 2007
@@ -65,6 +65,7 @@
 import org.apache.tuscany.sca.scope.InstanceWrapper;
 import org.apache.tuscany.sca.scope.PersistenceException;
 import org.apache.tuscany.sca.scope.Scope;
+import org.apache.tuscany.sca.scope.ScopedRuntimeComponent;
 import org.apache.tuscany.sca.scope.TargetDestructionException;
 import org.apache.tuscany.sca.scope.TargetInvokerCreationException;
 import org.osoa.sca.CallableReference;
@@ -373,7 +374,7 @@
     }
 
     public void removeInstance() throws PersistenceException {
-        component.getScopeContainer().remove();
+        ((ScopedRuntimeComponent) component).getScopeContainer().remove();
     }
 
     public URI getUri() {

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java?view=diff&rev=538270&r1=538269&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java Tue May 15 11:17:26 2007
@@ -35,9 +35,9 @@
 import org.apache.tuscany.sca.implementation.java.injection.ResourceObjectFactory;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ScopedImplementationProvider;
 import org.apache.tuscany.sca.scope.InstanceWrapper;
 import org.apache.tuscany.sca.scope.Scope;
+import org.apache.tuscany.sca.scope.ScopedImplementationProvider;
 import org.apache.tuscany.sca.scope.TargetInvokerCreationException;
 import org.osoa.sca.ComponentContext;
 

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java?view=diff&rev=538270&r1=538269&r2=538270
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java Tue May 15 11:17:26 2007
@@ -31,6 +31,7 @@
 import org.apache.tuscany.sca.scope.InstanceWrapper;
 import org.apache.tuscany.sca.scope.Scope;
 import org.apache.tuscany.sca.scope.ScopeContainer;
+import org.apache.tuscany.sca.scope.ScopedRuntimeComponent;
 import org.apache.tuscany.sca.scope.TargetResolutionException;
 
 /**
@@ -52,7 +53,7 @@
         assert operation != null : "Operation method cannot be null";
         this.operation = operation;
         this.component = component;
-        this.scopeContainer = component.getScopeContainer();
+        this.scopeContainer = ((ScopedRuntimeComponent) component).getScopeContainer();
         stateless = Scope.STATELESS == this.scopeContainer.getScope();
     }
 



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


Re: svn commit: r538270 - in /incubator/tuscany/java/sca/modules: core-spi/src/main/java/org/apache/tuscany/sca/core/ core-spi/src/main/java/org/apache/tuscany/sca/factory/ core-spi/src/main/java/org/apache/tuscany/sca/provider/ core-spi/src/main/java/org/

Posted by Raymond Feng <en...@gmail.com>.
Hi,

I clicked the commit button too quickly. This moved o.a.t.s.scope and 
o.a.t.s.factory packages from core-spi to core.

Thanks,
Raymond

----- Original Message ----- 
From: <rf...@apache.org>
To: <tu...@ws.apache.org>
Sent: Tuesday, May 15, 2007 11:17 AM
Subject: svn commit: r538270 - in /incubator/tuscany/java/sca/modules: 
core-spi/src/main/java/org/apache/tuscany/sca/core/ 
core-spi/src/main/java/org/apache/tuscany/sca/factory/ 
core-spi/src/main/java/org/apache/tuscany/sca/provider/ 
core-spi/src/main/java/org/...


> Author: rfeng
> Date: Tue May 15 11:17:26 2007
> New Revision: 538270
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=538270
> Log: (empty)
>
> Added:
> 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/factory/
>      - copied from r538237, 
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/factory/
> 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/
>      - copied from r538237, 
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/
> 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java
>      - copied, changed from r538237, 
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ScopedImplementationProvider.java
> 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java 
> (with props)
> 
> incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/factory/
>      - copied from r538237, 
> incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/sca/factory/
> 
> incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/scope/
>      - copied from r538237, 
> incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/sca/scope/
> Removed:
> 
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/factory/
> 
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ScopedImplementationProvider.java
> 
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/scope/
> 
> incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/sca/factory/
> 
> incubator/tuscany/java/sca/modules/core-spi/src/test/java/org/apache/tuscany/sca/scope/
> Modified:
> 
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeComponent.java
> 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java
> 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java
> 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
> 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
> 
> incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
> 
> incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java
> 
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
> 
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
> 
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java
>
> Modified: 
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeComponent.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeComponent.java?view=diff&rev=538270&r1=538269&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeComponent.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/RuntimeComponent.java 
> Tue May 15 11:17:26 2007
> @@ -21,7 +21,6 @@
>
> import org.apache.tuscany.sca.assembly.Component;
> import org.apache.tuscany.sca.provider.ImplementationProvider;
> -import org.apache.tuscany.sca.scope.ScopeContainer;
> import org.osoa.sca.ComponentContext;
>
> /**
> @@ -40,15 +39,4 @@
>      * @return
>      */
>     ImplementationProvider getImplementationProvider();
> -
> -    /**
> -     * Set the associated scope container
> -     * @param scopeContainer
> -     */
> -    void setScopeContainer(ScopeContainer scopeContainer);
> -    /**
> -     * Get the assoicated scope container
> -     * @return
> -     */
> -    ScopeContainer getScopeContainer();
> }
>
> Modified: 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java?view=diff&rev=538270&r1=538269&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/DefaultCompositeActivator.java 
> Tue May 15 11:17:26 2007
> @@ -51,6 +51,7 @@
> import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
> import org.apache.tuscany.sca.provider.ServiceBindingProvider;
> import org.apache.tuscany.sca.scope.ScopeRegistry;
> +import org.apache.tuscany.sca.scope.ScopedRuntimeComponent;
> import org.apache.tuscany.sca.work.WorkScheduler;
>
> /**
> @@ -178,8 +179,8 @@
>                 }
>             }
>
> -            if (component instanceof RuntimeComponent) {
> -                RuntimeComponent runtimeComponent = 
> (RuntimeComponent)component;
> +            if (component instanceof ScopedRuntimeComponent) {
> +                ScopedRuntimeComponent runtimeComponent = 
> (ScopedRuntimeComponent)component;
>                 if (runtimeComponent.getScopeContainer() != null) {
>                     runtimeComponent.getScopeContainer().start();
>                 }
> @@ -217,8 +218,8 @@
>                 }
>             }
>
> -            if (component instanceof RuntimeComponent) {
> -                RuntimeComponent runtimeComponent = 
> (RuntimeComponent)component;
> +            if (component instanceof ScopedRuntimeComponent) {
> +                ScopedRuntimeComponent runtimeComponent = 
> (ScopedRuntimeComponent)component;
>                 if (runtimeComponent.getScopeContainer() != null) {
>                     runtimeComponent.getScopeContainer().stop();
>                 }
> @@ -522,10 +523,10 @@
>     }
>
>     private void setScopeContainer(Component component) {
> -        if (!(component instanceof RuntimeComponent)) {
> +        if (!(component instanceof ScopedRuntimeComponent)) {
>             return;
>         }
> -        RuntimeComponent runtimeComponent = (RuntimeComponent)component;
> +        ScopedRuntimeComponent runtimeComponent = 
> (ScopedRuntimeComponent)component;
> 
> runtimeComponent.setScopeContainer(scopeRegistry.getScopeContainer(runtimeComponent));
>     }
>
>
> Modified: 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java?view=diff&rev=538270&r1=538269&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java 
> Tue May 15 11:17:26 2007
> @@ -32,6 +32,7 @@
> import org.apache.tuscany.sca.core.invocation.WireObjectFactory;
> import org.apache.tuscany.sca.provider.ImplementationProvider;
> import org.apache.tuscany.sca.scope.ScopeContainer;
> +import org.apache.tuscany.sca.scope.ScopedRuntimeComponent;
> import org.osoa.sca.CallableReference;
> import org.osoa.sca.RequestContext;
> import org.osoa.sca.ServiceReference;
> @@ -39,7 +40,7 @@
> /**
>  * @version $Rev$ $Date$
>  */
> -public class RuntimeComponentImpl extends ComponentImpl implements 
> RuntimeComponent {
> +public class RuntimeComponentImpl extends ComponentImpl implements 
> RuntimeComponent, ScopedRuntimeComponent {
>     public static final String SELF_REFERENCE_PREFIX = "$self$.";
>     protected ImplementationProvider implementationProvider;
>     protected ProxyFactory proxyService;
>
> Modified: 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java?view=diff&rev=538270&r1=538269&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java 
> Tue May 15 11:17:26 2007
> @@ -24,12 +24,12 @@
> import org.apache.tuscany.sca.core.RuntimeComponent;
> import org.apache.tuscany.sca.event.Event;
> import org.apache.tuscany.sca.provider.ImplementationProvider;
> -import org.apache.tuscany.sca.provider.ScopedImplementationProvider;
> import org.apache.tuscany.sca.scope.AbstractLifecycle;
> import org.apache.tuscany.sca.scope.InstanceWrapper;
> import org.apache.tuscany.sca.scope.PersistenceException;
> import org.apache.tuscany.sca.scope.Scope;
> import org.apache.tuscany.sca.scope.ScopeContainer;
> +import org.apache.tuscany.sca.scope.ScopedImplementationProvider;
> import org.apache.tuscany.sca.scope.TargetDestructionException;
> import org.apache.tuscany.sca.scope.TargetResolutionException;
>
>
> Modified: 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java?view=diff&rev=538270&r1=538269&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java 
> Tue May 15 11:17:26 2007
> @@ -23,11 +23,12 @@
>
> import org.apache.tuscany.sca.core.RuntimeComponent;
> import org.apache.tuscany.sca.provider.ImplementationProvider;
> -import org.apache.tuscany.sca.provider.ScopedImplementationProvider;
> import org.apache.tuscany.sca.scope.Scope;
> import org.apache.tuscany.sca.scope.ScopeContainer;
> import org.apache.tuscany.sca.scope.ScopeContainerFactory;
> import org.apache.tuscany.sca.scope.ScopeRegistry;
> +import org.apache.tuscany.sca.scope.ScopedImplementationProvider;
> +import org.apache.tuscany.sca.scope.ScopedRuntimeComponent;
>
> /**
>  * The default implementation of a scope registry
> @@ -41,7 +42,11 @@
>         scopeCache.put(factory.getScope(), factory);
>     }
>
> -    public ScopeContainer getScopeContainer(RuntimeComponent component) {
> +    public ScopeContainer getScopeContainer(RuntimeComponent 
> runtimeComponent) {
> +        if (!(runtimeComponent instanceof ScopedRuntimeComponent)) {
> +            return null;
> +        }
> +        ScopedRuntimeComponent component = 
> (ScopedRuntimeComponent)runtimeComponent;
>         if (component.getScopeContainer() != null) {
>             return component.getScopeContainer();
>         }
>
> Copied: 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java 
> (from r538237, 
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ScopedImplementationProvider.java)
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java?view=diff&rev=538270&p1=incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ScopedImplementationProvider.java&r1=538237&p2=incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ScopedImplementationProvider.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java 
> Tue May 15 11:17:26 2007
> @@ -17,10 +17,9 @@
>  * under the License.
>  */
>
> -package org.apache.tuscany.sca.provider;
> +package org.apache.tuscany.sca.scope;
>
> -import org.apache.tuscany.sca.scope.InstanceWrapper;
> -import org.apache.tuscany.sca.scope.Scope;
> +import org.apache.tuscany.sca.provider.ImplementationProvider;
>
> /**
>  * A component implementation can implement this interface to provide 
> scope
>
> Added: 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java?view=auto&rev=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java 
> (added)
> +++ 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java 
> Tue May 15 11:17:26 2007
> @@ -0,0 +1,40 @@
> +/*
> + * Licensed to the Apache Software Foundation (ASF) under one
> + * or more contributor license agreements.  See the NOTICE file
> + * distributed with this work for additional information
> + * regarding copyright ownership.  The ASF licenses this file
> + * to you under the Apache License, Version 2.0 (the
> + * "License"); you may not use this file except in compliance
> + * with the License.  You may obtain a copy of the License at
> + *
> + *   http://www.apache.org/licenses/LICENSE-2.0
> + *
> + * Unless required by applicable law or agreed to in writing,
> + * software distributed under the License is distributed on an
> + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> + * KIND, either express or implied.  See the License for the
> + * specific language governing permissions and limitations
> + * under the License.
> + */
> +
> +package org.apache.tuscany.sca.scope;
> +
> +import org.apache.tuscany.sca.core.RuntimeComponent;
> +
> +/**
> + * Scoped runtime component
> + *
> + * @version $Rev$ $Date$
> + */
> +public interface ScopedRuntimeComponent extends RuntimeComponent {
> +    /**
> +     * Set the associated scope container
> +     * @param scopeContainer
> +     */
> +    void setScopeContainer(ScopeContainer scopeContainer);
> +    /**
> +     * Get the assoicated scope container
> +     * @return
> +     */
> +    ScopeContainer getScopeContainer();
> +}
>
> Propchange: 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
> ------------------------------------------------------------------------------
>    svn:eol-style = native
>
> Propchange: 
> incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
> ------------------------------------------------------------------------------
>    svn:keywords = Rev Date
>
> Modified: 
> incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java?view=diff&rev=538270&r1=538269&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java 
> Tue May 15 11:17:26 2007
> @@ -24,9 +24,9 @@
>
> import org.apache.tuscany.sca.assembly.Implementation;
> import org.apache.tuscany.sca.core.RuntimeComponent;
> -import org.apache.tuscany.sca.provider.ScopedImplementationProvider;
> import org.apache.tuscany.sca.scope.InstanceWrapper;
> import org.apache.tuscany.sca.scope.ScopeContainer;
> +import org.apache.tuscany.sca.scope.ScopedImplementationProvider;
> import org.easymock.EasyMock;
> import org.easymock.IMocksControl;
>
>
> Modified: 
> incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java?view=diff&rev=538270&r1=538269&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/sca/databinding/sdo/HelperContextProcessor.java 
> Tue May 15 11:17:26 2007
> @@ -21,11 +21,8 @@
> import java.beans.Introspector;
> import java.lang.reflect.Field;
> import java.lang.reflect.Method;
> -import java.net.URI;
>
> import org.apache.tuscany.sca.assembly.AssemblyFactory;
> -import org.apache.tuscany.sca.factory.ObjectCreationException;
> -import org.apache.tuscany.sca.factory.ObjectFactory;
> import org.apache.tuscany.sca.implementation.java.JavaImplementation;
> import org.apache.tuscany.sca.implementation.java.impl.JavaElementImpl;
> import org.apache.tuscany.sca.implementation.java.impl.JavaResourceImpl;
> @@ -95,6 +92,7 @@
>         }
>     }
>
> +    /*
>     private class HelperContextFactory implements 
> ObjectFactory<HelperContext> {
>         private URI id;
>
> @@ -108,4 +106,5 @@
>         }
>
>     }
> +    */
> }
>
> Modified: 
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java?view=diff&rev=538270&r1=538269&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentInfo.java 
> Tue May 15 11:17:26 2007
> @@ -65,6 +65,7 @@
> import org.apache.tuscany.sca.scope.InstanceWrapper;
> import org.apache.tuscany.sca.scope.PersistenceException;
> import org.apache.tuscany.sca.scope.Scope;
> +import org.apache.tuscany.sca.scope.ScopedRuntimeComponent;
> import org.apache.tuscany.sca.scope.TargetDestructionException;
> import org.apache.tuscany.sca.scope.TargetInvokerCreationException;
> import org.osoa.sca.CallableReference;
> @@ -373,7 +374,7 @@
>     }
>
>     public void removeInstance() throws PersistenceException {
> -        component.getScopeContainer().remove();
> +        ((ScopedRuntimeComponent) 
> component).getScopeContainer().remove();
>     }
>
>     public URI getUri() {
>
> Modified: 
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java?view=diff&rev=538270&r1=538269&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java 
> Tue May 15 11:17:26 2007
> @@ -35,9 +35,9 @@
> import 
> org.apache.tuscany.sca.implementation.java.injection.ResourceObjectFactory;
> import org.apache.tuscany.sca.interfacedef.Operation;
> import org.apache.tuscany.sca.invocation.Invoker;
> -import org.apache.tuscany.sca.provider.ScopedImplementationProvider;
> import org.apache.tuscany.sca.scope.InstanceWrapper;
> import org.apache.tuscany.sca.scope.Scope;
> +import org.apache.tuscany.sca.scope.ScopedImplementationProvider;
> import org.apache.tuscany.sca.scope.TargetInvokerCreationException;
> import org.osoa.sca.ComponentContext;
>
>
> Modified: 
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java
> URL: 
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java?view=diff&rev=538270&r1=538269&r2=538270
> ==============================================================================
> ---  
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java 
> (original)
> +++ 
> incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaTargetInvoker.java 
> Tue May 15 11:17:26 2007
> @@ -31,6 +31,7 @@
> import org.apache.tuscany.sca.scope.InstanceWrapper;
> import org.apache.tuscany.sca.scope.Scope;
> import org.apache.tuscany.sca.scope.ScopeContainer;
> +import org.apache.tuscany.sca.scope.ScopedRuntimeComponent;
> import org.apache.tuscany.sca.scope.TargetResolutionException;
>
> /**
> @@ -52,7 +53,7 @@
>         assert operation != null : "Operation method cannot be null";
>         this.operation = operation;
>         this.component = component;
> -        this.scopeContainer = component.getScopeContainer();
> +        this.scopeContainer = ((ScopedRuntimeComponent) 
> component).getScopeContainer();
>         stateless = Scope.STATELESS == this.scopeContainer.getScope();
>     }
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-commits-help@ws.apache.org
> 


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