Author: rfeng
Date: Wed Mar 19 15:04:39 2008
New Revision: 639038
URL: http://svn.apache.org/viewvc?rev=639038&view=rev
Log:
Fix for TUSCANY-2106 (merge from trunk)
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
incubator/tuscany/branches/sca-java-1.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java?rev=639038&r1=639037&r2=639038&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
Wed Mar 19 15:04:39 2008
@@ -420,6 +420,9 @@
// Connect each component reference to the corresponding reference
for (ComponentReference componentReference :
component.getReferences()) {
+ if(componentReference.isCallback()) {
+ continue;
+ }
Reference reference = references.get(componentReference.getName());
if (reference != null) {
componentReference.setReference(reference);
@@ -529,6 +532,9 @@
// Connect each component service to the corresponding service
for (ComponentService componentService : component.getServices()) {
+ if(componentService.isCallback()) {
+ continue;
+ }
Service service = services.get(componentService.getName());
if (service != null) {
componentService.setService(service);
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java?rev=639038&r1=639037&r2=639038&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
Wed Mar 19 15:04:39 2008
@@ -138,7 +138,7 @@
break;
}
}
- if (!promoted) {
+ if (!promoted && !componentReference.isCallback()) {
warning("No targets for reference: " +
componentReference.getName(), composite);
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
