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/02/12 05:27:03 UTC
svn commit: r506273 - in /incubator/tuscany/java/sca/kernel:
core/src/main/java/org/apache/tuscany/core/implementation/composite/
spi/src/main/java/org/apache/tuscany/spi/component/
spi/src/main/java/org/apache/tuscany/spi/extension/
Author: jmarino
Date: Sun Feb 11 20:27:02 2007
New Revision: 506273
URL: http://svn.apache.org/viewvc?view=rev&rev=506273
Log:
remove extensions from SCAObject
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java?view=diff&rev=506273&r1=506272&r2=506273
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeBuilder.java Sun Feb 11 20:27:02 2007
@@ -45,8 +45,6 @@
throw new BuilderInstantiationException("Error registering reference", e);
}
}
- component.getExtensions().putAll(componentType.getExtensions());
- // connect services and references before components
return component;
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java?view=diff&rev=506273&r1=506272&r2=506273
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/AbstractSCAObject.java Sun Feb 11 20:27:02 2007
@@ -19,7 +19,6 @@
package org.apache.tuscany.spi.component;
import java.net.URI;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -38,11 +37,9 @@
*/
public abstract class AbstractSCAObject extends AbstractLifecycle implements SCAObject {
protected static final EventFilter TRUE_FILTER = new TrueFilter();
-
protected Map<EventFilter, List<RuntimeEventListener>> listeners;
protected final CompositeComponent parent;
protected final URI uri;
- private final Map<Object, Object> extensions = new HashMap<Object, Object>();
public AbstractSCAObject(URI uri, CompositeComponent parent) {
assert uri != null;
@@ -112,10 +109,6 @@
public String toString() {
return "[" + uri.toString() + "] in state [" + super.toString() + ']';
- }
-
- public Map<Object, Object> getExtensions() {
- return extensions;
}
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java?view=diff&rev=506273&r1=506272&r2=506273
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/component/SCAObject.java Sun Feb 11 20:27:02 2007
@@ -51,13 +51,6 @@
Scope getScope();
/**
- * The extensions map contains other runtime context such as type systems for various databindings
- *
- * @return A live map of extended context
- */
- Map<Object, Object> getExtensions();
-
- /**
* Called to signal that the composite should perform any initizalization
*/
void prepare() throws PrepareException;
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java?view=diff&rev=506273&r1=506272&r2=506273
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/AtomicComponentExtension.java Sun Feb 11 20:27:02 2007
@@ -202,6 +202,7 @@
public void prepare() throws PrepareException {
+ // JFM REMOVE
// connect inbound wires for atomic components
for (InboundWire inboundWire : getInboundWires()) {
for (InboundInvocationChain chain : inboundWire.getInvocationChains().values()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org