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/02/13 22:48:35 UTC
svn commit: r507246 - in
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core:
implementation/PojoComponentContextFactory.java
implementation/java/JavaComponentBuilder.java
injection/ResourceObjectFactory.java
Author: jboynes
Date: Tue Feb 13 13:48:35 2007
New Revision: 507246
URL: http://svn.apache.org/viewvc?view=rev&rev=507246
Log:
support injection of ComponentContext
Added:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponentContextFactory.java (with props)
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java
Added: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponentContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponentContextFactory.java?view=auto&rev=507246
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponentContextFactory.java (added)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponentContextFactory.java Tue Feb 13 13:48:35 2007
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.core.implementation;
+
+import org.osoa.sca.ComponentContext;
+
+import org.apache.tuscany.spi.ObjectFactory;
+import org.apache.tuscany.spi.ObjectCreationException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class PojoComponentContextFactory implements ObjectFactory<ComponentContext> {
+ private final PojoAtomicComponent component;
+
+
+ public PojoComponentContextFactory(PojoAtomicComponent component) {
+ this.component = component;
+ }
+
+
+ public ComponentContext getInstance() throws ObjectCreationException {
+ return component.getComponentContext();
+ }
+}
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponentContextFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/PojoComponentContextFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java?view=diff&rev=507246&r1=507245&r2=507246
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java Tue Feb 13 13:48:35 2007
@@ -22,6 +22,8 @@
import java.lang.reflect.Member;
import java.lang.reflect.Method;
+import org.osoa.sca.ComponentContext;
+
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.BuilderConfigException;
@@ -40,6 +42,7 @@
import org.apache.tuscany.spi.model.PropertyValue;
import org.apache.tuscany.core.implementation.PojoConfiguration;
+import org.apache.tuscany.core.implementation.PojoComponentContextFactory;
import org.apache.tuscany.core.injection.MethodEventInvoker;
import org.apache.tuscany.core.injection.PojoObjectFactory;
import org.apache.tuscany.core.injection.ResourceObjectFactory;
@@ -156,29 +159,31 @@
}
}
- @SuppressWarnings({"unchecked"})
private void handleResources(
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> componentType,
JavaAtomicComponent component) {
- for (Resource resource : componentType.getResources().values()) {
+ for (Resource<?> resource : componentType.getResources().values()) {
+ String name = resource.getName();
ObjectFactory<?> objectFactory = resource.getObjectFactory();
- if (objectFactory != null) {
- component.addResourceFactory(resource.getName(), objectFactory);
- } else {
- String name = resource.getName();
- boolean optional = resource.isOptional();
- Class<Object> type = (Class<Object>) resource.getType();
- ResourceObjectFactory<Object> factory;
- String mappedName = resource.getMappedName();
- if (mappedName == null) {
- // by type
- factory = new ResourceObjectFactory<Object>(type, optional, host);
+ if (objectFactory == null) {
+ Class<?> type = resource.getType();
+ if (ComponentContext.class.equals(type)) {
+ objectFactory = new PojoComponentContextFactory(component);
} else {
- factory = new ResourceObjectFactory<Object>(type, mappedName, optional, host);
+ boolean optional = resource.isOptional();
+ String mappedName = resource.getMappedName();
+ objectFactory = createResourceObjectFactory(type, mappedName, optional, host);
}
- component.addResourceFactory(name, factory);
}
+ component.addResourceFactory(name, objectFactory);
}
+ }
+
+ private <T> ResourceObjectFactory<T> createResourceObjectFactory(Class<T> type,
+ String mappedName,
+ boolean optional,
+ ResourceHost host) {
+ return new ResourceObjectFactory<T>(type, mappedName, optional, host);
}
private void handleProperties(ComponentDefinition<JavaImplementation> definition, JavaAtomicComponent component) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java?view=diff&rev=507246&r1=507245&r2=507246
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java Tue Feb 13 13:48:35 2007
@@ -47,9 +47,7 @@
* @param host the runtime resource provider
*/
public ResourceObjectFactory(Class<T> type, boolean optional, ResourceHost host) {
- this.type = type;
- this.host = host;
- this.optional = optional;
+ this(type, null, optional, host);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org