expected message and msg definition catchup

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

3 files changed, 5 insertions, 5 deletions

diff --git a/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties b/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
index eebb42b765..68b5787653 100644
--- a/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
+++ b/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
@@ -26,7 +26,7 @@ PolicyDOMModelMissmatch = The DOM node which has been found as a result of evalu
 MultiplePolicyLanguagesInEP = The policy sets for endpoint {0} contain policies specified in more than one language {1}
 MultiplePolicyLanguagesInEPR = The policy sets for endpoint reference {0} contain policies specified in more than one language {1}  
 MultiplePolicyLanguagesInImpl = The policy sets for component {0} implementation contain policies specified in more than one language {1}
-JaxWSClientAsyncMethodsNotAllowed = [CA100006] JAX-WS client-side asynchronous pooling and callback methods are not allowed in service interfaces
+JaxWSClientAsyncMethodsNotAllowed = [JCA100006] JAX-WS client-side asynchronous polling and callback methods are not allowed in service interfaces
 PolicySetNotFoundAtBuild = PolicySet {0} is not defined in SCA definitions
 IntentNotSatisfiedAtBuild  = The intent {0} associated with policy subject {1} has no matching policy set
 MutuallyExclusiveIntentsAtBuild = [POL40009,ASM60009,ASM60010,JCA70001,JCA70003] Intent {0} and {1} are mutually exclusive
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 99a29ece1c..d062fdc3f2 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
@@ -89,7 +89,7 @@ public class ServiceProcessor extends BaseJavaClassVisitor {
         }
         
         if (annotation.value().length == 0) {
-            throw new IntrospectionException("JCA90059 The array of interfaces or classes specified by the value attribute of the @Service annotation MUST contain at least one element");
+            throw new IntrospectionException("[JCA90059] The array of interfaces or classes specified by the value attribute of the @Service annotation MUST contain at least one element");
         }
         Class<?>[] interfaces = annotation.value();
         if (annotation.names().length > 0) {
@@ -99,7 +99,7 @@ public class ServiceProcessor extends BaseJavaClassVisitor {
             Set<String> names = new HashSet<String>();
             names.addAll(Arrays.asList(annotation.names()));
             if (names.size() != annotation.names().length) {
-                throw new IntrospectionException("JCA90060 The value of each element in the @Service names array MUST be unique amongst all the other element values in the array");
+                throw new IntrospectionException("[JCA90060] The value of each element in the @Service names array MUST be unique amongst all the other element values in the array");
             }
         }
 
@@ -116,7 +116,7 @@ public class ServiceProcessor extends BaseJavaClassVisitor {
         for (Class<?> iface : interfaces) {
             for (Method m : iface.getMethods()) {
                 if (!hasMethod(m, ms)) {
-                    throw new IntrospectionException("[JCA90042] Implementation missing service method " + m.getName() + " service interface " + iface.getName());
+                    throw new IntrospectionException("[JCA90042,JCI20002] Implementation missing service method " + m.getName() + " service interface " + iface.getName());
                 }
             }
         }
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index 1d6b412a27..ef4e86ebe8 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
@@ -117,7 +117,7 @@ public class ServiceProcessorTestCase {
             processor.visitClass(BadService.class, type);
             fail();
         } catch (IntrospectionException e) {
-            assertTrue(e.getMessage().startsWith("JCA90059"));
+            assertTrue(e.getMessage().startsWith("[JCA90059]"));
         }
     }