You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/03/20 21:21:03 UTC
svn commit: r520552 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/implementation/
main/java/org/apache/tuscany/core/implementation/java/
main/java/org/apache/tuscany/core/implementation/system/builder/
test/java/or...
Author: jboynes
Date: Tue Mar 20 13:21:01 2007
New Revision: 520552
URL: http://svn.apache.org/viewvc?view=rev&rev=520552
Log:
Java and System PCBs need to register with builder and wireAttacher registries on init
init method needs to use the right class and be public
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java?view=diff&rev=520552&r1=520551&r2=520552
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/POJOPhysicalComponentBuilder.java Tue Mar 20 13:21:01 2007
@@ -18,20 +18,18 @@
*/
package org.apache.tuscany.core.implementation;
-import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Reference;
+import org.apache.tuscany.core.component.instancefactory.IFProviderBuilderRegistry;
+import org.apache.tuscany.core.implementation.system.model.SystemPhysicalComponentDefinition;
import org.apache.tuscany.spi.builder.physical.PhysicalComponentBuilder;
import org.apache.tuscany.spi.builder.physical.PhysicalComponentBuilderRegistry;
+import org.apache.tuscany.spi.builder.physical.WireAttacherRegistry;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeRegistry;
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
-import org.apache.tuscany.spi.model.physical.InstanceFactoryProviderDefinition;
import org.apache.tuscany.spi.services.classloading.ClassLoaderRegistry;
-import org.apache.tuscany.core.implementation.system.model.SystemPhysicalComponentDefinition;
-import org.apache.tuscany.core.component.instancefactory.IFProviderBuilderRegistry;
-import org.apache.tuscany.core.component.instancefactory.IFProviderBuilderException;
-import org.apache.tuscany.core.component.InstanceFactoryProvider;
/**
* Base class for PhysicalComponentBuilders that build components based on POJOs.
@@ -42,23 +40,21 @@
implements PhysicalComponentBuilder<PCD, C> {
protected final PhysicalComponentBuilderRegistry builderRegistry;
+ protected final WireAttacherRegistry wireAttacherRegistry;
protected final ScopeRegistry scopeRegistry;
protected final IFProviderBuilderRegistry providerBuilders;
protected final ClassLoaderRegistry classLoaderRegistry;
protected POJOPhysicalComponentBuilder(
@Reference(name = "builderRegistry")PhysicalComponentBuilderRegistry builderRegistry,
+ @Reference(name = "wireAttacherRegistry")WireAttacherRegistry wireAttacherRegistry,
@Reference(name = "scopeRegistry")ScopeRegistry scopeRegistry,
@Reference(name = "providerBuilders")IFProviderBuilderRegistry providerBuilders,
@Reference(name = "classloaderRegistry")ClassLoaderRegistry classLoaderRegistry) {
this.builderRegistry = builderRegistry;
+ this.wireAttacherRegistry = wireAttacherRegistry;
this.scopeRegistry = scopeRegistry;
this.providerBuilders = providerBuilders;
this.classLoaderRegistry = classLoaderRegistry;
- }
-
- @Init
- void init() {
- builderRegistry.register(SystemPhysicalComponentDefinition.class, this);
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java?view=diff&rev=520552&r1=520551&r2=520552
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentBuilder.java Tue Mar 20 13:21:01 2007
@@ -24,15 +24,28 @@
import java.util.Map;
import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
+import org.apache.tuscany.core.component.InstanceFactoryProvider;
+import org.apache.tuscany.core.component.instancefactory.IFProviderBuilderRegistry;
+import org.apache.tuscany.core.implementation.POJOPhysicalComponentBuilder;
+import org.apache.tuscany.core.injection.CallbackWireObjectFactory2;
+import org.apache.tuscany.core.model.physical.instancefactory.InjectionSource;
+import static org.apache.tuscany.core.model.physical.instancefactory.InjectionSource.ValueSourceType.CALLBACK;
+import static org.apache.tuscany.core.model.physical.instancefactory.InjectionSource.ValueSourceType.REFERENCE;
+import org.apache.tuscany.core.model.physical.java.JavaPhysicalComponentDefinition;
+import org.apache.tuscany.core.model.physical.java.JavaPhysicalWireSourceDefinition;
+import org.apache.tuscany.core.model.physical.java.JavaPhysicalWireTargetDefinition;
+import org.apache.tuscany.core.wire.WireObjectFactory2;
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.builder.BuilderException;
import org.apache.tuscany.spi.builder.physical.PhysicalComponentBuilder;
import org.apache.tuscany.spi.builder.physical.PhysicalComponentBuilderRegistry;
import org.apache.tuscany.spi.builder.physical.WireAttachException;
import org.apache.tuscany.spi.builder.physical.WireAttacher;
+import org.apache.tuscany.spi.builder.physical.WireAttacherRegistry;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
@@ -47,18 +60,6 @@
import org.apache.tuscany.spi.wire.ProxyService;
import org.apache.tuscany.spi.wire.Wire;
-import org.apache.tuscany.core.component.InstanceFactoryProvider;
-import org.apache.tuscany.core.component.instancefactory.IFProviderBuilderRegistry;
-import org.apache.tuscany.core.implementation.POJOPhysicalComponentBuilder;
-import org.apache.tuscany.core.injection.CallbackWireObjectFactory2;
-import org.apache.tuscany.core.model.physical.instancefactory.InjectionSource;
-import static org.apache.tuscany.core.model.physical.instancefactory.InjectionSource.ValueSourceType.CALLBACK;
-import static org.apache.tuscany.core.model.physical.instancefactory.InjectionSource.ValueSourceType.REFERENCE;
-import org.apache.tuscany.core.model.physical.java.JavaPhysicalComponentDefinition;
-import org.apache.tuscany.core.model.physical.java.JavaPhysicalWireSourceDefinition;
-import org.apache.tuscany.core.model.physical.java.JavaPhysicalWireTargetDefinition;
-import org.apache.tuscany.core.wire.WireObjectFactory2;
-
/**
* The physical component builder for Java implementation types. Responsible for creating the Component runtime artifact
* from a physical component definition
@@ -76,15 +77,23 @@
public JavaPhysicalComponentBuilder(
@Reference(name = "builderRegistry")PhysicalComponentBuilderRegistry builderRegistry,
+ @Reference(name = "wireAttacherRegistry")WireAttacherRegistry wireAttacherRegistry,
@Reference(name = "scopeRegistry")ScopeRegistry scopeRegistry,
@Reference(name = "providerBuilders")IFProviderBuilderRegistry providerBuilders,
@Reference(name = "classloaderRegistry")ClassLoaderRegistry classLoaderRegistry) {
- super(builderRegistry, scopeRegistry, providerBuilders, classLoaderRegistry);
+ super(builderRegistry, wireAttacherRegistry, scopeRegistry, providerBuilders, classLoaderRegistry);
}
@Reference
public void setProxyService(ProxyService proxyService) {
this.proxyService = proxyService;
+ }
+
+ @Init
+ public void init() {
+ builderRegistry.register(JavaPhysicalComponentDefinition.class, this);
+ wireAttacherRegistry.register(JavaPhysicalWireSourceDefinition.class, this);
+ wireAttacherRegistry.register(JavaPhysicalWireTargetDefinition.class, this);
}
public JavaComponent<T> build(JavaPhysicalComponentDefinition<T> definition) throws BuilderException {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java?view=diff&rev=520552&r1=520551&r2=520552
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilder.java Tue Mar 20 13:21:01 2007
@@ -23,6 +23,7 @@
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
+import org.osoa.sca.annotations.Init;
import org.apache.tuscany.core.component.InstanceFactoryProvider;
import org.apache.tuscany.core.component.instancefactory.IFProviderBuilderRegistry;
@@ -39,6 +40,7 @@
import org.apache.tuscany.spi.builder.physical.PhysicalComponentBuilder;
import org.apache.tuscany.spi.builder.physical.PhysicalComponentBuilderRegistry;
import org.apache.tuscany.spi.builder.physical.WireAttacher;
+import org.apache.tuscany.spi.builder.physical.WireAttacherRegistry;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.ScopeContainer;
@@ -61,10 +63,18 @@
public SystemPhysicalComponentBuilder(
@Reference(name = "builderRegistry")PhysicalComponentBuilderRegistry builderRegistry,
+ @Reference(name = "wireAttacherRegistry")WireAttacherRegistry wireAttacherRegistry,
@Reference(name = "scopeRegistry")ScopeRegistry scopeRegistry,
@Reference(name = "providerBuilders")IFProviderBuilderRegistry providerBuilders,
@Reference(name = "classloaderRegistry")ClassLoaderRegistry classLoaderRegistry) {
- super(builderRegistry, scopeRegistry, providerBuilders, classLoaderRegistry);
+ super(builderRegistry, wireAttacherRegistry, scopeRegistry, providerBuilders, classLoaderRegistry);
+ }
+
+ @Init
+ public void init() {
+ builderRegistry.register(SystemPhysicalComponentDefinition.class, this);
+ wireAttacherRegistry.register(SystemPhysicalWireSourceDefinition.class, this);
+ wireAttacherRegistry.register(SystemPhysicalWireTargetDefinition.class, this);
}
public SystemComponent<T> build(SystemPhysicalComponentDefinition<T> definition) throws BuilderException {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilderTestCase.java?view=diff&rev=520552&r1=520551&r2=520552
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/system/builder/SystemPhysicalComponentBuilderTestCase.java Tue Mar 20 13:21:01 2007
@@ -76,6 +76,7 @@
EasyMock.replay(providerBuilders);
builder = new SystemPhysicalComponentBuilder<T>(builderRegistry,
+ null,
scopeRegistry,
providerBuilders,
classLoaderRegistry);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java?view=diff&rev=520552&r1=520551&r2=520552
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/java/PhysicalBuilderTestCase.java Tue Mar 20 13:21:01 2007
@@ -158,10 +158,13 @@
DefaultPhysicalComponentBuilderRegistry builderRegistry = new DefaultPhysicalComponentBuilderRegistry();
WireAttacherRegistry wireAttacherRegistry = new WireAttacherRegistryImpl();
- builder = new JavaPhysicalComponentBuilder(null, scopeRegistry, providerBuilders, classLoaderRegistry);
- builderRegistry.register(JavaPhysicalComponentDefinition.class, builder);
- wireAttacherRegistry.register(JavaPhysicalWireSourceDefinition.class, builder);
- wireAttacherRegistry.register(JavaPhysicalWireTargetDefinition.class, builder);
+
+ builder = new JavaPhysicalComponentBuilder(builderRegistry,
+ wireAttacherRegistry,
+ scopeRegistry,
+ providerBuilders,
+ classLoaderRegistry);
+ builder.init();
componentManager = new ComponentManagerImpl();
connector = new ConnectorImpl(null, wireAttacherRegistry, null, componentManager, null, null);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java?view=diff&rev=520552&r1=520551&r2=520552
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/system/builder/PhysicalBuilderTestCase.java Tue Mar 20 13:21:01 2007
@@ -157,10 +157,12 @@
DefaultPhysicalComponentBuilderRegistry builderRegistry = new DefaultPhysicalComponentBuilderRegistry();
WireAttacherRegistry wireAttacherRegistry = new WireAttacherRegistryImpl();
- builder = new SystemPhysicalComponentBuilder(null, scopeRegistry, providerBuilders, classLoaderRegistry);
- builderRegistry.register(SystemPhysicalComponentDefinition.class, builder);
- wireAttacherRegistry.register(SystemPhysicalWireSourceDefinition.class, builder);
- wireAttacherRegistry.register(SystemPhysicalWireTargetDefinition.class, builder);
+ builder = new SystemPhysicalComponentBuilder(builderRegistry,
+ wireAttacherRegistry,
+ scopeRegistry,
+ providerBuilders,
+ classLoaderRegistry);
+ builder.init();
componentManager = new ComponentManagerImpl();
connector = new ConnectorImpl(null, wireAttacherRegistry, null, componentManager, null, null);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org