Author: rfeng
Date: Thu Nov 19 19:37:14 2009
New Revision: 882263
URL: http://svn.apache.org/viewvc?rev=882263&view=rev
Log:
Rename getInterfaceContract() of Endpoint/EndpointReference
Modified:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
Modified:
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
(original)
+++
tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/EndpointProcessor.java
Thu Nov 19 19:37:14 2009
@@ -104,7 +104,7 @@
ComponentService service =
(ComponentService)endpoint.getService().clone();
component.getServices().add(service);
service.getBindings().clear();
- service.setInterfaceContract(endpoint.getInterfaceContract());
+
service.setInterfaceContract(endpoint.getComponentServiceInterfaceContract());
Binding binding = (Binding)endpoint.getBinding().clone();
service.getBindings().add(binding);
return composite;
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
Thu Nov 19 19:37:14 2009
@@ -93,14 +93,7 @@
*
* @return the interface contract
*/
- InterfaceContract getInterfaceContract();
-
- /**
- * Sets the interface contract defining the interface
- *
- * @param interfaceContract the interface contract
- */
- void setInterfaceContract(InterfaceContract interfaceContract);
+ InterfaceContract getComponentServiceInterfaceContract();
/**
* Get the service's callback endpoint references that
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
Thu Nov 19 19:37:14 2009
@@ -121,14 +121,7 @@
*
* @return the interface contract
*/
- InterfaceContract getInterfaceContract();
-
- /**
- * Sets the interface contract defining the interface
- *
- * @param interfaceContract the interface contract
- */
- void setInterfaceContract(InterfaceContract interfaceContract);
+ InterfaceContract getComponentReferenceInterfaceContract();
/**
* Get the reference callback endpoint that
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
Thu Nov 19 19:37:14 2009
@@ -100,7 +100,7 @@
reset();
}
- public InterfaceContract getInterfaceContract() {
+ public InterfaceContract getComponentServiceInterfaceContract() {
resolve();
if (interfaceContract == null && service != null) {
interfaceContract = service.getInterfaceContract();
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
Thu Nov 19 19:37:14 2009
@@ -123,7 +123,7 @@
reset();
}
- public InterfaceContract getInterfaceContract() {
+ public InterfaceContract getComponentReferenceInterfaceContract() {
resolve();
if (interfaceContract == null && reference != null) {
interfaceContract = reference.getInterfaceContract();
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
Thu Nov 19 19:37:14 2009
@@ -111,9 +111,6 @@
Endpoint endpoint =
assemblyFactory.createEndpoint();
endpoint.setComponent(component);
endpoint.setService(service);
- if (service != null) {
-
endpoint.setInterfaceContract(service.getInterfaceContract());
- }
endpoint.setBinding(binding);
endpoint.setUnresolved(false);
service.getEndpoints().add(endpoint);
Modified:
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
(original)
+++
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
Thu Nov 19 19:37:14 2009
@@ -903,9 +903,6 @@
EndpointReference endpointRef =
assemblyFactory.createEndpointReference();
endpointRef.setComponent(component);
endpointRef.setReference(reference);
- if (reference != null) {
- endpointRef.setInterfaceContract(reference.getInterfaceContract());
- }
endpointRef.setUnresolved(unresolved);
return endpointRef;
} // end method createEndpointRef
@@ -921,9 +918,6 @@
Endpoint endpoint = createEndpoint(unresolved);
endpoint.setComponent(component);
endpoint.setService(service);
- if (service != null) {
- endpoint.setInterfaceContract(service.getInterfaceContract());
- }
endpoint.setUnresolved(unresolved);
return endpoint;
} // end method createEndpoint
Modified:
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
(original)
+++
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointImpl.java
Thu Nov 19 19:37:14 2009
@@ -521,7 +521,7 @@
}
bindingInterfaceContract =
getBindingProvider().getBindingInterfaceContract();
if (bindingInterfaceContract == null) {
- bindingInterfaceContract = getInterfaceContract();
+ bindingInterfaceContract = getComponentServiceInterfaceContract();
}
if (bindingInterfaceContract == null) {
bindingInterfaceContract =
getComponentTypeServiceInterfaceContract();
@@ -535,11 +535,11 @@
return serviceInterfaceContract;
}
if (service == null) {
- return getInterfaceContract();
+ return getComponentServiceInterfaceContract();
}
serviceInterfaceContract =
getLeafContract(service).getInterfaceContract();
if (serviceInterfaceContract == null) {
- serviceInterfaceContract = getInterfaceContract();
+ serviceInterfaceContract = getComponentServiceInterfaceContract();
}
return serviceInterfaceContract;
}
Modified:
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
(original)
+++
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/impl/RuntimeEndpointReferenceImpl.java
Thu Nov 19 19:37:14 2009
@@ -465,7 +465,7 @@
}
bindingInterfaceContract =
getBindingProvider().getBindingInterfaceContract();
if (bindingInterfaceContract == null) {
- bindingInterfaceContract = getInterfaceContract();
+ bindingInterfaceContract =
getComponentReferenceInterfaceContract();
}
if (bindingInterfaceContract == null) {
bindingInterfaceContract =
getComponentTypeReferenceInterfaceContract();
@@ -479,11 +479,11 @@
return referenceInterfaceContract;
}
if (reference == null) {
- return getInterfaceContract();
+ return getComponentReferenceInterfaceContract();
}
referenceInterfaceContract =
getLeafContract(reference).getInterfaceContract();
if (referenceInterfaceContract == null) {
- referenceInterfaceContract = getInterfaceContract();
+ referenceInterfaceContract =
getComponentReferenceInterfaceContract();
}
return referenceInterfaceContract;
}
Modified:
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
(original)
+++
tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/context/impl/ComponentContextImpl.java
Thu Nov 19 19:37:14 2009
@@ -305,7 +305,7 @@
RuntimeEndpoint
endpoint) {
try {
if (businessInterface == null) {
- InterfaceContract contract = endpoint.getInterfaceContract();
+ InterfaceContract contract =
endpoint.getComponentTypeServiceInterfaceContract();
businessInterface =
(Class<B>)((JavaInterface)contract.getInterface()).getJavaClass();
}
RuntimeEndpointReference ref =
@@ -369,7 +369,6 @@
endpointReference.setReference(componentReference);
endpointReference.setBinding(endpoint.getBinding());
endpointReference.setUnresolved(false);
- endpointReference.setInterfaceContract(interfaceContract);
endpointReference.setStatus(EndpointReference.WIRED_TARGET_FOUND_READY_FOR_MATCHING);
endpointReference.setTargetEndpoint(endpoint);
Modified:
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
(original)
+++
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointHelper.java
Thu Nov 19 19:37:14 2009
@@ -45,7 +45,7 @@
}
private static List<String> getInterfaces(Endpoint endpoint) {
- Interface intf = endpoint.getInterfaceContract().getInterface();
+ Interface intf =
endpoint.getComponentServiceInterfaceContract().getInterface();
JavaInterface javaInterface = (JavaInterface)intf;
return Collections.singletonList(javaInterface.getName());
}
Modified:
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java?rev=882263&r1=882262&r2=882263&view=diff
==============================================================================
---
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
(original)
+++
tuscany/java/sca/modules/node-impl-osgi/src/main/java/org/apache/tuscany/sca/osgi/remoteserviceadmin/impl/EndpointIntrospector.java
Thu Nov 19 19:37:14 2009
@@ -357,7 +357,7 @@
Endpoint ep =
(Endpoint)endpoint.getProperties().get(Endpoint.class.getName());
if (ep != null) {
bindings = Collections.singletonList(ep.getBinding());
- interfaces =
Collections.singletonList(((JavaInterface)ep.getInterfaceContract().getInterface()).getName());
+ interfaces =
Collections.singletonList(((JavaInterface)ep.getComponentServiceInterfaceContract().getInterface()).getName());
intents = ep.getRequiredIntents();
} else {
Map<String, Object> properties = endpoint.getProperties();
