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/08 07:27:12 UTC

svn commit: r536058 [2/2] - in /incubator/tuscany/java/sca/modules: core-spi/src/main/java/org/apache/tuscany/scope/ core/src/main/java/org/apache/tuscany/core/runtime/ core/src/main/java/org/apache/tuscany/core/scope/ core/src/test/java/org/apache/tus...

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/RuntimeJavaImplementationFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/RuntimeJavaImplementationFactory.java?view=diff&rev=536058&r1=536057&r2=536058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/RuntimeJavaImplementationFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/invocation/RuntimeJavaImplementationFactory.java Mon May  7 22:27:11 2007
@@ -35,15 +35,11 @@
     private DataBindingExtensionPoint dataBindingRegistry;
     private ProxyFactory proxyService;
     private WorkContext workContext;
-    private ScopeRegistry scopeRegistry;
 
-    public RuntimeJavaImplementationFactory(
-                                            ScopeRegistry scopeRegistry,
-                                            ProxyFactory proxyService,
+    public RuntimeJavaImplementationFactory(ProxyFactory proxyService,
                                             WorkContext workContext,
                                             DataBindingExtensionPoint dataBindingRegistry,
                                             JavaPropertyValueObjectFactory propertyValueObjectFactory) {
-        this.scopeRegistry = scopeRegistry;
         this.proxyService = proxyService;
         this.workContext = workContext;
         this.dataBindingRegistry = dataBindingRegistry;
@@ -52,7 +48,7 @@
 
     @Override
     public JavaImplementation createJavaImplementation() {
-        return new JavaImplementationProvider(scopeRegistry, proxyService, workContext, dataBindingRegistry,
+        return new JavaImplementationProvider(proxyService, workContext, dataBindingRegistry,
                                               propertyValueObjectFactory);
     }
 

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java?view=diff&rev=536058&r1=536057&r2=536058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java Mon May  7 22:27:11 2007
@@ -33,8 +33,8 @@
 import org.apache.tuscany.databinding.impl.DefaultMediator;
 import org.apache.tuscany.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.implementation.java.context.JavaPropertyValueObjectFactory;
-import org.apache.tuscany.implementation.java.introspect.ExtensibleJavaClassIntrospector;
 import org.apache.tuscany.implementation.java.introspect.DefaultJavaClassIntrospectorExtensionPoint;
+import org.apache.tuscany.implementation.java.introspect.ExtensibleJavaClassIntrospector;
 import org.apache.tuscany.implementation.java.introspect.JavaClassIntrospector;
 import org.apache.tuscany.implementation.java.introspect.JavaClassIntrospectorExtensionPoint;
 import org.apache.tuscany.implementation.java.introspect.JavaClassVisitor;
@@ -63,7 +63,6 @@
 import org.apache.tuscany.invocation.ProxyFactory;
 import org.apache.tuscany.policy.DefaultPolicyFactory;
 import org.apache.tuscany.policy.PolicyFactory;
-import org.apache.tuscany.scope.ScopeRegistry;
 import org.apache.tuscany.spi.component.WorkContext;
 
 /**
@@ -123,11 +122,9 @@
 
         StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
         
-        ScopeRegistry scopeRegistry = registry.getExtensionPoint(ScopeRegistry.class);
-
         WorkContext workContext = registry.getExtensionPoint(WorkContext.class);
         JavaImplementationFactory javaImplementationFactory =
-            new RuntimeJavaImplementationFactory(scopeRegistry, proxyFactory,
+            new RuntimeJavaImplementationFactory(proxyFactory,
                                                  workContext, dataBindings, factory);
         JavaImplementationProcessor javaImplementationProcessor =
             new JavaImplementationProcessor(assemblyFactory, policyFactory, javaImplementationFactory, classIntrospector);

Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/integration/AbstractConversationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/integration/AbstractConversationTestCase.java?view=diff&rev=536058&r1=536057&r2=536058
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/integration/AbstractConversationTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/integration/AbstractConversationTestCase.java Mon May  7 22:27:11 2007
@@ -20,6 +20,7 @@
 
 import junit.framework.TestCase;
 
+import org.apache.tuscany.core.RuntimeComponent;
 import org.apache.tuscany.core.scope.ConversationalScopeContainer;
 import org.apache.tuscany.core.store.MemoryStore;
 import org.apache.tuscany.scope.ScopeContainer;
@@ -37,11 +38,13 @@
     protected ScopeContainer container;
     protected MemoryStore store;
     protected WorkContext workContext;
+    protected RuntimeComponent component;
 
     protected void createRuntime() {
         workContext = new WorkContextImpl();
         store = new MemoryStore(EasyMock.createNiceMock(StoreMonitor.class));
-        container = new ConversationalScopeContainer(store, workContext);
+        component = EasyMock.createMock(RuntimeComponent.class);
+        container = new ConversationalScopeContainer(store, workContext, component);
     }
 
     protected void initializeRuntime() {



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