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 2007/03/20 02:24:58 UTC
svn commit: r520206 - in
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core:
implementation/java/JavaPhysicalComponentBuilder.java
services/deployment/AssemblyServiceImpl.java
Author: jmarino
Date: Mon Mar 19 18:24:57 2007
New Revision: 520206
URL: http://svn.apache.org/viewvc?view=rev&rev=520206
Log:
fix default service lookup
Modified:
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/services/deployment/AssemblyServiceImpl.java
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=520206&r1=520205&r2=520206
==============================================================================
--- 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 Mon Mar 19 18:24:57 2007
@@ -27,17 +27,6 @@
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;
@@ -51,13 +40,25 @@
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.model.physical.InstanceFactoryProviderDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalOperationDefinition;
-import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
import org.apache.tuscany.spi.model.physical.PhysicalWireSourceDefinition;
+import org.apache.tuscany.spi.model.physical.PhysicalWireTargetDefinition;
import org.apache.tuscany.spi.services.classloading.ClassLoaderRegistry;
import org.apache.tuscany.spi.wire.InvocationChain;
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
@@ -66,7 +67,7 @@
* @param <T> the implementation class for the defined component
*/
@EagerInit
-@Service(interfaces={PhysicalComponentBuilder.class, WireAttacher.class})
+@Service(interfaces = {PhysicalComponentBuilder.class, WireAttacher.class})
public class JavaPhysicalComponentBuilder<T>
extends POJOPhysicalComponentBuilder<JavaPhysicalComponentDefinition<T>, JavaComponent<T>>
implements WireAttacher<JavaComponent, JavaPhysicalWireSourceDefinition, JavaPhysicalWireTargetDefinition> {
@@ -113,10 +114,11 @@
Class<?> type = source.getMemberType(referenceSource);
if (sourceDefinition.isOptimizable()) {
assert target instanceof AtomicComponent;
- ObjectFactory<?> factory = ((AtomicComponent<?>)target).createObjectFactory();
+ ObjectFactory<?> factory = ((AtomicComponent<?>) target).createObjectFactory();
source.setObjectFactory(referenceSource, factory);
} else {
- ObjectFactory<?> factory = new WireObjectFactory2(type, sourceDefinition.isConversational(), wire, proxyService);
+ ObjectFactory<?> factory =
+ new WireObjectFactory2(type, sourceDefinition.isConversational(), wire, proxyService);
source.setObjectFactory(referenceSource, factory);
if (!wire.getCallbackInvocationChains().isEmpty()) {
URI callbackUri = sourceDefinition.getCallbackUri();
@@ -129,14 +131,14 @@
}
public void attachToTarget(Component source,
- PhysicalWireSourceDefinition sourceDefinition, JavaComponent component,
- JavaPhysicalWireTargetDefinition target, Wire wire
- )
- throws WireAttachException {
+ PhysicalWireSourceDefinition sourceDefinition,
+ JavaComponent component,
+ JavaPhysicalWireTargetDefinition target,
+ Wire wire) throws WireAttachException {
if (sourceDefinition.isOptimizable()) {
return;
}
-
+
ScopeContainer scopeContainer = component.getScopeContainer();
Class<?> implementationClass = component.getImplementationClass();
ClassLoader loader = implementationClass.getClassLoader();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java?view=diff&rev=520206&r1=520205&r2=520206
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/AssemblyServiceImpl.java Mon Mar 19 18:24:57 2007
@@ -216,7 +216,7 @@
serviceDefinition = targetType.getServices().get(serviceName);
} else if (targetType.getServices().size() == 1) {
// default service
- serviceDefinition = targetType.getServices().get(0);
+ serviceDefinition = targetType.getServices().values().iterator().next();
}
assert serviceDefinition != null;
generatorRegistry.generateWire(child,
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org