You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/29 03:49:49 UTC
svn commit: r533453 - in /incubator/tuscany/java/sca/modules:
core-spi/src/main/java/org/apache/tuscany/spi/extension/
core/src/main/java/org/apache/tuscany/core/runtime/
implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/...
Author: jsdelfino
Date: Sat Apr 28 18:49:47 2007
New Revision: 533453
URL: http://svn.apache.org/viewvc?view=rev&rev=533453
Log:
Removed unused extension point.
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/implementation/java/module/JavaRuntimeModuleActivator.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaBuilderPropertyTestCaseFIXME.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderConversationIDTestCaseFIXME.java
incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderResourceTestCaseFIXME.java
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java?view=diff&rev=533453&r1=533452&r2=533453
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/extension/ComponentBuilderExtension.java Sat Apr 28 18:49:47 2007
@@ -37,18 +37,12 @@
@EagerInit
public abstract class ComponentBuilderExtension<I extends Implementation> implements ComponentBuilder {
protected BuilderRegistry builderRegistry;
- protected ScopeRegistry scopeRegistry;
protected ProxyService proxyService;
protected WorkContext workContext;
@Reference
public void setBuilderRegistry(BuilderRegistry registry) {
this.builderRegistry = registry;
- }
-
- @Reference
- public void setScopeRegistry(ScopeRegistry scopeRegistry) {
- this.scopeRegistry = scopeRegistry;
}
@Reference
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java?view=diff&rev=533453&r1=533452&r2=533453
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java Sat Apr 28 18:49:47 2007
@@ -196,9 +196,6 @@
// register the ComponentManager to that the fabric can wire to it
extensionRegistry.addExtensionPoint(ComponentManager.class, componentManager);
-
- // register the ScopeRegistry
- extensionRegistry.addExtensionPoint(ScopeRegistry.class, scopeRegistry);
}
protected ComponentManager getComponentManager() {
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java?view=diff&rev=533453&r1=533452&r2=533453
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/runtime/DefaultBootstrapper.java Sat Apr 28 18:49:47 2007
@@ -112,9 +112,7 @@
WirePostProcessorRegistry wirePostProcessorRegistry = new WirePostProcessorRegistryImpl();
deployer.setWirePostProcessorRegistry(wirePostProcessorRegistry);
extensionRegistry.addExtensionPoint(WirePostProcessorRegistry.class, wirePostProcessorRegistry);
- extensionRegistry.addExtensionPoint(ScopeRegistry.class, scopeRegistry);
extensionRegistry.addExtensionPoint(BuilderRegistry.class, builder);
- // extensionRegistry.addExtension(LoaderRegistry.class, loader);
extensionRegistry.addExtensionPoint(Deployer.class, deployer);
return deployer;
}
@@ -155,7 +153,6 @@
BuilderRegistryImpl builderRegistry = new BuilderRegistryImpl(componentManager, scopeRegistry);
CompositeBuilder compositeBuilder = new CompositeBuilder();
compositeBuilder.setBuilderRegistry(builderRegistry);
- compositeBuilder.setScopeRegistry(scopeRegistry);
compositeBuilder.init();
// builderRegistry.register(CompositeImplementation.class,
// compositeBuilder);
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=533453&r1=533452&r2=533453
==============================================================================
--- 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 Sat Apr 28 18:49:47 2007
@@ -62,7 +62,6 @@
import org.apache.tuscany.policy.PolicyFactory;
import org.apache.tuscany.policy.impl.DefaultPolicyFactory;
import org.apache.tuscany.spi.builder.BuilderRegistry;
-import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.component.WorkContext;
import org.apache.tuscany.spi.wire.ProxyService;
@@ -131,7 +130,6 @@
BuilderRegistry builderRegistry = extensionPointRegistry.getExtensionPoint(BuilderRegistry.class);
JavaComponentBuilder builder = new JavaComponentBuilder();
- builder.setScopeRegistry(extensionPointRegistry.getExtensionPoint(ScopeRegistry.class));
builder.setProxyService(extensionPointRegistry.getExtensionPoint(ProxyService.class));
builder.setWorkContext(extensionPointRegistry.getExtensionPoint(WorkContext.class));
builderRegistry.register(JavaImplementation.class, builder);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaBuilderPropertyTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaBuilderPropertyTestCaseFIXME.java?view=diff&rev=533453&r1=533452&r2=533453
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaBuilderPropertyTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaBuilderPropertyTestCaseFIXME.java Sat Apr 28 18:49:47 2007
@@ -53,7 +53,6 @@
@SuppressWarnings("unchecked")
public void testPropertyHandling() throws Exception {
JavaComponentBuilder builder = new JavaComponentBuilder();
- builder.setScopeRegistry(registry);
JavaImplementationDefinition type = new JavaImplementationDefinition();
Property property = factory.createProperty();
property.setName("test");
@@ -79,7 +78,6 @@
public void testIntPropertyHandling() throws Exception {
JavaComponentBuilder builder = new JavaComponentBuilder();
- builder.setScopeRegistry(registry);
JavaImplementationDefinition type = new JavaImplementationDefinition();
Property property = factory.createProperty();
property.setName("test");
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderConversationIDTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderConversationIDTestCaseFIXME.java?view=diff&rev=533453&r1=533452&r2=533453
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderConversationIDTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderConversationIDTestCaseFIXME.java Sat Apr 28 18:49:47 2007
@@ -53,7 +53,6 @@
EasyMock.expect(registry.getScopeContainer(Scope.STATELESS)).andReturn(container);
EasyMock.replay(registry);
JavaComponentBuilder builder = new JavaComponentBuilder();
- builder.setScopeRegistry(registry);
WorkContext workContext = new WorkContextImpl();
workContext.setIdentifier(Scope.CONVERSATION, "convID");
builder.setWorkContext(workContext);
Modified: incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderResourceTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderResourceTestCaseFIXME.java?view=diff&rev=533453&r1=533452&r2=533453
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderResourceTestCaseFIXME.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/implementation/java/context/JavaComponentBuilderResourceTestCaseFIXME.java Sat Apr 28 18:49:47 2007
@@ -57,7 +57,6 @@
EasyMock.replay(host);
JavaComponentBuilder builder = new JavaComponentBuilder();
builder.setHost(host);
- builder.setScopeRegistry(registry);
ConstructorDefinition<Foo> ctorDef = new ConstructorDefinition<Foo>(Foo.class.getConstructor());
JavaImplementationDefinition type = new JavaImplementationDefinition();
Resource resource = new Resource(new JavaElement(Foo.class.getDeclaredField("resource")));
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org