You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/06/11 18:55:46 UTC
svn commit: r783845 [1/2] - in /tuscany/java/sca:
itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/
modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/
modules/assembly-xml/src/main/resources/META-INF/services/ modul...
Author: slaws
Date: Thu Jun 11 16:55:44 2009
New Revision: 783845
URL: http://svn.apache.org/viewvc?rev=783845&view=rev
Log:
TUSCANY-3091 rename Endpoint2 and EndpointReference2 to remove the 2 subscript now they are in use full time
Added:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
- copied, changed from r783685, tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
- copied, changed from r783685, tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
- copied, changed from r783685, tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
- copied, changed from r783685, tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java
Removed:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java
Modified:
tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
tuscany/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.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/builder/impl/ComponentServiceEndpointBuilderImpl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
tuscany/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java
tuscany/java/sca/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java
tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java
tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
tuscany/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
Modified: tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java (original)
+++ tuscany/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java Thu Jun 11 16:55:44 2009
@@ -38,8 +38,8 @@
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.Implementation;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
@@ -216,7 +216,7 @@
// print component service endpoints
for (ComponentService componentService : component.getServices()) {
buffer += indent + "Service - " + componentService.getName() + "\n";
- for (Endpoint2 endpoint : componentService.getEndpoints()) {
+ for (Endpoint endpoint : componentService.getEndpoints()) {
if (endpoint.getBinding() != null){
buffer += printEndpoint(endpoint, indent);
}
@@ -225,7 +225,7 @@
for (ComponentReference componentReference : component.getReferences()) {
buffer += indent + "Reference - " + componentReference.getName() + "\n";
- for (EndpointReference2 endpointReference : componentReference.getEndpointReferences()) {
+ for (EndpointReference endpointReference : componentReference.getEndpointReferences()) {
buffer += printEndpointReference(endpointReference, indent);
}
}
@@ -241,7 +241,7 @@
return buffer;
}
- protected static String printEndpoint(Endpoint2 endpoint, String indent){
+ protected static String printEndpoint(Endpoint endpoint, String indent){
String buffer = "";
buffer += indent + " Endpoint - Component: " + endpoint.getComponent().getName() +"\n";
@@ -251,7 +251,7 @@
return buffer;
}
- protected static String printEndpointReference(EndpointReference2 endpointReference, String indent){
+ protected static String printEndpointReference(EndpointReference endpointReference, String indent){
String buffer = "";
buffer += indent + " EndpointReference - Component: " + endpointReference.getComponent().getName() +"\n";
Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java Thu Jun 11 16:55:44 2009
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Endpoint2;
+import org.apache.tuscany.sca.assembly.Endpoint;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
@@ -42,7 +42,7 @@
/**
*
*/
-public class EndpointProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor<Endpoint2> {
+public class EndpointProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor<Endpoint> {
private final static String ENDPOINT = "endpoint";
private final static QName ENDPOINT_QNAME = new QName(Constants.SCA11_TUSCANY_NS, ENDPOINT);
@@ -71,8 +71,8 @@
return ENDPOINT_QNAME;
}
- public Endpoint2 read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
- Endpoint2 endpoint = assemblyFactory.createEndpoint();
+ public Endpoint read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+ Endpoint endpoint = assemblyFactory.createEndpoint();
reader.nextTag();
Object model = extensionProcessor.read(reader);
if (model instanceof Composite) {
@@ -87,13 +87,13 @@
return endpoint;
}
- public void write(Endpoint2 model, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+ public void write(Endpoint model, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
// writeStart(writer, ENDPOINT_QNAME);
extensionProcessor.write(wrap(model), writer);
// writeEnd(writer);
}
- private Composite wrap(Endpoint2 endpoint) {
+ private Composite wrap(Endpoint endpoint) {
try {
Composite composite = assemblyFactory.createComposite();
composite.setName(ENDPOINT_QNAME);
@@ -113,10 +113,10 @@
}
}
- public Class<Endpoint2> getModelType() {
- return Endpoint2.class;
+ public Class<Endpoint> getModelType() {
+ return Endpoint.class;
}
- public void resolve(Endpoint2 model, ModelResolver resolver) throws ContributionResolveException {
+ public void resolve(Endpoint model, ModelResolver resolver) throws ContributionResolveException {
}
}
Modified: tuscany/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Thu Jun 11 16:55:44 2009
@@ -20,4 +20,4 @@
org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#constrainingType,model=org.apache.tuscany.sca.assembly.ConstrainingType
org.apache.tuscany.sca.assembly.xml.CompositeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#composite,model=org.apache.tuscany.sca.assembly.Composite
org.apache.tuscany.sca.assembly.xml.SCABindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding
-org.apache.tuscany.sca.assembly.xml.EndpointProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.rmi#endpoint,model=org.apache.tuscany.sca.assembly.Endpoint2
\ No newline at end of file
+org.apache.tuscany.sca.assembly.xml.EndpointProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.rmi#endpoint,model=org.apache.tuscany.sca.assembly.Endpoint
\ No newline at end of file
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java Thu Jun 11 16:55:44 2009
@@ -32,8 +32,8 @@
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderExtensionPoint;
@@ -130,8 +130,8 @@
new QName(namespaceUri, "tuscanyIntent_1"));
Component component = composite.getComponents().get(0);
- Endpoint2 ep = component.getServices().get(0).getEndpoints().get(0);
- EndpointReference2 epr = component.getReferences().get(0).getEndpointReferences().get(0);
+ Endpoint ep = component.getServices().get(0).getEndpoints().get(0);
+ EndpointReference epr = component.getReferences().get(0).getEndpointReferences().get(0);
System.out.println(ep.getRequiredIntents());
System.out.println(epr.getRequiredIntents());
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java Thu Jun 11 16:55:44 2009
@@ -158,12 +158,12 @@
*
* @return a new endpoint
*/
- Endpoint2 createEndpoint();
+ Endpoint createEndpoint();
/**
* Create a new endpoint reference
*
* @return a new endpoint reference
*/
- EndpointReference2 createEndpointReference();
+ EndpointReference createEndpointReference();
}
Copied: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java (from r783685, tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java?p2=tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java&p1=tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java&r1=783685&r2=783845&rev=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java Thu Jun 11 16:55:44 2009
@@ -32,7 +32,7 @@
*
* @version $Rev$ $Date$
*/
-public interface Endpoint2 extends Base, PolicySubject, Cloneable, Serializable {
+public interface Endpoint extends Base, PolicySubject, Cloneable, Serializable {
/**
* Get the structural URI of the service binding
* @return structural URI of the service/binding
@@ -158,6 +158,6 @@
*
* @return callbackEndpoint the reference callback endpoint
*/
- List<EndpointReference2> getCallbackEndpointReferences();
+ List<EndpointReference> getCallbackEndpointReferences();
}
Copied: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java (from r783685, tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java?p2=tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java&p1=tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java&r1=783685&r2=783845&rev=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java Thu Jun 11 16:55:44 2009
@@ -30,7 +30,7 @@
*
* @version $Rev$ $Date$
*/
-public interface EndpointReference2 extends Base, PolicySubject, Cloneable, Serializable {
+public interface EndpointReference extends Base, PolicySubject, Cloneable, Serializable {
/**
* Get the structural URI of the reference binding
* @return The structural URI of the reference/binding
@@ -100,14 +100,14 @@
*
* @return endpoint the target endpoint
*/
- Endpoint2 getTargetEndpoint();
+ Endpoint getTargetEndpoint();
/**
* Set the target endpoint model object
*
* @param endpoint the target endpoint
*/
- void setTargetEndpoint(Endpoint2 targetEndpoint);
+ void setTargetEndpoint(Endpoint targetEndpoint);
/**
* Returns the interface contract defining the interface
@@ -130,12 +130,12 @@
*
* @return callbackEndpoint the reference callback endpoint
*/
- Endpoint2 getCallbackEndpoint();
+ Endpoint getCallbackEndpoint();
/**
* Set the reference callback endpoint
*
* @param callbackEndpoint the reference callback endpoint
*/
- void setCallbackEndpoint(Endpoint2 callbackEndpoint);
+ void setCallbackEndpoint(Endpoint callbackEndpoint);
}
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java Thu Jun 11 16:55:44 2009
@@ -82,6 +82,6 @@
*
* @return the endpoint references implied by this reference
*/
- List<EndpointReference2> getEndpointReferences();
+ List<EndpointReference> getEndpointReferences();
}
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java Thu Jun 11 16:55:44 2009
@@ -37,5 +37,5 @@
*
* @return the endpoints implied by this service
*/
- List<Endpoint2> getEndpoints();
+ List<Endpoint> getEndpoints();
}
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java Thu Jun 11 16:55:44 2009
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.assembly.builder;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.monitor.Monitor;
/**
@@ -38,6 +38,6 @@
* @param endpointReference
* @param monitor
*/
- void build(EndpointReference2 endpointReference, Monitor monitor);
+ void build(EndpointReference endpointReference, Monitor monitor);
}
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=783845&r1=783844&r2=783845&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 Thu Jun 11 16:55:44 2009
@@ -31,8 +31,8 @@
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.Implementation;
import org.apache.tuscany.sca.assembly.Multiplicity;
import org.apache.tuscany.sca.assembly.SCABinding;
@@ -114,7 +114,7 @@
if ((service.getInterfaceContract() != null) &&
(service.getInterfaceContract().getCallbackInterface() != null)){
if ( reference.getName().equals(service.getName())){
- for ( Endpoint2 endpoint : service.getEndpoints()){
+ for ( Endpoint endpoint : service.getEndpoints()){
endpoint.getCallbackEndpointReferences().addAll(reference.getEndpointReferences());
}
break;
@@ -150,7 +150,7 @@
targetComponentService.getInterfaceContract())) {
// create endpoint reference - with a dummy endpoint which will be replaced when policies
// are matched and bindings are configured later
- EndpointReference2 endpointRef = createEndpointRef( component, reference, false );
+ EndpointReference endpointRef = createEndpointRef( component, reference, false );
endpointRef.setTargetEndpoint( createEndpoint(targetComponent, targetComponentService, true) );
reference.getEndpointReferences().add(endpointRef);
@@ -196,7 +196,7 @@
// create endpoint reference - with dummy endpoint which will be replaced when policies
// are matched and bindings are configured later
- EndpointReference2 endpointRef = createEndpointRef( component, reference, false );
+ EndpointReference endpointRef = createEndpointRef( component, reference, false );
endpointRef.setTargetEndpoint(createEndpoint(targetComponent, targetComponentService, true));
reference.getEndpointReferences().add(endpointRef);
} else {
@@ -208,7 +208,7 @@
}
} else {
// add an unresolved endpoint reference with an unresolved endpoint to go with it
- EndpointReference2 endpointRef = createEndpointRef( component, reference, true );
+ EndpointReference endpointRef = createEndpointRef( component, reference, true );
endpointRef.setTargetEndpoint(createEndpoint(component, targetName));
reference.getEndpointReferences().add(endpointRef);
warning(monitor, "ComponentReferenceTargetNotFound",
@@ -234,7 +234,7 @@
// create endpoint reference for manually configured bindings with a resolved endpoint to
// signify that this reference is pointing at some unwired endpoint
- EndpointReference2 endpointRef = createEndpointRef( component, reference,
+ EndpointReference endpointRef = createEndpointRef( component, reference,
binding, null, false );
endpointRef.setTargetEndpoint(createEndpoint(false));
reference.getEndpointReferences().add(endpointRef);
@@ -264,7 +264,7 @@
targetComponentService.getInterfaceContract())) {
// create endpoint reference with dummy endpoint which will be replaced when policies
// are matched and bindings are configured later
- EndpointReference2 endpointRef = createEndpointRef( component, reference, binding, null, false );
+ EndpointReference endpointRef = createEndpointRef( component, reference, binding, null, false );
endpointRef.setTargetEndpoint(createEndpoint(targetComponent, targetComponentService, true));
reference.getEndpointReferences().add(endpointRef);
} else {
@@ -277,7 +277,7 @@
} else {
// create endpoint reference for manually configured bindings with resolved endpoint
// to signify that this reference is pointing at some unwired endpoint
- EndpointReference2 endpointRef = createEndpointRef( component, reference, binding, null, false );
+ EndpointReference endpointRef = createEndpointRef( component, reference, binding, null, false );
endpointRef.setTargetEndpoint(createEndpoint( false ));
reference.getEndpointReferences().add(endpointRef);
} // end if
@@ -302,7 +302,7 @@
// Find all the leafmost component references related to this component reference
EndpointrefInfo refInfo = gatherEndpointrefInfo( component, reference, null );
- List<Endpoint2> endpoints = getReferenceEndpoints( composite, component,
+ List<Endpoint> endpoints = getReferenceEndpoints( composite, component,
reference, components, componentServices );
Multiplicity multiplicity = reference.getMultiplicity();
@@ -324,14 +324,14 @@
ComponentReference leafReference = refInfo.getRefs().get(i);
boolean unresolved = false;
- for( Endpoint2 endpoint : endpoints ) {
+ for( Endpoint endpoint : endpoints ) {
if( endpoint.isUnresolved() && endpoint.getComponent() == null && endpoint.getService() == null ) {
unresolved = true;
} else {
unresolved = false;
} // end if
// Create an EndpointReference pointing at the endpoint
- EndpointReference2 endRef = createEndpointRef( leafComponent, leafReference,
+ EndpointReference endRef = createEndpointRef( leafComponent, leafReference,
endpoint.getBinding(), endpoint, unresolved);
// Add the EndpointReference to the top level AND the leaf level reference, if not the same!!
if( useNew ) {
@@ -351,7 +351,7 @@
} // end method createReferenceEndpointReferences2
- private List<Endpoint2> getReferenceEndpoints(Composite composite, Component component,
+ private List<Endpoint> getReferenceEndpoints(Composite composite, Component component,
ComponentReference reference, Map<String, Component> components,
Map<String, ComponentService> componentServices ) {
// Target services for a component reference are specified in one of a number of ways, in order:
@@ -361,7 +361,7 @@
// are compatible with the reference
// 1. takes precedence over 2. - 3. is only used if neither of the other applies
- List<Endpoint2> endpoints = new ArrayList<Endpoint2>();
+ List<Endpoint> endpoints = new ArrayList<Endpoint>();
// Get targets for references that are callbacks...
if( getReferenceCallbackEndpoints( composite, component, reference,
@@ -396,13 +396,13 @@
*/
private boolean getReferenceCallbackEndpoints( Composite composite, Component component,
ComponentReference reference, Map<String, Component> components,
- Map<String, ComponentService> componentServices, List<Endpoint2> endpoints ) {
+ Map<String, ComponentService> componentServices, List<Endpoint> endpoints ) {
// Only if this reference is a callback are there any endpoints of this kind
if( reference.isCallback() ) {
// add an unresolved endpoint reference with an unresolved endpoint to go with it
// there will be one of these for each binding on the reference
for( Binding binding : reference.getBindings() ) {
- Endpoint2 endpoint = createEndpoint(true);
+ Endpoint endpoint = createEndpoint(true);
endpoint.setBinding(binding);
endpoints.add( endpoint );
} // end for
@@ -425,7 +425,7 @@
*/
private boolean getReferenceTargetEndpoints( Composite composite, Component component,
ComponentReference reference, Map<String, Component> components,
- Map<String, ComponentService> componentServices, List<Endpoint2> endpoints ) {
+ Map<String, ComponentService> componentServices, List<Endpoint> endpoints ) {
List<ComponentService> refTargets = getReferenceTargets( reference );
if ( !refTargets.isEmpty() ) {
@@ -442,11 +442,11 @@
// create endpoint reference - with dummy endpoint which will be replaced when policies
// are matched and bindings are configured later
// TODO
- Endpoint2 endpoint = selectTargetEndpoint( reference, targetComponentService );
+ Endpoint endpoint = selectTargetEndpoint( reference, targetComponentService );
System.out.println("Selected Endpoint: component=" + endpoint.getComponent().getName() +
" service=" + endpoint.getService().getName() +
" binding=" + endpoint.getBinding().toString());
- Endpoint2 endpoint2 = createEndpoint(targetComponent, targetComponentService, true);
+ Endpoint endpoint2 = createEndpoint(targetComponent, targetComponentService, true);
endpoint2.setBinding( endpoint.getBinding() );
endpoints.add( endpoint2 );
} else {
@@ -477,11 +477,11 @@
* This will in practice select a particular binding on the service if there is more than one endpoint on the
* service. If there are no matches, this method returns null
*/
- private Endpoint2 selectTargetEndpoint( ComponentReference reference, ComponentService service ) {
+ private Endpoint selectTargetEndpoint( ComponentReference reference, ComponentService service ) {
// Return the first endpoint with a Binding which is compatible with the policy requirements on
// the reference
- for( Endpoint2 endpoint : service.getEndpoints() ) {
+ for( Endpoint endpoint : service.getEndpoints() ) {
return endpoint;
} //end for
@@ -500,7 +500,7 @@
*/
private boolean getReferenceBindingEndpoints( Composite composite, Component component,
ComponentReference reference, Map<String, Component> components,
- Map<String, ComponentService> componentServices, List<Endpoint2> endpoints ) {
+ Map<String, ComponentService> componentServices, List<Endpoint> endpoints ) {
// Get service endpoints declared by <binding/> subelements
if( bindingsIdentifyTargets( reference ) ) {
for (Binding binding : reference.getBindings()) {
@@ -515,7 +515,7 @@
if( !reference.isCallback() && (binding instanceof SCABinding) ) continue;
// create an unwired endpoint containing the binding
- Endpoint2 endpoint = createEndpoint( false );
+ Endpoint endpoint = createEndpoint( false );
endpoint.setBinding( binding );
endpoints.add( endpoint );
continue;
@@ -569,7 +569,7 @@
*/
private boolean getReferenceAutowireEndpoints( Composite composite, Component component,
ComponentReference reference, Map<String, Component> components,
- Map<String, ComponentService> componentServices, List<Endpoint2> endpoints ) {
+ Map<String, ComponentService> componentServices, List<Endpoint> endpoints ) {
// Get compatible target services if @autowire=true is specified
if ( reference.getAutowire() == Boolean.TRUE ) {
@@ -809,9 +809,9 @@
* @param unresolved
* @return the endpoint reference
*/
- private EndpointReference2 createEndpointRef( Component component, ComponentReference reference,
- Binding binding, Endpoint2 endpoint, boolean unresolved ) {
- EndpointReference2 endpointRef = createEndpointRef( component, reference, unresolved );
+ private EndpointReference createEndpointRef( Component component, ComponentReference reference,
+ Binding binding, Endpoint endpoint, boolean unresolved ) {
+ EndpointReference endpointRef = createEndpointRef( component, reference, unresolved );
endpointRef.setBinding(binding);
endpointRef.setTargetEndpoint(endpoint);
return endpointRef;
@@ -824,8 +824,8 @@
* @param unresolved
* @return the endpoint reference
*/
- private EndpointReference2 createEndpointRef( Component component, ComponentReference reference, boolean unresolved ) {
- EndpointReference2 endpointRef = assemblyFactory.createEndpointReference();
+ private EndpointReference createEndpointRef( Component component, ComponentReference reference, boolean unresolved ) {
+ EndpointReference endpointRef = assemblyFactory.createEndpointReference();
endpointRef.setComponent(component);
endpointRef.setReference(reference);
endpointRef.setUnresolved(unresolved);
@@ -840,8 +840,8 @@
* @param unresolved
* @return the endpoint
*/
- private Endpoint2 createEndpoint( Component component, ComponentService service, boolean unresolved) {
- Endpoint2 endpoint = createEndpoint( unresolved);
+ private Endpoint createEndpoint( Component component, ComponentService service, boolean unresolved) {
+ Endpoint endpoint = createEndpoint( unresolved);
endpoint.setComponent(component);
endpoint.setService(service);
endpoint.setUnresolved(unresolved);
@@ -853,8 +853,8 @@
* @param unresolved
* @return the endpoint
*/
- private Endpoint2 createEndpoint( boolean unresolved) {
- Endpoint2 endpoint = assemblyFactory.createEndpoint();
+ private Endpoint createEndpoint( boolean unresolved) {
+ Endpoint endpoint = assemblyFactory.createEndpoint();
endpoint.setUnresolved(unresolved);
return endpoint;
} // end method createEndpoint
@@ -871,7 +871,7 @@
* </ul>
* @return the endpoint
*/
- private Endpoint2 createEndpoint(Component component, String targetName) {
+ private Endpoint createEndpoint(Component component, String targetName) {
String[] parts = targetName.split("/");
if (parts.length < 1 || parts.length > 3) {
throw new IllegalArgumentException("Invalid target URI: " + targetName);
@@ -902,7 +902,7 @@
uri = uri + "#service(" + parts[1] + ")";
}
- Endpoint2 endpoint = assemblyFactory.createEndpoint();
+ Endpoint endpoint = assemblyFactory.createEndpoint();
endpoint.setUnresolved(true);
endpoint.setURI(uri);
return endpoint;
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java Thu Jun 11 16:55:44 2009
@@ -28,8 +28,8 @@
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.Implementation;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
@@ -104,7 +104,7 @@
} // end if
for (Binding binding : service.getBindings()){
- Endpoint2 endpoint = assemblyFactory.createEndpoint();
+ Endpoint endpoint = assemblyFactory.createEndpoint();
endpoint.setComponent(endpointComponent);
endpoint.setService(endpointService);
endpoint.setBinding(binding);
@@ -127,7 +127,7 @@
// Create an endpoint for each binding which applies to this service
// and copy across the information relating to the endpoint.
for( Binding binding : theBindings ) {
- Endpoint2 endpoint = assemblyFactory.createEndpoint();
+ Endpoint endpoint = assemblyFactory.createEndpoint();
endpoint.setComponent(theInfo.getComponent());
endpoint.setService(theInfo.getComponentService());
endpoint.setBinding(binding);
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java Thu Jun 11 16:55:44 2009
@@ -31,8 +31,8 @@
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.CompositeReference;
import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.Implementation;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
@@ -277,7 +277,7 @@
.getService().getInterfaceContract().getCallbackInterface());
}
- for (Endpoint2 ep : componentService.getEndpoints()) {
+ for (Endpoint ep : componentService.getEndpoints()) {
// Inherit from the componentType.service.interface
if (componentService.getService() != null && componentService.getService().getInterfaceContract() != null) {
inherit(ep, componentService.getService().getInterfaceContract().getInterface());
@@ -322,7 +322,7 @@
componentReference.getReference().getInterfaceContract().getCallbackInterface());
}
- for (EndpointReference2 epr : componentReference.getEndpointReferences()) {
+ for (EndpointReference epr : componentReference.getEndpointReferences()) {
// Inherit from the componentType.reference.interface
if (componentReference.getReference() != null && componentReference.getReference()
.getInterfaceContract() != null) {
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java Thu Jun 11 16:55:44 2009
@@ -27,7 +27,7 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.CompositeReference;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.Multiplicity;
import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.assembly.Reference;
@@ -179,8 +179,8 @@
} // end if
} // end if
// Clone the EndpointReferences from the outer level and add to the promoted reference
- for( EndpointReference2 epRef : reference.getEndpointReferences()){
- EndpointReference2 epRefClone = copyHigherReference( epRef, promotedReference );
+ for( EndpointReference epRef : reference.getEndpointReferences()){
+ EndpointReference epRefClone = copyHigherReference( epRef, promotedReference );
promotedReference.getEndpointReferences().add(epRefClone);
} // end for
} // end if
@@ -206,10 +206,10 @@
* @param promotedReference - the promoted reference
* @return - a copy of the EndpointReference with data merged from the promoted reference
*/
- private static EndpointReference2 copyHigherReference( EndpointReference2 epRef, ComponentReference promotedReference ) {
- EndpointReference2 epRefClone = null;
+ private static EndpointReference copyHigherReference( EndpointReference epRef, ComponentReference promotedReference ) {
+ EndpointReference epRefClone = null;
try {
- epRefClone = (EndpointReference2) epRef.clone();
+ epRefClone = (EndpointReference) epRef.clone();
} catch (Exception e) {
// Ignore (we know that EndpointReference2 can be cloned)
} // end try
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java Thu Jun 11 16:55:44 2009
@@ -33,8 +33,8 @@
import org.apache.tuscany.sca.assembly.CompositeReference;
import org.apache.tuscany.sca.assembly.CompositeService;
import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.Extension;
import org.apache.tuscany.sca.assembly.Property;
import org.apache.tuscany.sca.assembly.Reference;
@@ -127,11 +127,11 @@
return new ExtensionImpl();
}
- public Endpoint2 createEndpoint() {
- return new Endpoint2Impl(registry);
+ public Endpoint createEndpoint() {
+ return new EndpointImpl(registry);
}
- public EndpointReference2 createEndpointReference() {
- return new EndpointReference2Impl(registry);
+ public EndpointReference createEndpointReference() {
+ return new EndpointReferenceImpl(registry);
}
}
Copied: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java (from r783685, tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java?p2=tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java&p1=tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java&r1=783685&r2=783845&rev=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java Thu Jun 11 16:55:44 2009
@@ -24,8 +24,8 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.policy.ExtensionType;
@@ -38,7 +38,7 @@
*
* @version $Rev$ $Date$
*/
-public class Endpoint2Impl implements Endpoint2 {
+public class EndpointImpl implements Endpoint {
private static final long serialVersionUID = 7344399683703812593L;
protected ExtensionPointRegistry registry;
@@ -48,11 +48,11 @@
protected ComponentService service;
protected Binding binding;
protected InterfaceContract interfaceContract;
- protected List<EndpointReference2> callbackEndpointReferences = new ArrayList<EndpointReference2>();
+ protected List<EndpointReference> callbackEndpointReferences = new ArrayList<EndpointReference>();
protected List<PolicySet> policySets = new ArrayList<PolicySet>();
protected List<Intent> requiredIntents = new ArrayList<Intent>();
- protected Endpoint2Impl(ExtensionPointRegistry registry) {
+ protected EndpointImpl(ExtensionPointRegistry registry) {
this.registry = registry;
}
@@ -115,7 +115,7 @@
*
* @return callbackEndpoint the reference callback endpoint
*/
- public List<EndpointReference2> getCallbackEndpointReferences(){
+ public List<EndpointReference> getCallbackEndpointReferences(){
resolve();
return callbackEndpointReferences;
}
Copied: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java (from r783685, tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java?p2=tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java&p1=tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java&r1=783685&r2=783845&rev=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java Thu Jun 11 16:55:44 2009
@@ -24,8 +24,8 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Component;
import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.policy.ExtensionType;
@@ -38,9 +38,8 @@
*
* @version $Rev$ $Date$
*/
-public class EndpointReference2Impl implements EndpointReference2 {
+public class EndpointReferenceImpl implements EndpointReference {
protected ExtensionPointRegistry registry;
- // this endpoint reference
protected boolean unresolved = true;
protected String uri;
protected Component component;
@@ -51,22 +50,22 @@
protected InterfaceContract interfaceContract;
// the target of the endpoint reference
- protected Endpoint2 targetEndpoint;
+ protected Endpoint targetEndpoint;
// callback endpoint that messages across this reference
// will be directed toward
- protected Endpoint2 callbackEndpoint;
+ protected Endpoint callbackEndpoint;
- protected EndpointReference2Impl(ExtensionPointRegistry registry) {
+ protected EndpointReferenceImpl(ExtensionPointRegistry registry){
this.registry = registry;
}
@Override
public Object clone() throws CloneNotSupportedException {
- EndpointReference2 cloned = (EndpointReference2)super.clone();
+ EndpointReference cloned = (EndpointReference)super.clone();
if (targetEndpoint != null){
- cloned.setTargetEndpoint((Endpoint2)targetEndpoint.clone());
+ cloned.setTargetEndpoint((Endpoint)targetEndpoint.clone());
}
return cloned;
@@ -107,11 +106,11 @@
this.uri = null;
}
- public Endpoint2 getTargetEndpoint() {
+ public Endpoint getTargetEndpoint() {
return targetEndpoint;
}
- public void setTargetEndpoint(Endpoint2 targetEndpoint) {
+ public void setTargetEndpoint(Endpoint targetEndpoint) {
this.targetEndpoint = targetEndpoint;
}
@@ -142,11 +141,11 @@
throw new UnsupportedOperationException();
}
- public Endpoint2 getCallbackEndpoint() {
+ public Endpoint getCallbackEndpoint() {
return callbackEndpoint;
}
- public void setCallbackEndpoint(Endpoint2 callbackEndpoint) {
+ public void setCallbackEndpoint(Endpoint callbackEndpoint) {
this.callbackEndpoint = callbackEndpoint;
}
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java Thu Jun 11 16:55:44 2009
@@ -26,7 +26,7 @@
import org.apache.tuscany.sca.assembly.Callback;
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
@@ -41,7 +41,7 @@
private List<ComponentService> targets = new ArrayList<ComponentService>();
private Callback callback;
private boolean promotionOverride;
- private List<EndpointReference2> endpointReferences = new ArrayList<EndpointReference2>();
+ private List<EndpointReference> endpointReferences = new ArrayList<EndpointReference>();
/**
* Constructs a new reference.
@@ -56,10 +56,10 @@
clone.targets = new ArrayList<ComponentService>(targets);
// clone the endpoint references themselves and set the reference pointer back to
// this new refrence
- clone.endpointReferences = new ArrayList<EndpointReference2>();
+ clone.endpointReferences = new ArrayList<EndpointReference>();
- for (EndpointReference2 epr : endpointReferences){
- EndpointReference2 eprClone = (EndpointReference2)epr.clone();
+ for (EndpointReference epr : endpointReferences){
+ EndpointReference eprClone = (EndpointReference)epr.clone();
eprClone.setReference((ComponentReference)clone);
clone.endpointReferences.add(eprClone);
}
@@ -125,7 +125,7 @@
return getInterfaceContract();
}
- public List<EndpointReference2> getEndpointReferences() {
+ public List<EndpointReference> getEndpointReferences() {
return endpointReferences;
}
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java Thu Jun 11 16:55:44 2009
@@ -24,7 +24,7 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.Callback;
-import org.apache.tuscany.sca.assembly.Endpoint2;
+import org.apache.tuscany.sca.assembly.Endpoint;
import org.apache.tuscany.sca.assembly.Service;
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
@@ -36,7 +36,7 @@
public class ServiceImpl extends AbstractServiceImpl implements Service, Cloneable {
private List<Binding> bindings = new ArrayList<Binding>();
private Callback callback;
- private List<Endpoint2> endpoints = new ArrayList<Endpoint2>();
+ private List<Endpoint> endpoints = new ArrayList<Endpoint>();
/**
@@ -92,7 +92,7 @@
return getInterfaceContract();
}
- public List<Endpoint2> getEndpoints() {
+ public List<Endpoint> getEndpoints() {
return endpoints;
}
}
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=783845&r1=783844&r2=783845&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 Thu Jun 11 16:55:44 2009
@@ -23,8 +23,8 @@
import java.util.logging.Logger;
import org.apache.tuscany.sca.assembly.DistributedSCABinding;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.assembly.SCABinding;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
@@ -186,7 +186,7 @@
}
private Invoker getInvoker(RuntimeWire wire, Operation operation) {
- Endpoint2 target = wire.getEndpoint();
+ Endpoint target = wire.getEndpoint();
if (target != null) {
RuntimeComponentService service = (RuntimeComponentService)target.getService();
if (service != null) { // not a callback wire
Modified: tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java Thu Jun 11 16:55:44 2009
@@ -39,7 +39,7 @@
import org.apache.axis2.client.Options;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.tuscany.sca.assembly.Endpoint2;
+import org.apache.tuscany.sca.assembly.Endpoint;
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
import org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token.Axis2TokenAuthenticationPolicy;
import org.apache.tuscany.sca.binding.ws.axis2.policy.configurator.Axis2BindingBasicAuthenticationConfigurator;
@@ -219,7 +219,7 @@
final OperationClient operationClient = serviceClient.getServiceClient().createClient(wsdlOperationName);
operationClient.setOptions(options);
- Endpoint2 callbackEndpoint = msg.getFrom().getCallbackEndpoint();
+ Endpoint callbackEndpoint = msg.getFrom().getCallbackEndpoint();
/* TODO - EPR - not required for OASIS
// set callback endpoint and callback ID for WS-Addressing header
@@ -271,7 +271,7 @@
// if target endpoint was not specified when this invoker was created,
// use dynamically specified target endpoint passed in on this call
if (options.getTo() == null) {
- Endpoint2 ep = msg.getTo();
+ Endpoint ep = msg.getTo();
if (ep != null) {
requestMC.setTo(new EndpointReference(ep.getBinding().getURI()));
} else {
Modified: tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java (original)
+++ tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java Thu Jun 11 16:55:44 2009
@@ -80,8 +80,8 @@
import org.apache.tuscany.sca.assembly.AbstractContract;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceClient.URIResolverImpl;
import org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.token.Axis2TokenAuthenticationPolicy;
@@ -807,10 +807,10 @@
fillQoSContext(msg, inMC);
// if reference parameters are needed, create a new "From" EPR to hold them
- EndpointReference2 from = null;
+ EndpointReference from = null;
if (callbackAddress != null ) {
from = assemblyFactory.createEndpointReference();
- Endpoint2 fromEndpoint = assemblyFactory.createEndpoint();
+ Endpoint fromEndpoint = assemblyFactory.createEndpoint();
from.setTargetEndpoint(fromEndpoint);
// TODO - EPR - need to set callback address
msg.setFrom(from);
Modified: tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java (original)
+++ tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java Thu Jun 11 16:55:44 2009
@@ -20,8 +20,8 @@
import java.util.List;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.interfacedef.Operation;
/**
@@ -47,25 +47,25 @@
* Get the end point reference of the source reference
* @return The end point reference of the reference originating the message
*/
- EndpointReference2 getFrom();
+ EndpointReference getFrom();
/**
* Set the end point reference of the reference originating the message
* @param from The end point reference of the reference originating the message
*/
- void setFrom(EndpointReference2 from);
+ void setFrom(EndpointReference from);
/**
* Get the end point reference of target service
* @return The end point reference of the service that the message targets
*/
- Endpoint2 getTo();
+ Endpoint getTo();
/**
* Set the end point reference of target service
* @param to The end point reference of the service that the message targets
*/
- void setTo(Endpoint2 to);
+ void setTo(Endpoint to);
/**
* Returns the id of the message
Modified: tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java (original)
+++ tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java Thu Jun 11 16:55:44 2009
@@ -21,7 +21,7 @@
import java.util.EventListener;
-import org.apache.tuscany.sca.assembly.Endpoint2;
+import org.apache.tuscany.sca.assembly.Endpoint;
/**
* A listener for endpoint events
@@ -31,16 +31,16 @@
* The method is invoked when a new endpoint is added to the registry
* @param endpoint
*/
- void endpointAdded(Endpoint2 endpoint);
+ void endpointAdded(Endpoint endpoint);
/**
* The method is invoked when an endpoint is removed the registry
* @param endpoint
*/
- void endpointRemoved(Endpoint2 endpoint);
+ void endpointRemoved(Endpoint endpoint);
/**
* The method is invoked when an endpoint is updated in the registry
* @param oldEndpoint
* @param newEndpoint
*/
- void endpointUpdated(Endpoint2 oldEndpoint, Endpoint2 newEndpoint);
+ void endpointUpdated(Endpoint oldEndpoint, Endpoint newEndpoint);
}
Modified: tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java (original)
+++ tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java Thu Jun 11 16:55:44 2009
@@ -21,25 +21,25 @@
import java.util.List;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
/**
* The EndpointRegistry holds the active service endpoints for the SCA domain
*/
public interface EndpointRegistry {
- void addEndpoint(Endpoint2 endpoint);
- void removeEndpoint(Endpoint2 endpoint);
+ void addEndpoint(Endpoint endpoint);
+ void removeEndpoint(Endpoint endpoint);
- Endpoint2 getEndpoint(String uri);
- void updateEndpoint(String uri, Endpoint2 endpoint);
- List<Endpoint2> findEndpoint(EndpointReference2 endpointReference);
- List<Endpoint2> getEndpoints();
-
- void addEndpointReference(EndpointReference2 endpointReference);
- void removeEndpointReference(EndpointReference2 endpointReference);
- List<EndpointReference2> findEndpointReference(Endpoint2 endpoint);
- List<EndpointReference2> getEndpointRefereneces();
+ Endpoint getEndpoint(String uri);
+ void updateEndpoint(String uri, Endpoint endpoint);
+ List<Endpoint> findEndpoint(EndpointReference endpointReference);
+ List<Endpoint> getEndpoints();
+
+ void addEndpointReference(EndpointReference endpointReference);
+ void removeEndpointReference(EndpointReference endpointReference);
+ List<EndpointReference> findEndpointReference(Endpoint endpoint);
+ List<EndpointReference> getEndpointRefereneces();
void addListener(EndpointListener listener);
void removeListener(EndpointListener listener);
Modified: tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java (original)
+++ tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java Thu Jun 11 16:55:44 2009
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.runtime;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
/**
* Parameters for the EndPointReference
@@ -63,9 +63,9 @@
*/
void setCallbackObjectID(Object callbackObjectID);
- EndpointReference2 getCallbackReference();
+ EndpointReference getCallbackReference();
- void setCallbackReference(EndpointReference2 callback);
+ void setCallbackReference(EndpointReference callback);
Object clone() throws CloneNotSupportedException;
}
Modified: tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java (original)
+++ tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java Thu Jun 11 16:55:44 2009
@@ -25,7 +25,7 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.oasisopen.sca.CallableReference;
import org.oasisopen.sca.ComponentContext;
@@ -67,7 +67,7 @@
*/
<B> ServiceReference<B> getServiceReference(Class<B> businessInterface,
RuntimeComponentReference reference,
- EndpointReference2 endpointReference);
+ EndpointReference endpointReference);
/**
* Bind the reference to a target component/componentService
Modified: tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java (original)
+++ tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java Thu Jun 11 16:55:44 2009
@@ -23,7 +23,7 @@
import org.apache.tuscany.sca.assembly.Binding;
import org.apache.tuscany.sca.assembly.ComponentReference;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.provider.PolicyProvider;
@@ -57,7 +57,7 @@
* @param endpointReference The assembly model endpoint reference
* @return The runtime wire
*/
- RuntimeWire getRuntimeWire(EndpointReference2 endpointReference);
+ RuntimeWire getRuntimeWire(EndpointReference endpointReference);
/**
* Returns the reference binding provider associated with this
Modified: tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java (original)
+++ tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java Thu Jun 11 16:55:44 2009
@@ -22,8 +22,8 @@
import java.lang.reflect.InvocationTargetException;
import java.util.List;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.invocation.InvocationChain;
import org.apache.tuscany.sca.invocation.Message;
@@ -68,14 +68,14 @@
*
* @return the endpoint reference that configured this wire
*/
- EndpointReference2 getEndpointReference();
+ EndpointReference getEndpointReference();
/**
* return the endpoint that configured this wire
*
* @return the endpoint that configured this wire
*/
- Endpoint2 getEndpoint();
+ Endpoint getEndpoint();
/**
* Force the invocation chains to be rebuilt
Modified: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java Thu Jun 11 16:55:44 2009
@@ -21,18 +21,18 @@
import java.io.IOException;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
/**
* A utility to seralize/deserialize Endpoint/EndpointReference objects
*/
public interface EndpointSerializer {
- void read(Endpoint2 endpoint, String xml) throws IOException;
+ void read(Endpoint endpoint, String xml) throws IOException;
- String write(Endpoint2 endpoint) throws IOException;
+ String write(Endpoint endpoint) throws IOException;
- void read(EndpointReference2 endpointReference, String xml) throws IOException;
+ void read(EndpointReference endpointReference, String xml) throws IOException;
- String write(EndpointReference2 endpointReference) throws IOException;
+ String write(EndpointReference endpointReference) throws IOException;
}
Modified: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java Thu Jun 11 16:55:44 2009
@@ -25,8 +25,8 @@
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.assembly.impl.RuntimeEndpointImpl;
import org.apache.tuscany.sca.core.assembly.impl.RuntimeComponentImpl;
@@ -79,14 +79,14 @@
*/
@Override
- public Endpoint2 createEndpoint() {
+ public Endpoint createEndpoint() {
// Create an instance of EndpointImpl that can be serialized/deserialized using the Tuscany
// runtime extension points and extensions
return new RuntimeEndpointImpl(registry);
}
@Override
- public EndpointReference2 createEndpointReference() {
+ public EndpointReference createEndpointReference() {
return super.createEndpointReference();
}
Modified: tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java?rev=783845&r1=783844&r2=783845&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java (original)
+++ tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java Thu Jun 11 16:55:44 2009
@@ -31,8 +31,8 @@
import org.apache.tuscany.sca.assembly.ComponentReference;
import org.apache.tuscany.sca.assembly.ComponentService;
import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Endpoint2;
-import org.apache.tuscany.sca.assembly.EndpointReference2;
+import org.apache.tuscany.sca.assembly.Endpoint;
+import org.apache.tuscany.sca.assembly.EndpointReference;
import org.apache.tuscany.sca.assembly.Implementation;
import org.apache.tuscany.sca.assembly.Reference;
import org.apache.tuscany.sca.assembly.Service;
@@ -297,7 +297,7 @@
logger.fine("Activating component service: " + component.getURI() + "#" + service.getName());
}
- for (Endpoint2 endpoint : service.getEndpoints()) {
+ for (Endpoint endpoint : service.getEndpoints()) {
addServiceBindingProvider(component, service, endpoint.getBinding());
}
addServiceWires(component, service);
@@ -362,11 +362,11 @@
RuntimeComponentService runtimeService = (RuntimeComponentService)service;
// Add a wire for each service Endpoint
- for ( Endpoint2 endpoint : runtimeService.getEndpoints()){
+ for ( Endpoint endpoint : runtimeService.getEndpoints()){
// fluff up a fake endpoint reference as we are on the service side
// so we need to represent the reference that will call us
- EndpointReference2 endpointReference = assemblyFactory.createEndpointReference();
+ EndpointReference endpointReference = assemblyFactory.createEndpointReference();
endpointReference.setBinding(endpoint.getBinding());
endpointReference.setTargetEndpoint(endpoint);
@@ -436,7 +436,7 @@
logger.fine("Deactivating component reference: " + component.getURI() + "#" + reference.getName());
}
removeReferenceWires(reference);
- for (EndpointReference2 endpointReference : reference.getEndpointReferences()) {
+ for (EndpointReference endpointReference : reference.getEndpointReferences()) {
if (endpointReference.getBinding() != null){
removeReferenceBindingProvider(component, reference, endpointReference.getBinding());
}
@@ -542,7 +542,7 @@
logger.fine("Starting component service: " + component.getURI() + "#" + service.getName());
}
RuntimeComponentService runtimeService = (RuntimeComponentService)service;
- for (Endpoint2 endpoint : service.getEndpoints()) {
+ for (Endpoint endpoint : service.getEndpoints()) {
endpointRegistry.addEndpoint(endpoint);
final ServiceBindingProvider bindingProvider = runtimeService.getBindingProvider(endpoint.getBinding());
if (bindingProvider != null) {
@@ -589,7 +589,7 @@
if (logger.isLoggable(Level.FINE)) {
logger.fine("Stopping component service: " + component.getURI() + "#" + service.getName());
}
- for (Endpoint2 endpoint : service.getEndpoints()) {
+ for (Endpoint endpoint : service.getEndpoints()) {
endpointRegistry.removeEndpoint(endpoint);
final ServiceBindingProvider bindingProvider = ((RuntimeComponentService)service).getBindingProvider(endpoint.getBinding());
if (bindingProvider != null) {
@@ -609,7 +609,7 @@
}
RuntimeComponentReference runtimeRef = ((RuntimeComponentReference)reference);
- for (EndpointReference2 endpointReference : reference.getEndpointReferences()) {
+ for (EndpointReference endpointReference : reference.getEndpointReferences()) {
final ReferenceBindingProvider bindingProvider = runtimeRef.getBindingProvider(endpointReference.getBinding());
if (bindingProvider != null) {
// Allow bindings to read properties. Requires PropertyPermission read in security policy.
@@ -716,7 +716,7 @@
// be resolved (the service to which it points may not be present in the
// current composite). Endpoint reference resolution takes place when the wire
// is first used (when the chains are created)
- for (EndpointReference2 endpointReference : componentReference.getEndpointReferences()){
+ for (EndpointReference endpointReference : componentReference.getEndpointReferences()){
addReferenceWire(component, componentReference, endpointReference);
endpointRegistry.addEndpointReference(endpointReference);
}
@@ -729,7 +729,7 @@
logger.fine("Stopping component reference: " + component.getURI() + "#" + reference.getName());
}
RuntimeComponentReference runtimeRef = ((RuntimeComponentReference)reference);
- for ( EndpointReference2 endpointReference : runtimeRef.getEndpointReferences()){
+ for ( EndpointReference endpointReference : runtimeRef.getEndpointReferences()){
endpointRegistry.removeEndpointReference(endpointReference);
ReferenceBindingProvider bindingProvider = runtimeRef.getBindingProvider(endpointReference.getBinding());
if (bindingProvider != null) {
@@ -738,7 +738,7 @@
}
}
- private void addReferenceWire(Component component, ComponentReference reference, EndpointReference2 endpointReference) {
+ private void addReferenceWire(Component component, ComponentReference reference, EndpointReference endpointReference) {
RuntimeComponentReference runtimeRef = (RuntimeComponentReference)reference;
// Use the interface contract of the reference on the component type and if there