diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-11 16:55:44 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-06-11 16:55:44 +0000 |
| commit | 17d2f439c3be0f7288c72846a60d42a120dce9ce (patch) | |
| tree | dc5ce7563cdaf63c43c1ad45a526cf93cee0bab3 /java/sca | |
| parent | 5affea192673c86fa818e69705e132b4af364c0b (diff) | |
TUSCANY-3091 rename Endpoint2 and EndpointReference2 to remove the 2 subscript now they are in use full time
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@783845 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca')
55 files changed, 340 insertions, 341 deletions
diff --git a/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java b/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java index fc18012a61..f4d8b094c7 100644 --- a/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java +++ b/java/sca/itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/TestUtils.java @@ -38,8 +38,8 @@ import org.apache.tuscany.sca.assembly.ComponentService; 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 @@ public class TestUtils { // 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 @@ public class TestUtils { 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 @@ public class TestUtils { 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 @@ public class TestUtils { 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"; diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java index be209cb681..8eebf1f5e5 100644 --- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java +++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java @@ -28,7 +28,7 @@ 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.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 @@ import org.apache.tuscany.sca.monitor.Monitor; /**
*
*/
-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 @@ public class EndpointProcessor extends BaseAssemblyProcessor implements StAXArti 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 @@ public class EndpointProcessor extends BaseAssemblyProcessor implements StAXArti 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 EndpointProcessor extends BaseAssemblyProcessor implements StAXArti }
}
- 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 {
}
}
diff --git a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor index 68859d3d98..565fe12329 100644 --- a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor +++ b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor @@ -20,4 +20,4 @@ org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;qname=http://docs.oas 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 diff --git a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java index 7db6d964c4..fa0e9bdf5b 100644 --- a/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java +++ b/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java @@ -32,8 +32,8 @@ import javax.xml.namespace.QName; 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 @@ public class BuildPolicyTestCase { 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()); diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java index cfba7bdc8d..3c850dc053 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java @@ -158,12 +158,12 @@ public interface AssemblyFactory { * * @return a new endpoint */ - Endpoint2 createEndpoint(); + Endpoint createEndpoint(); /** * Create a new endpoint reference * * @return a new endpoint reference */ - EndpointReference2 createEndpointReference(); + EndpointReference createEndpointReference(); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java index f400cf0d01..759fa0900e 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint2.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java @@ -32,7 +32,7 @@ import org.apache.tuscany.sca.policy.PolicySubject; * * @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 @@ public interface Endpoint2 extends Base, PolicySubject, Cloneable, Serializable * * @return callbackEndpoint the reference callback endpoint */ - List<EndpointReference2> getCallbackEndpointReferences(); + List<EndpointReference> getCallbackEndpointReferences(); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java index b6ca379996..446aa2dbac 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference2.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java @@ -30,7 +30,7 @@ import org.apache.tuscany.sca.policy.PolicySubject; * * @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 @@ public interface EndpointReference2 extends Base, PolicySubject, Cloneable, Seri * * @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 @@ public interface EndpointReference2 extends Base, PolicySubject, Cloneable, Seri * * @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); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java index 34b2607b30..08344ca24f 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java @@ -82,6 +82,6 @@ public interface Reference extends AbstractReference, Contract { * * @return the endpoint references implied by this reference */ - List<EndpointReference2> getEndpointReferences(); + List<EndpointReference> getEndpointReferences(); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java index 88ef8c5d6e..e597a50f30 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java @@ -37,5 +37,5 @@ public interface Service extends AbstractService, Contract { * * @return the endpoints implied by this service */ - List<Endpoint2> getEndpoints(); + List<Endpoint> getEndpoints(); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java index 1f62606a83..220d82eab9 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/EndpointReferenceBuilder.java @@ -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 @@ public interface EndpointReferenceBuilder { * @param endpointReference * @param monitor */ - void build(EndpointReference2 endpointReference, Monitor monitor); + void build(EndpointReference endpointReference, Monitor monitor); } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java index 7fd49a9d0d..58a6629608 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentReferenceEndpointReferenceBuilderImpl.java @@ -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.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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI } } 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI } 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI } // 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI */ 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI */ 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI // 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI */ 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI */ 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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * @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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * @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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * @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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * @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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI * </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 @@ public class ComponentReferenceEndpointReferenceBuilderImpl extends BaseBuilderI uri = uri + "#service(" + parts[1] + ")"; } - Endpoint2 endpoint = assemblyFactory.createEndpoint(); + Endpoint endpoint = assemblyFactory.createEndpoint(); endpoint.setUnresolved(true); endpoint.setURI(uri); return endpoint; diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java index e5e97a7190..00674b1f27 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentServiceEndpointBuilderImpl.java @@ -28,8 +28,8 @@ 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.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 @@ public class ComponentServiceEndpointBuilderImpl implements CompositeBuilder { } // 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 @@ public class ComponentServiceEndpointBuilderImpl implements CompositeBuilder { // 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); diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java index d1785e7280..5c3249369b 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositePolicyBuilderImpl.java @@ -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.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 @@ public class CompositePolicyBuilderImpl extends BaseBuilderImpl implements Compo .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 @@ public class CompositePolicyBuilderImpl extends BaseBuilderImpl implements Compo 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) { diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java index 1c6049ad89..9f810a2c60 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceConfigurationUtil.java @@ -27,7 +27,7 @@ import org.apache.tuscany.sca.assembly.AssemblyFactory; 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 @@ abstract class ReferenceConfigurationUtil { } // 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 @@ abstract class ReferenceConfigurationUtil { * @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 diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java index 09b8ff453c..ab43fc5b5d 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java @@ -33,8 +33,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.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 @@ public abstract class AssemblyFactoryImpl implements AssemblyFactory { 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); } } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java index bc5f5899d6..9c00caf01c 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/Endpoint2Impl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java @@ -24,8 +24,8 @@ import java.util.List; 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 @@ import org.apache.tuscany.sca.policy.PolicySubject; * * @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 @@ public class Endpoint2Impl implements Endpoint2 { 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 @@ public class Endpoint2Impl implements Endpoint2 { * * @return callbackEndpoint the reference callback endpoint */ - public List<EndpointReference2> getCallbackEndpointReferences(){ + public List<EndpointReference> getCallbackEndpointReferences(){ resolve(); return callbackEndpointReferences; } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java index c175689082..aa11088727 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReference2Impl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java @@ -24,8 +24,8 @@ import java.util.List; 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 @@ import org.apache.tuscany.sca.policy.PolicySubject; * * @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 @@ public class EndpointReference2Impl implements EndpointReference2 { 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 @@ public class EndpointReference2Impl implements EndpointReference2 { 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 @@ public class EndpointReference2Impl implements EndpointReference2 { throw new UnsupportedOperationException(); } - public Endpoint2 getCallbackEndpoint() { + public Endpoint getCallbackEndpoint() { return callbackEndpoint; } - public void setCallbackEndpoint(Endpoint2 callbackEndpoint) { + public void setCallbackEndpoint(Endpoint callbackEndpoint) { this.callbackEndpoint = callbackEndpoint; } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java index 89a6508a24..454a24225f 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.assembly.Binding; 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 @@ public class ReferenceImpl extends AbstractReferenceImpl implements Reference, C 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 @@ public class ReferenceImpl extends AbstractReferenceImpl implements Reference, C 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 @@ public class ReferenceImpl extends AbstractReferenceImpl implements Reference, C return getInterfaceContract(); } - public List<EndpointReference2> getEndpointReferences() { + public List<EndpointReference> getEndpointReferences() { return endpointReferences; } diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java index a4010400e2..8f1ce29fdb 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java @@ -24,7 +24,7 @@ import java.util.List; 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 @@ import org.apache.tuscany.sca.interfacedef.InterfaceContract; 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 @@ public class ServiceImpl extends AbstractServiceImpl implements Service, Cloneab return getInterfaceContract(); } - public List<Endpoint2> getEndpoints() { + public List<Endpoint> getEndpoints() { return endpoints; } } diff --git a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java b/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java index d1667f7645..d0d5d34d80 100644 --- a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java +++ b/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java @@ -23,8 +23,8 @@ import java.net.URI; 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 @@ public class RuntimeSCAReferenceBindingProvider implements ReferenceBindingProvi } 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 diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java index 9040ef9e4a..0f8ce0a600 100644 --- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java +++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2BindingInvoker.java @@ -39,7 +39,7 @@ import org.apache.axis2.client.OperationClient; 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 @@ public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics { 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 @@ public class Axis2BindingInvoker implements Invoker, DataExchangeSemantics { // 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 { diff --git a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java index 147150f75b..780c11a577 100644 --- a/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java +++ b/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/Axis2ServiceProvider.java @@ -80,8 +80,8 @@ import org.apache.axis2.transport.jms.JMSUtils; 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 @@ public class Axis2ServiceProvider { 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); diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java index bb7dbca046..c9ee00ff85 100644 --- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java +++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java @@ -20,8 +20,8 @@ package org.apache.tuscany.sca.invocation; 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 @@ public interface Message { * 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 diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java index 7de213fbc5..4fa0fbd85f 100644 --- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java +++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointListener.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.runtime; 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 @@ public interface EndpointListener extends EventListener { * 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);
}
diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java index a52ccaf7b7..f449fefa9c 100644 --- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java +++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointRegistry.java @@ -21,25 +21,25 @@ package org.apache.tuscany.sca.runtime; 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);
-
- 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();
+ void addEndpoint(Endpoint endpoint);
+ void removeEndpoint(Endpoint endpoint);
+
+ 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);
diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java index 71768807c4..db78eae395 100644 --- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java +++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java @@ -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 @@ public interface ReferenceParameters extends Cloneable { */ void setCallbackObjectID(Object callbackObjectID); - EndpointReference2 getCallbackReference(); + EndpointReference getCallbackReference(); - void setCallbackReference(EndpointReference2 callback); + void setCallbackReference(EndpointReference callback); Object clone() throws CloneNotSupportedException; } diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java index 6d95bbca1c..d87ba4e1b6 100644 --- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java +++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java @@ -25,7 +25,7 @@ import java.io.Writer; 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 @@ public interface RuntimeComponentContext extends ComponentContext { */ <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, RuntimeComponentReference reference, - EndpointReference2 endpointReference); + EndpointReference endpointReference); /** * Bind the reference to a target component/componentService diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java index a2a6f03b08..0105abd6e4 100644 --- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java +++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java @@ -23,7 +23,7 @@ import java.util.List; 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 @@ public interface RuntimeComponentReference extends ComponentReference { * @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 diff --git a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java index fbd47fd0ea..bd8333ab70 100644 --- a/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java +++ b/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java @@ -22,8 +22,8 @@ package org.apache.tuscany.sca.runtime; 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 @@ public interface RuntimeWire extends Cloneable { * * @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 diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java index ff2c98cefb..4617901c5b 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointSerializer.java @@ -21,18 +21,18 @@ package org.apache.tuscany.sca.core.assembly; 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;
}
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java index 8b03ea7a02..73416f3a9f 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java @@ -25,8 +25,8 @@ import org.apache.tuscany.sca.assembly.Component; 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 @@ public class RuntimeAssemblyFactory extends DefaultAssemblyFactory implements As */ @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(); } diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java index 7e2c508069..27fad24b1f 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/CompositeActivatorImpl.java @@ -31,8 +31,8 @@ import org.apache.tuscany.sca.assembly.Component; 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 @@ public class CompositeActivatorImpl implements CompositeActivator { 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 @@ public class CompositeActivatorImpl implements CompositeActivator { 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 @@ public class CompositeActivatorImpl implements CompositeActivator { 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 @@ public class CompositeActivatorImpl implements CompositeActivator { 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 @@ public class CompositeActivatorImpl implements CompositeActivator { 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 @@ public class CompositeActivatorImpl implements CompositeActivator { } 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 @@ public class CompositeActivatorImpl implements CompositeActivator { // 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 @@ public class CompositeActivatorImpl implements CompositeActivator { 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 @@ public class CompositeActivatorImpl implements CompositeActivator { } } - 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 diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java index 1cef109553..cd86fd21aa 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/EndpointSerializerImpl.java @@ -28,8 +28,8 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-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.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
@@ -39,8 +39,8 @@ import org.apache.tuscany.sca.core.assembly.EndpointSerializer; public class EndpointSerializerImpl implements EndpointSerializer {
private XMLInputFactory inputFactory;
private XMLOutputFactory outputFactory;
- private StAXArtifactProcessor<Endpoint2> processor;
- private StAXArtifactProcessor<EndpointReference2> refProcessor;
+ private StAXArtifactProcessor<Endpoint> processor;
+ private StAXArtifactProcessor<EndpointReference> refProcessor;
public EndpointSerializerImpl(ExtensionPointRegistry registry) {
FactoryExtensionPoint factories = registry.getExtensionPoint(FactoryExtensionPoint.class);
@@ -48,14 +48,14 @@ public class EndpointSerializerImpl implements EndpointSerializer { outputFactory = factories.getFactory(XMLOutputFactory.class);
StAXArtifactProcessorExtensionPoint processors =
registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- processor = processors.getProcessor(Endpoint2.class);
- refProcessor = processors.getProcessor(EndpointReference2.class);
+ processor = processors.getProcessor(Endpoint.class);
+ refProcessor = processors.getProcessor(EndpointReference.class);
}
- public void read(Endpoint2 endpoint, String xml) throws IOException {
+ public void read(Endpoint endpoint, String xml) throws IOException {
try {
XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(xml));
- Endpoint2 result = processor.read(reader);
+ Endpoint result = processor.read(reader);
endpoint.setComponent(result.getComponent());
endpoint.setService(result.getService());
endpoint.setBinding(result.getBinding());
@@ -66,7 +66,7 @@ public class EndpointSerializerImpl implements EndpointSerializer { }
- public String write(Endpoint2 endpoint) throws IOException {
+ public String write(Endpoint endpoint) throws IOException {
StringWriter sw = new StringWriter();
try {
XMLStreamWriter writer = outputFactory.createXMLStreamWriter(sw);
@@ -79,10 +79,10 @@ public class EndpointSerializerImpl implements EndpointSerializer { }
}
- public void read(EndpointReference2 endpointReference, String xml) throws IOException {
+ public void read(EndpointReference endpointReference, String xml) throws IOException {
try {
XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(xml));
- EndpointReference2 result = refProcessor.read(reader);
+ EndpointReference result = refProcessor.read(reader);
reader.close();
endpointReference.setComponent(result.getComponent());
endpointReference.setReference(result.getReference());
@@ -93,7 +93,7 @@ public class EndpointSerializerImpl implements EndpointSerializer { }
}
- public String write(EndpointReference2 endpointReference) throws IOException {
+ public String write(EndpointReference endpointReference) throws IOException {
StringWriter sw = new StringWriter();
try {
XMLStreamWriter writer = outputFactory.createXMLStreamWriter(sw);
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java index 4413bae39c..b2b8c86919 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/ReferenceParametersImpl.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.core.assembly.impl; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.runtime.ReferenceParameters; /** @@ -28,7 +28,7 @@ import org.apache.tuscany.sca.runtime.ReferenceParameters; public class ReferenceParametersImpl implements ReferenceParameters { private Object callbackID; private Object conversationID; - private EndpointReference2 callbackReference; + private EndpointReference callbackReference; private Object callbackObjectID; /** @@ -59,13 +59,13 @@ public class ReferenceParametersImpl implements ReferenceParameters { /** * @see org.apache.tuscany.sca.runtime.ReferenceParameters#getCallbackReference() */ - public EndpointReference2 getCallbackReference() { + public EndpointReference getCallbackReference() { return callbackReference; } /** * @see org.apache.tuscany.sca.runtime.ReferenceParameters#setCallback(java.lang.Object) */ - public void setCallbackReference(EndpointReference2 callback) { + public void setCallbackReference(EndpointReference callback) { this.callbackReference = callback; } diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java index 2026754f57..c0a9f616f6 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeComponentReferenceImpl.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.List; import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.assembly.impl.ComponentReferenceImpl; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.InvocationChain; @@ -71,7 +71,7 @@ public class RuntimeComponentReferenceImpl extends ComponentReferenceImpl implem return null; } - public RuntimeWire getRuntimeWire(EndpointReference2 endpointReference) { + public RuntimeWire getRuntimeWire(EndpointReference endpointReference) { for (RuntimeWire wire : getRuntimeWires()) { if (wire.getEndpointReference() == endpointReference) { return wire; diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java index da21e9f8ba..770d94f211 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java @@ -24,14 +24,14 @@ import java.io.IOException; import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.apache.tuscany.sca.assembly.impl.Endpoint2Impl;
+import org.apache.tuscany.sca.assembly.impl.EndpointImpl;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.assembly.EndpointSerializer;
/**
* Runtime model for Endpoint that supports java serialization
*/
-public class RuntimeEndpointImpl extends Endpoint2Impl implements Externalizable {
+public class RuntimeEndpointImpl extends EndpointImpl implements Externalizable {
/**
* FIXME: What's the best way to get the extension point registry upon deserialization?
* We can expose a method to receive the extension point registry
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java index 1f5e7f0d42..498d6b7db6 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeWireImpl.java @@ -32,8 +32,8 @@ import org.apache.tuscany.sca.assembly.ComponentService; import org.apache.tuscany.sca.assembly.CompositeReference; import org.apache.tuscany.sca.assembly.CompositeService; import org.apache.tuscany.sca.assembly.Contract; -import org.apache.tuscany.sca.assembly.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.builder.EndpointReferenceBuilder; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.UtilityExtensionPoint; @@ -76,8 +76,8 @@ public class RuntimeWireImpl implements RuntimeWire { ExtensionPointRegistry extensionPoints; private Boolean isReferenceWire = false; - private EndpointReference2 endpointReference; - private Endpoint2 endpoint; + private EndpointReference endpointReference; + private Endpoint endpoint; private transient RuntimeWireProcessor wireProcessor; private transient InterfaceContractMapper interfaceContractMapper; @@ -88,7 +88,7 @@ public class RuntimeWireImpl implements RuntimeWire { // the following is a very simple cache that avoids re-cloning a wire // when consecutive callbacks to the same endpoint are made - private Endpoint2 lastCallback; + private Endpoint lastCallback; private RuntimeWire cachedWire; private boolean wireReserved; private RuntimeWireImpl clonedFrom; @@ -110,8 +110,8 @@ public class RuntimeWireImpl implements RuntimeWire { */ public RuntimeWireImpl(ExtensionPointRegistry extensionPoints, boolean isReferenceWire, - EndpointReference2 endpointReference, - Endpoint2 endpoint, + EndpointReference endpointReference, + Endpoint endpoint, InterfaceContractMapper interfaceContractMapper, WorkScheduler workScheduler, RuntimeWireProcessor wireProcessor, @@ -210,7 +210,7 @@ public class RuntimeWireImpl implements RuntimeWire { return current; } - private InterfaceContract getLeafInterfaceContract(EndpointReference2 epr) { + private InterfaceContract getLeafInterfaceContract(EndpointReference epr) { ComponentReference reference = epr.getReference(); if (reference == null) { return epr.getInterfaceContract(); @@ -222,7 +222,7 @@ public class RuntimeWireImpl implements RuntimeWire { return interfaceContract; } - private InterfaceContract getLeafInterfaceContract(Endpoint2 ep) { + private InterfaceContract getLeafInterfaceContract(Endpoint ep) { ComponentService service = ep.getService(); if (service == null) { return ep.getInterfaceContract(); @@ -329,7 +329,7 @@ public class RuntimeWireImpl implements RuntimeWire { } InterfaceContract bindingContract = getInterfaceContract(endpointReference.getReference(), endpointReference.getBinding()); - Endpoint2 endpoint = endpointReference.getTargetEndpoint(); + Endpoint endpoint = endpointReference.getTargetEndpoint(); endpoint.setInterfaceContract(bindingContract); } @@ -497,11 +497,11 @@ public class RuntimeWireImpl implements RuntimeWire { //endpointReference.setInterfaceContract(epr.getInterfaceContract()); } - public EndpointReference2 getEndpointReference() { + public EndpointReference getEndpointReference() { return endpointReference; } - public Endpoint2 getEndpoint() { + public Endpoint getEndpoint() { return endpoint; } @@ -626,7 +626,7 @@ public class RuntimeWireImpl implements RuntimeWire { @Override public Object clone() throws CloneNotSupportedException { RuntimeWireImpl copy = (RuntimeWireImpl)super.clone(); - copy.endpointReference = (EndpointReference2)endpointReference.clone(); + copy.endpointReference = (EndpointReference)endpointReference.clone(); copy.endpoint = copy.endpointReference.getTargetEndpoint(); copy.invoker = new RuntimeWireInvoker(copy.messageFactory, copy.conversationManager, copy); copy.cachedWire = null; // TUSCANY-2630 @@ -640,7 +640,7 @@ public class RuntimeWireImpl implements RuntimeWire { return conversationManager; } - public synchronized RuntimeWire lookupCache(Endpoint2 callback) { + public synchronized RuntimeWire lookupCache(Endpoint callback) { if (lastCallback != null && callback.getURI().equals(lastCallback.getURI()) && !wireReserved) { @@ -651,7 +651,7 @@ public class RuntimeWireImpl implements RuntimeWire { } } - public synchronized void addToCache(Endpoint2 callback, RuntimeWire clonedWire) { + public synchronized void addToCache(Endpoint callback, RuntimeWire clonedWire) { ((RuntimeWireImpl)clonedWire).setClonedFrom(this); lastCallback = callback; cachedWire = clonedWire; diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java index c0464cc153..6762896652 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceExt.java @@ -24,7 +24,7 @@ import java.io.IOException; import javax.xml.stream.XMLStreamReader; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.core.conversation.ConversationExt; import org.apache.tuscany.sca.runtime.RuntimeWire; import org.oasisopen.sca.CallableReference; @@ -58,7 +58,7 @@ public interface CallableReferenceExt<B> extends CallableReference<B>, Externali /** * @return */ - EndpointReference2 getEndpointReference(); + EndpointReference getEndpointReference(); /** * @return diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java index e67872567c..5d26670f3b 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CompositeContext.java @@ -30,7 +30,7 @@ import javax.xml.stream.XMLStreamReader; import org.apache.tuscany.sca.assembly.Component; import org.apache.tuscany.sca.assembly.ComponentReference; import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.Endpoint2; +import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.assembly.CompositeActivator; import org.apache.tuscany.sca.core.conversation.ConversationManager; @@ -146,7 +146,7 @@ public abstract class CompositeContext { public static RuntimeComponent getCurrentComponent() { Message message = ThreadMessageContext.getMessageContext(); if (message != null) { - Endpoint2 to = message.getTo(); + Endpoint to = message.getTo(); if (to == null) { return null; } diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java index d2a222d91e..af42b4a76a 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CallableReferenceImpl.java @@ -32,8 +32,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.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.OptimizableBinding; import org.apache.tuscany.sca.assembly.Reference; import org.apache.tuscany.sca.assembly.SCABinding; @@ -84,7 +84,7 @@ public class CallableReferenceImpl<B> implements CallableReferenceExt<B> { protected transient RuntimeComponent component; protected transient RuntimeComponentReference reference; - protected transient EndpointReference2 endpointReference; + protected transient EndpointReference endpointReference; protected String scdl; @@ -113,7 +113,7 @@ public class CallableReferenceImpl<B> implements CallableReferenceExt<B> { protected CallableReferenceImpl(Class<B> businessInterface, RuntimeComponent component, RuntimeComponentReference reference, - EndpointReference2 endpointReference, + EndpointReference endpointReference, ProxyFactory proxyFactory, CompositeActivator compositeActivator) { this.proxyFactory = proxyFactory; @@ -519,7 +519,7 @@ public class CallableReferenceImpl<B> implements CallableReferenceExt<B> { } // TODO - EPR - needs sorting out for new endpoint references - public EndpointReference2 getEndpointReference() { + public EndpointReference getEndpointReference() { try { resolve(); @@ -529,13 +529,13 @@ public class CallableReferenceImpl<B> implements CallableReferenceExt<B> { componentTypeRef == null ? reference.getInterfaceContract() : componentTypeRef.getInterfaceContract(); sourceContract = sourceContract.makeUnidirectional(false); - EndpointReference2 epr = assemblyFactory.createEndpointReference(); + EndpointReference epr = assemblyFactory.createEndpointReference(); epr.setComponent(component); epr.setReference(reference); //epr.setBinding(binding); epr.setInterfaceContract(sourceContract); - Endpoint2 endpoint = assemblyFactory.createEndpoint(); + Endpoint endpoint = assemblyFactory.createEndpoint(); epr.setTargetEndpoint(endpoint); return epr; diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java index d1bbf4b475..1b248f65c7 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java @@ -30,8 +30,8 @@ import org.apache.tuscany.sca.assembly.Component; import org.apache.tuscany.sca.assembly.ComponentProperty; import org.apache.tuscany.sca.assembly.ComponentReference; 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.assembly.Multiplicity; import org.apache.tuscany.sca.assembly.OptimizableBinding; import org.apache.tuscany.sca.assembly.Reference; @@ -215,7 +215,7 @@ public class ComponentContextImpl implements ComponentContextExt { */ public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, RuntimeComponentReference reference, - EndpointReference2 endpointReference) { + EndpointReference endpointReference) { try { RuntimeComponentReference ref = (RuntimeComponentReference)reference; InterfaceContract interfaceContract = reference.getInterfaceContract(); @@ -345,14 +345,14 @@ public class ComponentContextImpl implements ComponentContextExt { // component.getReferences().add(componentReference); // create endpoint reference - EndpointReference2 endpointReference = assemblyFactory + EndpointReference endpointReference = assemblyFactory .createEndpointReference(); endpointReference.setComponent(component); endpointReference.setReference(componentReference); endpointReference.setUnresolved(false); // create endpoint. - Endpoint2 endpoint = assemblyFactory.createEndpoint(); + Endpoint endpoint = assemblyFactory.createEndpoint(); endpoint.setComponent(component); endpoint.setService(service); endpoint.setUnresolved(true); @@ -452,7 +452,7 @@ public class ComponentContextImpl implements ComponentContextExt { for (ComponentReference ref : component.getReferences()) { if (referenceName.equals(ref.getName())) { ArrayList<ServiceReference<B>> serviceRefs = new ArrayList<ServiceReference<B>>(); - for (EndpointReference2 endpointReference : ref.getEndpointReferences()) { + for (EndpointReference endpointReference : ref.getEndpointReferences()) { serviceRefs .add(getServiceReference(businessInterface, (RuntimeComponentReference)ref, endpointReference)); } diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java index de0ea04fad..2fe223c523 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/CompositeContextImpl.java @@ -39,8 +39,8 @@ import org.apache.tuscany.sca.assembly.Component; 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.Multiplicity; import org.apache.tuscany.sca.assembly.OptimizableBinding; import org.apache.tuscany.sca.assembly.Reference; @@ -275,7 +275,7 @@ public class CompositeContextImpl extends CompositeContext { public static RuntimeComponent getCurrentComponent() { Message message = ThreadMessageContext.getMessageContext(); if (message != null) { - Endpoint2 to = message.getTo(); + Endpoint to = message.getTo(); if (to == null) { return null; } diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java index a701bd50b4..9daf430ad5 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/RequestContextImpl.java @@ -22,7 +22,7 @@ import java.util.List; import javax.security.auth.Subject; -import org.apache.tuscany.sca.assembly.Endpoint2; +import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.core.context.CallableReferenceExt; import org.apache.tuscany.sca.core.invocation.ExtensibleProxyFactory; @@ -71,7 +71,7 @@ public class RequestContextImpl implements RequestContext { public <B> CallableReference<B> getServiceReference() { Message msgContext = ThreadMessageContext.getMessageContext(); // FIXME: [rfeng] Is this the service reference matching the caller side? - Endpoint2 to = msgContext.getTo(); + Endpoint to = msgContext.getTo(); RuntimeComponentService service = (RuntimeComponentService) to.getService(); RuntimeComponent component = (RuntimeComponent) to.getComponent(); @@ -96,7 +96,7 @@ public class RequestContextImpl implements RequestContext { @SuppressWarnings("unchecked") public <CB> CallableReference<CB> getCallbackReference() { Message msgContext = ThreadMessageContext.getMessageContext(); - Endpoint2 to = msgContext.getTo(); + Endpoint to = msgContext.getTo(); RuntimeComponentService service = (RuntimeComponentService) to.getService(); RuntimeComponentReference callbackReference = (RuntimeComponentReference)service.getCallbackReference(); if (callbackReference == null) { diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java index 265b08ed12..086c32ee24 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ServiceReferenceImpl.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.core.context.impl; import javax.xml.stream.XMLStreamReader; import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.core.assembly.CompositeActivator; import org.apache.tuscany.sca.core.context.CallableReferenceExt; import org.apache.tuscany.sca.core.context.ServiceReferenceExt; @@ -79,7 +79,7 @@ public class ServiceReferenceImpl<B> extends CallableReferenceImpl<B> implements public ServiceReferenceImpl(Class<B> businessInterface, RuntimeComponent component, RuntimeComponentReference reference, - EndpointReference2 endpointReference, + EndpointReference endpointReference, ProxyFactory proxyFactory, CompositeActivator compositeActivator) { super(businessInterface, component, reference, endpointReference, proxyFactory, compositeActivator); diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java index 3f4d03ee92..8b0b55f77f 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.core.invocation; import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.core.factory.ObjectCreationException; import org.apache.tuscany.sca.core.factory.ObjectFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; @@ -35,7 +35,7 @@ public class CallableReferenceObjectFactory implements ObjectFactory<CallableRef private Class<?> businessInterface; private RuntimeComponent component; private RuntimeComponentReference reference; - private EndpointReference2 endpointReference; + private EndpointReference endpointReference; /** * Constructor. @@ -50,7 +50,7 @@ public class CallableReferenceObjectFactory implements ObjectFactory<CallableRef public CallableReferenceObjectFactory(Class<?> businessInterface, RuntimeComponent component, RuntimeComponentReference reference, - EndpointReference2 endpointReference) { + EndpointReference endpointReference) { this.businessInterface = businessInterface; this.component = component; this.reference = reference; diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java index 0af48a9add..747a5ba032 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -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.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; @@ -152,19 +152,19 @@ public class NonBlockingInterceptor implements Interceptor { throw new UnsupportedOperationException(); } - public EndpointReference2 getFrom() { + public EndpointReference getFrom() { return null; } - public Endpoint2 getTo() { + public Endpoint getTo() { return null; } - public void setFrom(EndpointReference2 from) { + public void setFrom(EndpointReference from) { throw new UnsupportedOperationException(); } - public void setTo(Endpoint2 to) { + public void setTo(Endpoint to) { throw new UnsupportedOperationException(); } @@ -179,7 +179,7 @@ public class NonBlockingInterceptor implements Interceptor { /** * @see org.apache.tuscany.sca.invocation.Message#getReplyTo() */ - public EndpointReference2 getReplyTo() { + public EndpointReference getReplyTo() { return null; } diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java index 649942f923..ed84de2dd5 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.core.invocation; import java.lang.reflect.InvocationTargetException; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.core.conversation.ConversationExt; import org.apache.tuscany.sca.core.conversation.ConversationManager; import org.apache.tuscany.sca.core.conversation.ConversationState; @@ -108,8 +108,8 @@ public class RuntimeWireInvoker implements Invoker{ } protected Object invoke(InvocationChain chain, Message msg, RuntimeWire wire) throws InvocationTargetException { - EndpointReference2 from = msg.getFrom(); - EndpointReference2 epFrom = wire.getEndpointReference(); + EndpointReference from = msg.getFrom(); + EndpointReference epFrom = wire.getEndpointReference(); if (from != null) { from.setComponent(epFrom.getComponent()); from.setReference(epFrom.getReference()); diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java index 2cd23ef337..b132464a5c 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/CallbackReferenceImpl.java @@ -27,8 +27,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.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.OptimizableBinding;
import org.apache.tuscany.sca.core.assembly.impl.RuntimeComponentReferenceImpl;
import org.apache.tuscany.sca.core.assembly.impl.RuntimeWireImpl;
@@ -52,7 +52,7 @@ import org.apache.tuscany.sca.runtime.RuntimeWire; public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> {
private RuntimeWire wire;
private List<RuntimeWire> wires;
- private Endpoint2 resolvedEndpoint;
+ private Endpoint resolvedEndpoint;
private Object convID;
public static CallbackReferenceImpl newInstance(Class interfaze,
@@ -110,13 +110,13 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> { return convID;
}
- protected Endpoint2 getResolvedEndpoint() {
+ protected Endpoint getResolvedEndpoint() {
return resolvedEndpoint;
}
private RuntimeWire selectCallbackWire(Message msgContext) {
// look for callback binding with same name as service binding
- Endpoint2 to = msgContext.getTo();
+ Endpoint to = msgContext.getTo();
if (to == null) {
//FIXME: need better exception
throw new RuntimeException("Destination for forward call is not available");
@@ -209,7 +209,7 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> { // TODO - EPR - why static & convert to ne endpoint reference
private static RuntimeComponentReference bind(RuntimeComponentReference reference,
- Endpoint2 resolvedEndpoint) throws CloneNotSupportedException {
+ Endpoint resolvedEndpoint) throws CloneNotSupportedException {
RuntimeComponent component = (RuntimeComponent)resolvedEndpoint.getComponent();
RuntimeComponentService service = (RuntimeComponentService)resolvedEndpoint.getService();
@@ -233,8 +233,8 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> { ref.getEndpointReferences().clear();
- for(EndpointReference2 endpointReference : reference.getEndpointReferences()){
- EndpointReference2 clone = (EndpointReference2)endpointReference.clone();
+ for(EndpointReference endpointReference : reference.getEndpointReferences()){
+ EndpointReference clone = (EndpointReference)endpointReference.clone();
clone.setReference(ref);
clone.getBinding().setURI(resolvedEndpoint.getBinding().getURI());
@@ -315,7 +315,7 @@ public class CallbackReferenceImpl<B> extends CallableReferenceImpl<B> { final RuntimeComponentReference ref = new RuntimeComponentReferenceImpl();
ref.setComponent((RuntimeComponent) targetComponent);
ref.setInterfaceContract(targetServiceIfaceContract);
- ((EndpointReference2) this.wire.getEndpointReference()).setReference(ref);
+ ((EndpointReference) this.wire.getEndpointReference()).setReference(ref);
}
/**
diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java index 1c51e365d3..49b9d87096 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/JDKInvocationHandler.java @@ -28,8 +28,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -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.assembly.impl.RuntimeWireImpl; import org.apache.tuscany.sca.core.context.CallableReferenceExt; import org.apache.tuscany.sca.core.context.impl.CallableReferenceImpl; @@ -70,8 +70,8 @@ public class JDKInvocationHandler implements InvocationHandler, Serializable { protected boolean conversational; protected ConversationExt conversation; protected MessageFactory messageFactory; - protected EndpointReference2 source; - protected Endpoint2 target; + protected EndpointReference source; + protected Endpoint target; protected RuntimeWire wire; protected CallableReference<?> callableReference; protected Class<?> businessInterface; @@ -270,11 +270,11 @@ public class JDKInvocationHandler implements InvocationHandler, Serializable { return found; } - protected void setEndpoint(Endpoint2 endpoint) { + protected void setEndpoint(Endpoint endpoint) { this.target = endpoint; } - protected Object invoke(InvocationChain chain, Object[] args, RuntimeWire wire, EndpointReference2 source) + protected Object invoke(InvocationChain chain, Object[] args, RuntimeWire wire, EndpointReference source) throws Throwable { Message msg = messageFactory.createMessage(); msg.setFrom(source); diff --git a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java index bd7b9dcb8f..d24da46b3f 100644 --- a/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java +++ b/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/impl/MessageImpl.java @@ -21,8 +21,8 @@ package org.apache.tuscany.sca.core.invocation.impl; import java.util.ArrayList; 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.Message; @@ -38,8 +38,8 @@ public class MessageImpl implements Message { private boolean isFault; private Operation operation; - private EndpointReference2 from; - private Endpoint2 to; + private EndpointReference from; + private Endpoint to; public MessageImpl() { // TODO - EPR - What to do by default? @@ -76,19 +76,19 @@ public class MessageImpl implements Message { this.body = fault; } - public EndpointReference2 getFrom() { + public EndpointReference getFrom() { return from; } - public void setFrom(EndpointReference2 from) { + public void setFrom(EndpointReference from) { this.from = from; } - public Endpoint2 getTo() { + public Endpoint getTo() { return to; } - public void setTo(Endpoint2 to) { + public void setTo(Endpoint to) { this.to = to; } diff --git a/java/sca/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java b/java/sca/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java index f7dac1ff33..26fa76b14e 100644 --- a/java/sca/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java +++ b/java/sca/modules/endpoint-tribes/src/main/java/org/apache/tuscany/sca/endpoint/tribes/ReplicatedEndpointRegistry.java @@ -33,8 +33,8 @@ import org.apache.catalina.tribes.group.GroupChannel; import org.apache.catalina.tribes.membership.McastService;
import org.apache.catalina.tribes.tipis.AbstractReplicatedMap;
import org.apache.catalina.tribes.tipis.ReplicatedMap;
-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.runtime.EndpointListener;
import org.apache.tuscany.sca.runtime.EndpointRegistry;
@@ -54,7 +54,7 @@ public class ReplicatedEndpointRegistry implements EndpointRegistry { private final static String DEFAULT_DOMAIN_URI = "http://tuscany.apache.org/sca/1.1/domains/default";
private String domainURI = DEFAULT_DOMAIN_URI;
- private List<EndpointReference2> endpointreferences = new CopyOnWriteArrayList<EndpointReference2>();
+ private List<EndpointReference> endpointreferences = new CopyOnWriteArrayList<EndpointReference>();
private List<EndpointListener> listeners = new CopyOnWriteArrayList<EndpointListener>();
private ReplicatedMap map;
@@ -111,7 +111,7 @@ public class ReplicatedEndpointRegistry implements EndpointRegistry { }
}
- public void addEndpoint(Endpoint2 endpoint) {
+ public void addEndpoint(Endpoint endpoint) {
map.put(getURI(endpoint), endpoint);
for (EndpointListener listener : listeners) {
listener.endpointAdded(endpoint);
@@ -119,7 +119,7 @@ public class ReplicatedEndpointRegistry implements EndpointRegistry { logger.info("EndpointRegistry: Add endpoint - " + endpoint);
}
- public void addEndpointReference(EndpointReference2 endpointReference) {
+ public void addEndpointReference(EndpointReference endpointReference) {
endpointreferences.add(endpointReference);
logger.info("EndpointRegistry: Add endpoint reference - " + endpointReference);
}
@@ -172,15 +172,15 @@ public class ReplicatedEndpointRegistry implements EndpointRegistry { return true;
}
- public List<Endpoint2> findEndpoint(EndpointReference2 endpointReference) {
- List<Endpoint2> foundEndpoints = new ArrayList<Endpoint2>();
+ public List<Endpoint> findEndpoint(EndpointReference endpointReference) {
+ List<Endpoint> foundEndpoints = new ArrayList<Endpoint>();
logger.info("EndpointRegistry: Find endpoint for reference - " + endpointReference);
if (endpointReference.getReference() != null) {
- Endpoint2 targetEndpoint = endpointReference.getTargetEndpoint();
+ Endpoint targetEndpoint = endpointReference.getTargetEndpoint();
for (Object v : map.values()) {
- Endpoint2 endpoint = (Endpoint2)v;
+ Endpoint endpoint = (Endpoint)v;
// TODO: implement more complete matching
if (matches(targetEndpoint.getURI(), endpoint.getURI())) {
foundEndpoints.add(endpoint);
@@ -192,27 +192,27 @@ public class ReplicatedEndpointRegistry implements EndpointRegistry { return foundEndpoints;
}
- public List<EndpointReference2> findEndpointReference(Endpoint2 endpoint) {
+ public List<EndpointReference> findEndpointReference(Endpoint endpoint) {
return endpointreferences;
}
- public Endpoint2 getEndpoint(String uri) {
- return (Endpoint2)map.get(uri);
+ public Endpoint getEndpoint(String uri) {
+ return (Endpoint)map.get(uri);
}
- public List<EndpointReference2> getEndpointRefereneces() {
+ public List<EndpointReference> getEndpointRefereneces() {
return endpointreferences;
}
- public List<Endpoint2> getEndpoints() {
- return new ArrayList<Endpoint2>(map.values());
+ public List<Endpoint> getEndpoints() {
+ return new ArrayList<Endpoint>(map.values());
}
public List<EndpointListener> getListeners() {
return listeners;
}
- private String getURI(Endpoint2 ep) {
+ private String getURI(Endpoint ep) {
String bindingName = ep.getBinding().getName();
if (bindingName == null) {
bindingName = ep.getService().getName();
@@ -222,7 +222,7 @@ public class ReplicatedEndpointRegistry implements EndpointRegistry { return epURI;
}
- public void removeEndpoint(Endpoint2 endpoint) {
+ public void removeEndpoint(Endpoint endpoint) {
map.remove(getURI(endpoint));
for (EndpointListener listener : listeners) {
listener.endpointRemoved(endpoint);
@@ -230,7 +230,7 @@ public class ReplicatedEndpointRegistry implements EndpointRegistry { logger.info("EndpointRegistry: Remove endpoint - " + endpoint);
}
- public void removeEndpointReference(EndpointReference2 endpointReference) {
+ public void removeEndpointReference(EndpointReference endpointReference) {
endpointreferences.remove(endpointReference);
logger.info("EndpointRegistry: Remove endpoint reference - " + endpointReference);
}
@@ -239,8 +239,8 @@ public class ReplicatedEndpointRegistry implements EndpointRegistry { listeners.remove(listener);
}
- public void updateEndpoint(String uri, Endpoint2 endpoint) {
- Endpoint2 oldEndpoint = getEndpoint(uri);
+ public void updateEndpoint(String uri, Endpoint endpoint) {
+ Endpoint oldEndpoint = getEndpoint(uri);
if (oldEndpoint == null) {
throw new IllegalArgumentException("Endpoint is not found: " + uri);
}
diff --git a/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java b/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java index 093fba6446..201749e380 100644 --- a/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java +++ b/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointReferenceBuilderImpl.java @@ -25,8 +25,8 @@ import java.util.List; import org.apache.tuscany.sca.assembly.AssemblyFactory; import org.apache.tuscany.sca.assembly.Binding; 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.OptimizableBinding; import org.apache.tuscany.sca.assembly.SCABinding; import org.apache.tuscany.sca.assembly.builder.CompositeBuilder; @@ -167,8 +167,8 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR * @param endpoint * @param monitor */ - public void build(EndpointReference2 endpointReference, Monitor monitor) { - Endpoint2 endpoint = endpointReference.getTargetEndpoint(); + public void build(EndpointReference endpointReference, Monitor monitor) { + Endpoint endpoint = endpointReference.getTargetEndpoint(); if (endpoint == null){ // an error? @@ -194,7 +194,7 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR // The service is in a remote composite somewhere else in the domain // find the service in the endpoint registry - List<Endpoint2> endpoints = endpointRegistry.findEndpoint(endpointReference); + List<Endpoint> endpoints = endpointRegistry.findEndpoint(endpointReference); // TODO - do we exepect to find more than one endpoint in // anything other than the autowire case? @@ -221,19 +221,19 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR // TODO - EPR - In OASIS case there are no bindings to match with on the // reference side. - private void matchForwardBinding(EndpointReference2 endpointReference, + private void matchForwardBinding(EndpointReference endpointReference, boolean local, Monitor monitor) { - Endpoint2 endpoint = endpointReference.getTargetEndpoint(); + Endpoint endpoint = endpointReference.getTargetEndpoint(); List<Binding> matchedReferenceBinding = new ArrayList<Binding>(); - List<Endpoint2> matchedServiceEndpoint = new ArrayList<Endpoint2>(); + List<Endpoint> matchedServiceEndpoint = new ArrayList<Endpoint>(); // Find the corresponding bindings from the service side for (Binding referenceBinding : endpointReference.getReference().getBindings()) { if (local) { - for (Endpoint2 serviceEndpoint : endpoint.getService().getEndpoints()) { + for (Endpoint serviceEndpoint : endpoint.getService().getEndpoints()) { if (referenceBinding.getClass() == serviceEndpoint.getBinding().getClass() && hasCompatiblePolicySets(referenceBinding, serviceEndpoint @@ -244,7 +244,7 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR } } } else { - Endpoint2 serviceEndpoint = endpoint; + Endpoint serviceEndpoint = endpoint; if (referenceBinding.getClass() == serviceEndpoint.getBinding().getClass() && hasCompatiblePolicySets(referenceBinding, serviceEndpoint .getBinding())) { @@ -278,7 +278,7 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR } Binding referenceBinding = matchedReferenceBinding.get(selectedBinding); - Endpoint2 serviceEndpoint = matchedServiceEndpoint.get(selectedBinding); + Endpoint serviceEndpoint = matchedServiceEndpoint.get(selectedBinding); // populate the endpoint reference try { @@ -301,7 +301,7 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR endpointReference.setBinding(clonedBinding); - Endpoint2 clonedEndpoint = (Endpoint2)serviceEndpoint.clone(); + Endpoint clonedEndpoint = (Endpoint)serviceEndpoint.clone(); endpointReference.setTargetEndpoint(clonedEndpoint); endpointReference.setUnresolved(false); @@ -315,7 +315,7 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR // TODO - EPR // Find the callback endpoint for the endpoint reference by matching // callback bindings between reference and service - private void matchCallbackBinding(EndpointReference2 endpointReference, + private void matchCallbackBinding(EndpointReference endpointReference, Monitor monitor) { // if no callback on the interface or we are creating a self reference do nothing @@ -325,17 +325,17 @@ public class EndpointReferenceBuilderImpl implements CompositeBuilder, EndpointR return; } - Endpoint2 endpoint = endpointReference.getTargetEndpoint(); + Endpoint endpoint = endpointReference.getTargetEndpoint(); - List<Endpoint2> callbackEndpoints = endpointReference.getReference().getCallbackService().getEndpoints(); - List<EndpointReference2> callbackEndpointReferences = endpoint.getCallbackEndpointReferences(); + List<Endpoint> callbackEndpoints = endpointReference.getReference().getCallbackService().getEndpoints(); + List<EndpointReference> callbackEndpointReferences = endpoint.getCallbackEndpointReferences(); - List<Endpoint2> matchedEndpoint = new ArrayList<Endpoint2>(); + List<Endpoint> matchedEndpoint = new ArrayList<Endpoint>(); if ((callbackEndpoints != null) && (callbackEndpointReferences != null)){ // Find the corresponding bindings from the service side - for (EndpointReference2 epr : callbackEndpointReferences) { - for (Endpoint2 ep : callbackEndpoints) { + for (EndpointReference epr : callbackEndpointReferences) { + for (Endpoint ep : callbackEndpoints) { if (epr.getBinding().getClass() == ep.getBinding().getClass() && hasCompatiblePolicySets(epr.getBinding(), ep.getBinding())) { diff --git a/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java b/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java index c57fc579c8..b291b0e44e 100644 --- a/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java +++ b/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java @@ -24,8 +24,8 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; -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.runtime.EndpointListener; import org.apache.tuscany.sca.runtime.EndpointRegistry; @@ -33,15 +33,15 @@ import org.apache.tuscany.sca.runtime.EndpointRegistry; public class EndpointRegistryImpl implements EndpointRegistry { private final Logger logger = Logger.getLogger(EndpointRegistryImpl.class.getName()); - static List<Endpoint2> endpoints = new ArrayList<Endpoint2>(); - static List<EndpointReference2> endpointreferences = new ArrayList<EndpointReference2>(); + static List<Endpoint> endpoints = new ArrayList<Endpoint>(); + static List<EndpointReference> endpointreferences = new ArrayList<EndpointReference>(); private List<EndpointListener> listeners = new CopyOnWriteArrayList<EndpointListener>(); public EndpointRegistryImpl(ExtensionPointRegistry extensionPoints) { } - public void addEndpoint(Endpoint2 endpoint) { + public void addEndpoint(Endpoint endpoint) { endpoints.add(endpoint); for (EndpointListener listener : listeners) { listener.endpointAdded(endpoint); @@ -49,7 +49,7 @@ public class EndpointRegistryImpl implements EndpointRegistry { logger.info("EndpointRegistry: Add endpoint - " + endpoint.toString()); } - public void addEndpointReference(EndpointReference2 endpointReference) { + public void addEndpointReference(EndpointReference endpointReference) { endpointreferences.add(endpointReference); logger.info("EndpointRegistry: Add endpoint reference - " + endpointReference.toString()); } @@ -98,14 +98,14 @@ public class EndpointRegistryImpl implements EndpointRegistry { return true; } - public List<Endpoint2> findEndpoint(EndpointReference2 endpointReference) { - List<Endpoint2> foundEndpoints = new ArrayList<Endpoint2>(); + public List<Endpoint> findEndpoint(EndpointReference endpointReference) { + List<Endpoint> foundEndpoints = new ArrayList<Endpoint>(); logger.info("EndpointRegistry: Find endpoint for reference - " + endpointReference.toString()); if (endpointReference.getReference() != null) { - Endpoint2 targetEndpoint = endpointReference.getTargetEndpoint(); - for (Endpoint2 endpoint : endpoints) { + Endpoint targetEndpoint = endpointReference.getTargetEndpoint(); + for (Endpoint endpoint : endpoints) { // TODO: implement more complete matching if (matches(targetEndpoint.getURI(), endpoint.getURI())) { foundEndpoints.add(endpoint); @@ -118,11 +118,11 @@ public class EndpointRegistryImpl implements EndpointRegistry { return foundEndpoints; } - public List<EndpointReference2> findEndpointReference(Endpoint2 endpoint) { + public List<EndpointReference> findEndpointReference(Endpoint endpoint) { return null; } - public void removeEndpoint(Endpoint2 endpoint) { + public void removeEndpoint(Endpoint endpoint) { endpoints.remove(endpoint); for (EndpointListener listener : listeners) { listener.endpointRemoved(endpoint); @@ -130,16 +130,16 @@ public class EndpointRegistryImpl implements EndpointRegistry { logger.info("EndpointRegistry: Remove endpoint - " + endpoint.toString()); } - public void removeEndpointReference(EndpointReference2 endpointReference) { + public void removeEndpointReference(EndpointReference endpointReference) { endpointreferences.remove(endpointReference); logger.info("EndpointRegistry: Remove endpoint reference - " + endpointReference.toString()); } - public List<EndpointReference2> getEndpointRefereneces() { + public List<EndpointReference> getEndpointRefereneces() { return endpointreferences; } - public List<Endpoint2> getEndpoints() { + public List<Endpoint> getEndpoints() { return endpoints; } @@ -155,8 +155,8 @@ public class EndpointRegistryImpl implements EndpointRegistry { listeners.remove(listener); } - public Endpoint2 getEndpoint(String uri) { - for (Endpoint2 ep : endpoints) { + public Endpoint getEndpoint(String uri) { + for (Endpoint ep : endpoints) { String epURI = ep.getComponent().getURI() + "#" + ep.getService().getName() + "/" + ep.getBinding().getName(); if (epURI.equals(uri)) { @@ -173,8 +173,8 @@ public class EndpointRegistryImpl implements EndpointRegistry { } - public void updateEndpoint(String uri, Endpoint2 endpoint) { - Endpoint2 oldEndpoint = getEndpoint(uri); + public void updateEndpoint(String uri, Endpoint endpoint) { + Endpoint oldEndpoint = getEndpoint(uri); if (oldEndpoint == null) { throw new IllegalArgumentException("Endpoint is not found: " + uri); } diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java index 8ac5d34257..27a16e0e44 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java @@ -23,7 +23,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.tuscany.sca.assembly.Contract; -import org.apache.tuscany.sca.assembly.Endpoint2; +import org.apache.tuscany.sca.assembly.Endpoint; import org.apache.tuscany.sca.assembly.Implementation; import org.apache.tuscany.sca.core.invocation.CallbackInterfaceInterceptor; import org.apache.tuscany.sca.implementation.java.JavaImplementation; @@ -73,7 +73,7 @@ public class JavaCallbackRuntimeWireProcessor implements RuntimeWireProcessor { return; } JavaImplementation javaImpl = (JavaImplementation)implementation; - Endpoint2 callbackEndpoint = wire.getEndpointReference().getCallbackEndpoint(); + Endpoint callbackEndpoint = wire.getEndpointReference().getCallbackEndpoint(); if (callbackEndpoint != null) { Interface iface = callbackEndpoint.getService().getInterfaceContract().getInterface(); if (!supportsCallbackInterface(iface, javaImpl)) { diff --git a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java index 507ac07b6e..a4eed17081 100644 --- a/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java +++ b/java/sca/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java @@ -21,7 +21,7 @@ package org.apache.tuscany.sca.implementation.java.invocation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.tuscany.sca.assembly.EndpointReference2; +import org.apache.tuscany.sca.assembly.EndpointReference; import org.apache.tuscany.sca.core.factory.InstanceWrapper; import org.apache.tuscany.sca.core.scope.ScopeContainer; import org.apache.tuscany.sca.core.scope.ScopedRuntimeComponent; @@ -76,7 +76,7 @@ public class JavaImplementationInvoker implements Invoker, DataExchangeSemantics Object contextId = null; - EndpointReference2 from = msg.getFrom(); + EndpointReference from = msg.getFrom(); /* TODO - EPR - not required for OASIS ReferenceParameters parameters = null; if (from != null) { |