Author: rfeng
Date: Sun Sep 16 09:19:48 2007
New Revision: 576120
URL: http://svn.apache.org/viewvc?rev=576120&view=rev
Log:
Apply the patch from Simon Nash for TUSCANY-1712.
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java?rev=576120&r1=576119&r2=576120&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
Sun Sep 16 09:19:48 2007
@@ -46,8 +46,6 @@
public class CompositeConfigurationBuilderImpl {
- private String CALLBACK_PREFIX = "$callback$.";
-
private AssemblyFactory assemblyFactory;
private SCABindingFactory scaBindingFactory;
private CompositeBuilderMonitor monitor;
@@ -309,7 +307,7 @@
if (componentReference.getCallback() != null) {
for (Binding binding :
componentReference.getCallback().getBindings()) {
if (binding.getName() == null) {
- binding.setName(CALLBACK_PREFIX +
componentReference.getName());
+ binding.setName(componentReference.getName());
}
}
}
@@ -726,7 +724,7 @@
// unit tests
reference.getInterfaceContract().getCallbackInterface() != null) {
ComponentService service =
- componentServices.get(CALLBACK_PREFIX +
reference.getName());
+ componentServices.get(reference.getName());
if (service == null) {
service = createCallbackService(component, reference);
}
@@ -749,7 +747,7 @@
private ComponentService createCallbackService(Component component,
ComponentReference reference) {
ComponentService componentService =
assemblyFactory.createComponentService();
componentService.setIsCallback(true);
- componentService.setName(CALLBACK_PREFIX + reference.getName());
+ componentService.setName(reference.getName());
try {
InterfaceContract contract =
(InterfaceContract)reference.getInterfaceContract().clone();
@@ -762,7 +760,7 @@
Reference implReference = reference.getReference();
if (implReference != null) {
Service implService = assemblyFactory.createService();
- implService.setName(CALLBACK_PREFIX + implReference.getName());
+ implService.setName(implReference.getName());
try {
InterfaceContract implContract =
(InterfaceContract)implReference.getInterfaceContract().clone();
@@ -791,7 +789,7 @@
// unit tests
service.getInterfaceContract().getCallbackInterface() != null) {
ComponentReference reference =
- componentReferences.get(CALLBACK_PREFIX +
service.getName());
+ componentReferences.get(service.getName());
if (reference == null) {
reference = createCallbackReference(component, service);
}
@@ -814,7 +812,7 @@
private ComponentReference createCallbackReference(Component component,
ComponentService service) {
ComponentReference componentReference =
assemblyFactory.createComponentReference();
componentReference.setIsCallback(true);
- componentReference.setName(CALLBACK_PREFIX + service.getName());
+ componentReference.setName(service.getName());
try {
InterfaceContract contract =
(InterfaceContract)service.getInterfaceContract().clone();
contract.setInterface(contract.getCallbackInterface());
@@ -826,7 +824,7 @@
Service implService = service.getService();
if (implService != null) {
Reference implReference = assemblyFactory.createReference();
- implReference.setName(CALLBACK_PREFIX + implService.getName());
+ implReference.setName(implService.getName());
try {
InterfaceContract implContract =
(InterfaceContract)implService.getInterfaceContract().clone();
Modified:
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java?rev=576120&r1=576119&r2=576120&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
Sun Sep 16 09:19:48 2007
@@ -69,7 +69,6 @@
*/
public class CompositeActivatorImpl implements CompositeActivator {
private final static Logger logger =
Logger.getLogger(CompositeActivatorImpl.class.getName());
- private final static String CALLBACK_PREFIX = "$callback$.";
private final AssemblyFactory assemblyFactory;
private final MessageFactory messageFactory;
@@ -336,8 +335,7 @@
Binding callbackBinding = null;
for (Binding binding : callbackService.getBindings()) {
// first look for a callback binding whose name matches the
reference binding name
- if (binding.getName().equals(refBinding.getName()) ||
binding.getName()
- .equals(CALLBACK_PREFIX + refBinding.getName())) {
+ if (binding.getName().equals(refBinding.getName())) {
callbackBinding = binding;
break;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
