You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/06/19 19:45:47 UTC
svn commit: r786602 - in /tuscany/java/sca/modules:
assembly/src/main/java/org/apache/tuscany/sca/assembly/
assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/
assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/
binding-sca-ru...
Author: rfeng
Date: Fri Jun 19 17:45:46 2009
New Revision: 786602
URL: http://svn.apache.org/viewvc?rev=786602&view=rev
Log:
Make the remote flag consistent in names and setters/getters
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
tuscany/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java?rev=786602&r1=786601&r2=786602&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java Fri Jun 19 17:45:46 2009
@@ -133,14 +133,14 @@
*
* @return true if the endpoint is remote
*/
- boolean isRemoteReference();
+ boolean isRemote();
/**
* Set true if this endpoint represents a serivce that is not
* running in this JVM
*
- * @param isRemoteReference set to true if the endpoint is remote
+ * @param remote set to true if the endpoint is remote
*/
- void setIsRemoteReference(boolean isRemoteReference);
+ void setRemote(boolean remote);
}
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java?rev=786602&r1=786601&r2=786602&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java Fri Jun 19 17:45:46 2009
@@ -146,15 +146,15 @@
*
* @return true if the endpoint is remote
*/
- boolean isRemoteReference();
+ boolean isRemote();
/**
* Set true if this endpoint reference refers to an endpoint that
* is not running in this endpoint reference
*
- * @param isRemoteReference set to true if the endpoint is remote
+ * @param remote set to true if the endpoint is remote
*/
- void setIsRemoteReference(boolean isRemoteReference);
+ void setRemote(boolean remote);
/**
* Set the extension point registry against the endpoint after it is deserialized as
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java?rev=786602&r1=786601&r2=786602&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java Fri Jun 19 17:45:46 2009
@@ -211,7 +211,7 @@
// add an unresolved endpoint reference with an unresolved endpoint to go with it
EndpointReference endpointRef = createEndpointRef( component, reference, true );
endpointRef.setTargetEndpoint(createEndpoint(component, targetName));
- endpointRef.setIsRemoteReference(true);
+ endpointRef.setRemote(true);
reference.getEndpointReferences().add(endpointRef);
warning(monitor, "ComponentReferenceTargetNotFound",
composite,
@@ -247,7 +247,7 @@
// they are doing and mark in as already resolved.
endpointRef.setTargetEndpoint(createEndpoint(false));
}
- endpointRef.setIsRemoteReference(true);
+ endpointRef.setRemote(true);
reference.getEndpointReferences().add(endpointRef);
continue;
} // end if
@@ -293,7 +293,7 @@
Endpoint endpoint = createEndpoint( false );
endpoint.setBinding(binding);
endpointRef.setTargetEndpoint(endpoint);
- endpointRef.setIsRemoteReference(true);
+ endpointRef.setRemote(true);
reference.getEndpointReferences().add(endpointRef);
} // end if
}
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java?rev=786602&r1=786601&r2=786602&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java Fri Jun 19 17:45:46 2009
@@ -51,7 +51,7 @@
protected List<EndpointReference> callbackEndpointReferences = new ArrayList<EndpointReference>();
protected List<PolicySet> policySets = new ArrayList<PolicySet>();
protected List<Intent> requiredIntents = new ArrayList<Intent>();
- protected boolean isRemoteReference = false;
+ protected boolean remote = false;
protected EndpointImpl(ExtensionPointRegistry registry) {
this.registry = registry;
@@ -188,11 +188,11 @@
this.registry = registry;
}
- public boolean isRemoteReference() {
- return isRemoteReference;
+ public boolean isRemote() {
+ return remote;
}
- public void setIsRemoteReference(boolean isRemoteReference) {
- this.isRemoteReference = isRemoteReference;
+ public void setRemote(boolean remote) {
+ this.remote = remote;
}
}
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java?rev=786602&r1=786601&r2=786602&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java Fri Jun 19 17:45:46 2009
@@ -49,7 +49,7 @@
protected List<PolicySet> policySets = new ArrayList<PolicySet>();
protected List<Intent> requiredIntents = new ArrayList<Intent>();
protected InterfaceContract interfaceContract;
- protected boolean isRemoteReference = false;
+ protected boolean remote = false;
// the target of the endpoint reference
protected Endpoint targetEndpoint;
@@ -201,12 +201,12 @@
this.uri = uri;
}
- public boolean isRemoteReference() {
- return isRemoteReference;
+ public boolean isRemote() {
+ return remote;
}
- public void setIsRemoteReference(boolean isRemoteReference) {
- this.isRemoteReference = isRemoteReference;
+ public void setRemote(boolean remote) {
+ this.remote = remote;
}
protected void resolve() {
Modified: tuscany/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java?rev=786602&r1=786601&r2=786602&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java (original)
+++ tuscany/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java Fri Jun 19 17:45:46 2009
@@ -104,8 +104,8 @@
} else {
targetIsRemote = true;
}
- } if ( (endpointReference.isRemoteReference()) &&
- (endpointReference.getTargetEndpoint().isRemoteReference())){
+ } if ( (endpointReference.isRemote()) &&
+ (endpointReference.getTargetEndpoint().isRemote())){
targetIsRemote = true;
} else {
// the case where the wire is specified by URI, e.g. callbacks or user specified bindings, and
Modified: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java?rev=786602&r1=786601&r2=786602&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java Fri Jun 19 17:45:46 2009
@@ -36,8 +36,10 @@
import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.builder.EndpointReferenceBuilder;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.core.conversation.ConversationManager;
+import org.apache.tuscany.sca.core.invocation.ExtensibleWireProcessor;
import org.apache.tuscany.sca.core.invocation.NonBlockingInterceptor;
import org.apache.tuscany.sca.core.invocation.RuntimeWireInvoker;
import org.apache.tuscany.sca.core.invocation.impl.InvocationChainImpl;
@@ -65,6 +67,7 @@
import org.apache.tuscany.sca.runtime.RuntimeComponentService;
import org.apache.tuscany.sca.runtime.RuntimeWire;
import org.apache.tuscany.sca.runtime.RuntimeWireProcessor;
+import org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint;
import org.apache.tuscany.sca.work.WorkScheduler;
import org.oasisopen.sca.ServiceRuntimeException;
@@ -134,6 +137,28 @@
this.providerFactories = extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);
}
+ public RuntimeWireImpl(ExtensionPointRegistry extensionPoints,
+ boolean isReferenceWire,
+ EndpointReference endpointReference,
+ Endpoint endpoint) {
+ super();
+ this.extensionPoints = extensionPoints;
+ this.isReferenceWire = isReferenceWire;
+ this.endpointReference = endpointReference;
+ this.endpoint = endpoint;
+
+ UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
+ this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
+ this.workScheduler = utilities.getUtility(WorkScheduler.class);
+ this.wireProcessor = new ExtensibleWireProcessor(extensionPoints.getExtensionPoint(RuntimeWireProcessorExtensionPoint.class));
+ FactoryExtensionPoint factories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
+ this.messageFactory = factories.getFactory(MessageFactory.class);
+ this.conversationManager = utilities.getUtility(ConversationManager.class);
+ this.invoker = new RuntimeWireInvoker(this.messageFactory, this.conversationManager, this);
+
+ this.endpointReferenceBuilder = utilities.getUtility(EndpointReferenceBuilder.class);
+ this.providerFactories = extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);
+ }
public synchronized List<InvocationChain> getInvocationChains() {
if (chains == null) {
initInvocationChains();
@@ -240,7 +265,7 @@
private void initInvocationChains() {
chains = new ArrayList<InvocationChain>();
InterfaceContract sourceContract = endpointReference.getInterfaceContract();
- // TODO - EPR why is this looking at the component types. The endpoint reference should have the right interface contract by this time
+ // TODO - EPR why is this looking at the component types. The endpoint reference should have the right interface contract by this time
//InterfaceContract sourceContract = getLeafInterfaceContract(endpointReference);
if (isReferenceWire) {
@@ -250,7 +275,7 @@
InterfaceContract targetContract = endpoint.getInterfaceContract();
// TODO - EPR why is this looking at the component types. The endpoint should have the right interface contract by this time
//InterfaceContract targetContract = getLeafInterfaceContract(endpoint);
-
+
RuntimeComponentReference reference = (RuntimeComponentReference)endpointReference.getReference();
Binding refBinding = endpointReference.getBinding();
for (Operation operation : sourceContract.getInterface().getOperations()) {
@@ -446,7 +471,7 @@
// TODO - EPR remove when we convert fully over to EndpointReference2
// TODO - remove. Just here during development
-/*
+/*
static EndpointReference epr;
public EndpointReference getSource() {
@@ -488,7 +513,7 @@
// TODO - can we use the idea of setTarget to rebuild the wire?
}
-*/
+*/
// ===================================================================
@@ -506,7 +531,7 @@
public EndpointReference getEndpointReference() {
return endpointReference;
}
-
+
public Endpoint getEndpoint() {
return endpoint;
}
@@ -647,7 +672,7 @@
}
public synchronized RuntimeWire lookupCache(Endpoint callback) {
- if (lastCallback != null &&
+ if (lastCallback != null &&
callback.getURI().equals(lastCallback.getURI()) &&
!wireReserved) {
wireReserved = true;