Author: antelder
Date: Sat Mar 5 10:51:46 2011
New Revision: 1078265
URL: http://svn.apache.org/viewvc?rev=1078265&view=rev
Log:
Fix dependency tangle by removing the dependency on node from core
Modified:
tuscany/sca-java-2.x/trunk/modules/core/pom.xml
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java
Modified: tuscany/sca-java-2.x/trunk/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/pom.xml?rev=1078265&r1=1078264&r2=1078265&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/core/pom.xml Sat Mar 5 10:51:46 2011
@@ -54,12 +54,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2</version>
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java?rev=1078265&r1=1078264&r2=1078265&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
Sat Mar 5 10:51:46 2011
@@ -58,6 +58,7 @@ import org.apache.tuscany.sca.contributi
import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ExtensionPointRegistryLocator;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
@@ -83,7 +84,6 @@ import org.apache.tuscany.sca.invocation
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.invocation.MessageFactory;
import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
import org.apache.tuscany.sca.provider.EndpointAsyncProvider;
import org.apache.tuscany.sca.provider.EndpointProvider;
@@ -919,23 +919,19 @@ public class RuntimeEndpointImpl extends
} else {
// In this case, we assume that we're running on a detached
(non Tuscany) thread and
// as a result we need to connect back to the Tuscany
environment...
- for( NodeFactory factory : NodeFactory.getNodeFactories() ) {
- ExtensionPointRegistry registry =
factory.getExtensionPointRegistry();
- if( registry != null ) {
- this.registry = registry;
- UtilityExtensionPoint utilities =
registry.getExtensionPoint(UtilityExtensionPoint.class);
- this.interfaceContractMapper =
utilities.getUtility(InterfaceContractMapper.class);
- this.serializer =
utilities.getUtility(EndpointSerializer.class);
- RuntimeEndpointImpl ep =
(RuntimeEndpointImpl)serializer.readEndpoint(xml);
- // Find the actual Endpoint in the EndpointRegistry
- ep = findActualEP( ep, registry );
-
- if( ep != null ){
- copyFrom( ep );
- break;
- } // end if
- } // end if
- } // end for
+ ExtensionPointRegistry registry =
ExtensionPointRegistryLocator.getExtensionPointRegistry();
+ if( registry != null ) {
+ this.registry = registry;
+ UtilityExtensionPoint utilities =
registry.getExtensionPoint(UtilityExtensionPoint.class);
+ this.interfaceContractMapper =
utilities.getUtility(InterfaceContractMapper.class);
+ this.serializer =
utilities.getUtility(EndpointSerializer.class);
+ RuntimeEndpointImpl ep =
(RuntimeEndpointImpl)serializer.readEndpoint(xml);
+ // Find the actual Endpoint in the EndpointRegistry
+ ep = findActualEP( ep, registry );
+ if( ep != null ){
+ copyFrom( ep );
+ } // end if
+ } // end if
} // end if
} // end if
super.resolve();
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java?rev=1078265&r1=1078264&r2=1078265&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
Sat Mar 5 10:51:46 2011
@@ -38,7 +38,6 @@ import org.apache.tuscany.sca.assembly.C
import org.apache.tuscany.sca.assembly.CompositeReference;
import org.apache.tuscany.sca.assembly.CompositeService;
import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.Endpoint;
import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.builder.BindingBuilder;
import org.apache.tuscany.sca.assembly.builder.BuilderContext;
@@ -46,6 +45,7 @@ import org.apache.tuscany.sca.assembly.b
import org.apache.tuscany.sca.assembly.impl.EndpointReferenceImpl;
import org.apache.tuscany.sca.context.CompositeContext;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ExtensionPointRegistryLocator;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.core.assembly.RuntimeAssemblyFactory;
@@ -71,7 +71,6 @@ import org.apache.tuscany.sca.invocation
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.invocation.MessageFactory;
import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
import org.apache.tuscany.sca.provider.EndpointReferenceProvider;
import org.apache.tuscany.sca.provider.ImplementationAsyncProvider;
@@ -643,22 +642,18 @@ public class RuntimeEndpointReferenceImp
} else {
// In this case, we assume that we're running on a detached
(non Tuscany) thread and
// as a result we need to connect back to the Tuscany
environment...
- for( NodeFactory factory : NodeFactory.getNodeFactories() ) {
- ExtensionPointRegistry registry =
factory.getExtensionPointRegistry();
- if( registry != null ) {
- this.registry = registry;
- UtilityExtensionPoint utilities =
registry.getExtensionPoint(UtilityExtensionPoint.class);
- this.serializer =
utilities.getUtility(EndpointSerializer.class);
- RuntimeEndpointReferenceImpl epr =
(RuntimeEndpointReferenceImpl)serializer.readEndpointReference(xml);
- // Find the actual Endpoint in the EndpointRegistry
- epr = findActualEPR( epr, registry );
-
- if( epr != null ){
- copyFrom( epr );
- break;
- } // end if
- } // end if
- } // end for
+ ExtensionPointRegistry registry =
ExtensionPointRegistryLocator.getExtensionPointRegistry();
+ if( registry != null ) {
+ this.registry = registry;
+ UtilityExtensionPoint utilities =
registry.getExtensionPoint(UtilityExtensionPoint.class);
+ this.serializer =
utilities.getUtility(EndpointSerializer.class);
+ RuntimeEndpointReferenceImpl epr =
(RuntimeEndpointReferenceImpl)serializer.readEndpointReference(xml);
+ // Find the actual Endpoint in the EndpointRegistry
+ epr = findActualEPR( epr, registry );
+ if( epr != null ){
+ copyFrom( epr );
+ } // end if
+ } // end if
} // end if
}
super.resolve();
Modified:
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java?rev=1078265&r1=1078264&r2=1078265&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AsyncResponseInvoker.java
Sat Mar 5 10:51:46 2011
@@ -22,8 +22,6 @@ package org.apache.tuscany.sca.core.invo
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -31,24 +29,18 @@ import org.apache.tuscany.sca.assembly.E
import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.context.CompositeContext;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ExtensionPointRegistryLocator;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.core.assembly.impl.RuntimeEndpointImpl;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.invocation.InvokerAsyncResponse;
import org.apache.tuscany.sca.invocation.Message;
import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.node.NodeFactory;
import org.apache.tuscany.sca.provider.EndpointAsyncProvider;
import org.apache.tuscany.sca.runtime.DomainRegistryFactory;
import org.apache.tuscany.sca.runtime.EndpointRegistry;
-import org.apache.tuscany.sca.runtime.EndpointSerializer;
import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory;
import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
-import org.oasisopen.sca.ComponentContext;
/**
* A class that wraps the mechanics for sending async responses
@@ -309,8 +301,8 @@ public class AsyncResponseInvoker<T> imp
} // end if
// Deal with the case where there is no context available
- for( NodeFactory factory : NodeFactory.getNodeFactories() ) {
- registry = factory.getExtensionPointRegistry();
+ for(ExtensionPointRegistry r :
ExtensionPointRegistryLocator.getExtensionPointRegistries()) {
+ registry = r;
if( registry != null ) {
// Find the actual Endpoint in the EndpointRegistry
endpointRegistry = getEndpointRegistry( registry );
