From e7db5ed4f54ec2b9da0124de925b0cf12243a6c0 Mon Sep 17 00:00:00 2001
From: edwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 13 May 2009 18:27:34 +0000
Subject: Fix for TUSCANY-3022 to bring Tuscany in line with the requirements
 of the OASIS SCA Assembly spec - testcases ASM_4002, ASM_4003, ASM_4004

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@774475 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca/assembly/builder/impl/BaseBuilderImpl.java     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'java')

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
index 78bcbfcf6d..b8f619ed81 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseBuilderImpl.java
@@ -239,7 +239,8 @@ public abstract class BaseBuilderImpl implements CompositeBuilder {
             Map<String, ComponentProperty> componentProperties, Monitor monitor) {
         for (ComponentService componentService : component.getServices()) {
             if (componentServices.containsKey(componentService.getName())) {
-                warning(monitor, "DuplicateComponentServiceName", component,
+            	// [MJE 13/05/2009] Changed to "error" since allowing these violates the OASIS spec
+                error(monitor, "DuplicateComponentServiceName", component,
                         component.getName(), componentService.getName());
             } else {
                 componentServices.put(componentService.getName(),
@@ -248,7 +249,8 @@ public abstract class BaseBuilderImpl implements CompositeBuilder {
         }
         for (ComponentReference componentReference : component.getReferences()) {
             if (componentReferences.containsKey(componentReference.getName())) {
-                warning(monitor, "DuplicateComponentReferenceName", component,
+            	// [MJE 13/05/2009] Changed to "error" since allowing these violates the OASIS spec
+                error(monitor, "DuplicateComponentReferenceName", component,
                         component.getName(), componentReference.getName());
             } else {
                 componentReferences.put(componentReference.getName(),
@@ -257,7 +259,8 @@ public abstract class BaseBuilderImpl implements CompositeBuilder {
         }
         for (ComponentProperty componentProperty : component.getProperties()) {
             if (componentProperties.containsKey(componentProperty.getName())) {
-                warning(monitor, "DuplicateComponentPropertyName", component,
+            	// [MJE 13/05/2009] Changed to "error" since allowing these violates the OASIS spec
+                error(monitor, "DuplicateComponentPropertyName", component,
                         component.getName(), componentProperty.getName());
             } else {
                 componentProperties.put(componentProperty.getName(),
@@ -289,7 +292,8 @@ public abstract class BaseBuilderImpl implements CompositeBuilder {
             // duplicates
             for (Property property : implementation.getProperties()) {
                 if (properties.containsKey(property.getName())) {
-                    warning(monitor, "DuplicateImplementationPropertyName",
+                	// [MJE 13/05/2009] Changed to "error" since allowing these violates the OASIS spec
+                    error(monitor, "DuplicateImplementationPropertyName",
                             component, component.getName(), property.getName());
                 } else {
                     properties.put(property.getName(), property);
@@ -297,7 +301,8 @@ public abstract class BaseBuilderImpl implements CompositeBuilder {
             }
             for (Service service : implementation.getServices()) {
                 if (services.containsKey(service.getName())) {
-                    warning(monitor, "DuplicateImplementationServiceName",
+                	// [MJE 13/05/2009] Changed to "error" since allowing these violates the OASIS spec
+                    error(monitor, "DuplicateImplementationServiceName",
                             component, component.getName(), service.getName());
                 } else {
                     services.put(service.getName(), service);
@@ -305,7 +310,8 @@ public abstract class BaseBuilderImpl implements CompositeBuilder {
             }
             for (Reference reference : implementation.getReferences()) {
                 if (references.containsKey(reference.getName())) {
-                    warning(monitor, "DuplicateImplementationReferenceName",
+                	// [MJE 13/05/2009] Changed to "error" since allowing these violates the OASIS spec
+                    error(monitor, "DuplicateImplementationReferenceName",
                             component, component.getName(), reference.getName());
                 } else {
                     references.put(reference.getName(), reference);
-- 
cgit v1.2.3