You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/14 00:09:38 UTC
svn commit: r528685 - in
/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util:
CompositeUtil.java PrintUtil.java
Author: jsdelfino
Date: Fri Apr 13 15:09:38 2007
New Revision: 528685
URL: http://svn.apache.org/viewvc?view=rev&rev=528685
Log:
By default, composite services/references should use the interface contract specified on the component service/reference that they promote.
Modified:
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/PrintUtil.java
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java?view=diff&rev=528685&r1=528684&r2=528685
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java Fri Apr 13 15:09:38 2007
@@ -328,8 +328,17 @@
if (componentService != null && componentService.isUnresolved()) {
ComponentService resolved = componentServices.get(componentService.getName());
if (resolved != null) {
+
+ // Point to the resolved component service
compositeService.setPromotedService(resolved);
resolved.promotedAs().add(compositeService);
+
+ // Use the interface contract from the component service if none
+ // is specified on the composite service
+ if (compositeService.getInterfaceContract() == null) {
+ compositeService.setInterfaceContract(resolved.getInterfaceContract());
+ }
+
} else {
problems.add(compositeService);
}
@@ -345,8 +354,17 @@
ComponentReference resolved =
componentReferences.get(componentReference.getName());
if (resolved != null) {
+
+ // Point to the resolved component reference
promotedReferences.set(i, resolved);
resolved.promotedAs().add(compositeReference);
+
+ // Use the interface contract from the component reference if none
+ // is specified on the composite reference
+ if (compositeReference.getInterfaceContract() == null) {
+ compositeReference.setInterfaceContract(resolved.getInterfaceContract());
+ }
+
} else {
problems.add(compositeReference);
}
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/PrintUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/PrintUtil.java?view=diff&rev=528685&r1=528684&r2=528685
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/PrintUtil.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/PrintUtil.java Fri Apr 13 15:09:38 2007
@@ -30,6 +30,8 @@
import java.util.List;
import java.util.Set;
+import org.w3c.dom.Node;
+
/**
* A simple print utility class to help print assembly model instances.
*
@@ -117,6 +119,11 @@
indent--;
}
}
+ } else if (value instanceof Node) {
+ indent++;
+ indent();
+ out.println(propertyDescriptor.getName() + "=" + value.toString());
+ indent--;
} else {
// Print an object, recursively
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org