Author: rfeng
Date: Fri Apr 4 14:13:34 2008
New Revision: 644934
URL: http://svn.apache.org/viewvc?rev=644934&view=rev
Log:
Fix for TUSCANY-2189
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=644934&r1=644933&r2=644934&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
Fri Apr 4 14:13:34 2008
@@ -911,19 +911,19 @@
// composite service on the promoted component
ComponentService newComponentService =
assemblyFactory.createComponentService();
- newComponentService.setName("$promoted$." +
compositeService.getName());
+ newComponentService.setName("$promoted$." +
componentService.getName());
promotedComponent.getServices().add(newComponentService);
newComponentService.setService(promotedService.getService());
newComponentService.getBindings()
- .addAll(compositeService.getBindings());
-
newComponentService.setInterfaceContract(compositeService
+ .addAll(componentService.getBindings());
+
newComponentService.setInterfaceContract(componentService
.getInterfaceContract());
- if (compositeService.getInterfaceContract() !=
null && compositeService
+ if (componentService.getInterfaceContract() !=
null && componentService
.getInterfaceContract().getCallbackInterface()
!= null) {
newComponentService.setCallback(assemblyFactory.createCallback());
- if (compositeService.getCallback() != null) {
+ if (componentService.getCallback() != null) {
newComponentService.getCallback().getBindings()
-
.addAll(compositeService.getCallback().getBindings());
+
.addAll(componentService.getCallback().getBindings());
}
}
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=644934&r1=644933&r2=644934&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
Fri Apr 4 14:13:34 2008
@@ -29,6 +29,7 @@
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.CompositeService;
import org.apache.tuscany.sca.assembly.Implementation;
import org.apache.tuscany.sca.assembly.OptimizableBinding;
import org.apache.tuscany.sca.assembly.Reference;
@@ -734,6 +735,9 @@
+ "#"
+ service.getName());
}
+ return;
+ }
+ if (service.getService() instanceof CompositeService) {
return;
}
if (logger.isLoggable(Level.FINE)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
