Author: kelvingoodson
Date: Mon May 17 12:48:52 2010
New Revision: 945120
URL: http://svn.apache.org/viewvc?rev=945120&view=rev
Log:
expected message and msg definition catchup
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties?rev=945120&r1=945119&r2=945120&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
(original)
+++
tuscany/sca-java-2.x/trunk/modules/builder/src/main/resources/org/apache/tuscany/sca/builder/builder-validation-messages.properties
Mon May 17 12:48:52 2010
@@ -26,7 +26,7 @@ PolicyDOMModelMissmatch = The DOM node w
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
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java?rev=945120&r1=945119&r2=945120&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
Mon May 17 12:48:52 2010
@@ -89,7 +89,7 @@ public class ServiceProcessor extends Ba
}
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 Ba
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 Ba
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());
}
}
}
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java?rev=945120&r1=945119&r2=945120&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
Mon May 17 12:48:52 2010
@@ -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]"));
}
}
