TUSCANY-2501 - raise an error if the user tries to mix annotated and unannotated references in a component. Change the vtests and validation tests to take account of this change.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@690691 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 2 deletions

diff --git a/branches/sca-java-1.3.2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java b/branches/sca-java-1.3.2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
index eed0d6871b..abe00bac5b 100644
--- a/branches/sca-java-1.3.2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
+++ b/branches/sca-java-1.3.2/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationIntrospector.java
@@ -130,8 +130,10 @@ class WidgetImplementationIntrospector {
         String referenceName = null;
         
         String tokens[] = scriptContent.split("=");
-        tokens = tokens[0].split(" ");
-        referenceName = tokens[tokens.length -1];
+        
+        // find the string between the quotes
+        tokens = tokens[1].split("\"");
+        referenceName = tokens[1];
         
         if(referenceName != null) {
             reference = assemblyFactory.createReference();