You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/10/06 12:28:52 UTC
svn commit: r822199 - in /tuscany/java/sca:
itest/nodes/two-nodes-two-vms-test/pom.xml
modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
Author: slaws
Date: Tue Oct 6 10:28:52 2009
New Revision: 822199
URL: http://svn.apache.org/viewvc?rev=822199&view=rev
Log:
Correct duplicate component test
Modified:
tuscany/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
Modified: tuscany/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml?rev=822199&r1=822198&r2=822199&view=diff
==============================================================================
--- tuscany/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml (original)
+++ tuscany/java/sca/itest/nodes/two-nodes-two-vms-test/pom.xml Tue Oct 6 10:28:52 2009
@@ -31,6 +31,11 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-endpoint-tribes</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>itest-nodes-helloworld-iface</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -63,7 +68,8 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-jetty</artifactId>
<version>2.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
+
</dependencies>
<build>
Modified: tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java?rev=822199&r1=822198&r2=822199&view=diff
==============================================================================
--- tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java (original)
+++ tuscany/java/sca/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeComponentTypeBuilderImpl.java Tue Oct 6 10:28:52 2009
@@ -105,7 +105,7 @@
for (Component component : composite.getComponents()) {
// Check for duplicate component names
- if (composite.getComponent(component.getName()) == null) {
+ if (component != composite.getComponent(component.getName())) {
Monitor.error(monitor,
this,
Messages.ASSEMBLY_VALIDATION,