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 23:58:06 UTC
svn commit: r520638 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/
core/src/main/java/org/apache/tuscany/core/component/scope/
core/src/main/java/org/apache/tuscany/core/implementatio...
Author: jboynes
Date: Tue Mar 20 15:58:05 2007
New Revision: 520638
URL: http://svn.apache.org/viewvc?view=rev&rev=520638
Log:
register components with boot rather than host classloader for now
make toString for scope be the scope name
match method injection by name
allow groupId to be null
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/ReflectiveIFProviderBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/generator/SystemPhysicalComponentGenerator.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/ReflectiveIFProviderBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/ReflectiveIFProviderBuilder.java?view=diff&rev=520638&r1=520637&r2=520638
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/ReflectiveIFProviderBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/instancefactory/impl/ReflectiveIFProviderBuilder.java Tue Mar 20 15:58:05 2007
@@ -114,9 +114,12 @@
if (memberSite.getElementType() == ElementType.FIELD) {
member = implClass.getDeclaredField(name);
} else if (elementType == ElementType.METHOD) {
- for (PropertyDescriptor pd : Introspector.getBeanInfo(implClass).getPropertyDescriptors()) {
- if (name.equals(pd.getName())) {
- member = pd.getWriteMethod();
+ // FIXME look up directly based on signature sent in RIFPD
+ Method[] methods = implClass.getMethods();
+ for (Method method : methods) {
+ if (name.equals(method.getName())) {
+ member = method;
+ break;
}
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java?view=diff&rev=520638&r1=520637&r2=520638
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/AbstractScopeContainer.java Tue Mar 20 15:58:05 2007
@@ -124,8 +124,8 @@
public <T> void register(AtomicComponent<T> component, URI groupId) {
checkInit();
- componentGroups.put(component, groupId);
if (component.isEagerInit()) {
+ componentGroups.put(component, groupId);
synchronized (initQueues) {
List<AtomicComponent<?>> initQueue = initQueues.get(groupId);
if (initQueue == null) {
@@ -140,8 +140,8 @@
}
public <T> void unregister(AtomicComponent<T> component) {
- URI groupId = componentGroups.remove(component);
if (component.isEagerInit()) {
+ URI groupId = componentGroups.remove(component);
synchronized (initQueues) {
List<AtomicComponent<?>> initQueue = initQueues.get(groupId);
initQueue.remove(component);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java?view=diff&rev=520638&r1=520637&r2=520638
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaPhysicalComponentGenerator.java Tue Mar 20 15:58:05 2007
@@ -68,8 +68,8 @@
PojoComponentType<JavaMappedService, JavaMappedReference, Property<?>> type = implementation.getComponentType();
JavaPhysicalComponentDefinition pDefinition = new JavaPhysicalComponentDefinition();
pDefinition.setComponentId(definition.getUri());
- // set the classloader id temporarily until multiparent classloading is in palce
- pDefinition.setClassLoaderId(URI.create("sca://./hostClassLoader"));
+ // set the classloader id temporarily until contribution service
+ pDefinition.setClassLoaderId(URI.create("sca://./bootClassLoader"));
pDefinition.setScope(type.getImplementationScope());
// TODO get classloader id
ReflectiveIFProviderDefinition provider = new ReflectiveIFProviderDefinition();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/generator/SystemPhysicalComponentGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/generator/SystemPhysicalComponentGenerator.java?view=diff&rev=520638&r1=520637&r2=520638
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/generator/SystemPhysicalComponentGenerator.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/system/generator/SystemPhysicalComponentGenerator.java Tue Mar 20 15:58:05 2007
@@ -70,7 +70,7 @@
SystemPhysicalComponentDefinition pDefinition = new SystemPhysicalComponentDefinition();
pDefinition.setComponentId(definition.getUri());
// set the classloader id temporarily until multiparent classloading is in palce
- pDefinition.setClassLoaderId(URI.create("sca://./hostClassLoader"));
+ pDefinition.setClassLoaderId(URI.create("sca://./bootClassLoader"));
pDefinition.setScope(type.getImplementationScope());
// TODO get classloader id
ReflectiveIFProviderDefinition provider = new ReflectiveIFProviderDefinition();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java?view=diff&rev=520638&r1=520637&r2=520638
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/runtime/AbstractRuntime.java Tue Mar 20 15:58:05 2007
@@ -93,6 +93,8 @@
private static final URI HOST_CLASSLOADER_ID = URI.create("sca://./hostClassLoader");
+ private static final URI BOOT_CLASSLOADER_ID = URI.create("sca://./bootClassLoader");
+
private final XMLInputFactory xmlFactory;
private URL systemScdl;
private String applicationName;
@@ -139,6 +141,7 @@
xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", getClass().getClassLoader());
interfaceProcessorRegistry = new JavaInterfaceProcessorRegistryImpl();
classLoaderRegistry = new ClassLoaderRegistryImpl();
+ classLoaderRegistry.register(BOOT_CLASSLOADER_ID, getClass().getClassLoader());
}
public URL getSystemScdl() {
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java?view=diff&rev=520638&r1=520637&r2=520638
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/model/Scope.java Tue Mar 20 15:58:05 2007
@@ -59,6 +59,6 @@
}
public String toString() {
- return "Scope(\"" + scope + "\")";
+ return scope;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org