Author: kelvingoodson
Date: Mon May 17 13:41:01 2010
New Revision: 945147
URL: http://svn.apache.org/viewvc?rev=945147&view=rev
Log: (empty)
Modified:
tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
Modified:
tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties?rev=945147&r1=945146&r2=945147&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
(original)
+++
tuscany/sca-java-2.x/trunk/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
Mon May 17 13:41:01 2010
@@ -28,6 +28,6 @@ POJO_8014=org.apache.tuscany.sca.contrib
POJO_9001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: POJO_9001,
Artifact: Test_POJO_9001.composite] - XMLSchema validation error occured in:
Test_POJO_9001.composite ,line = ***, column = ***, Message =
cvc-complex-type.3.2.2: Attribute 'interface' is not allowed to appear in
element 'implementation.java'.
POJO_10001=org.oasisopen.sca.ServiceRuntimeException: [Contribution:
POJO_10001, Artifact: META-INF/sca-contribution.xml] - [JCI10001] The value of
the @package attribute on the <import.java/> element is not unique across all
other <import.java/> elements within the contribution.
POJO_10004=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
[JCI100007] A Java package org.oasisopen.sca.test;version=1.0.0 that is
specified on an export element MUST be contained within the contribution
containing the export element.
-POJO_10005=org.oasisopen.sca.ServiceRuntimeException: [Contribution:
POJO_10005, Artifact: META-INF/sca-contribution.xml] - [JCI100004] The value of
the @package attribute on the <export.java/> element is not unique across all
other <export.java/> elements within the contribution.
+POJO_10005=org.oasisopen.sca.ServiceRuntimeException: [Contribution:
POJO_10005, Artifact: META-INF/sca-contribution.xml] - [JVC10004] The value of
the @package attribute on the <export.java/> element is not unique across all
other <export.java/> elements within the contribution.
POJO_10006=org.apache.tuscany.sca.contribution.processor.ContributionResolveException:
[JCI100007] A Java package org.oasisopen.sca.test.y that is specified on an
export element MUST be contained within the contribution containing the export
element.
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.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/ConstructorProcessor.java?rev=945147&r1=945146&r2=945147&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
Mon May 17 13:41:01 2010
@@ -54,7 +54,7 @@ public class ConstructorProcessor extend
type.getConstructors().put(constructor, definition);
if
(constructor.getAnnotation(org.oasisopen.sca.annotation.Constructor.class) !=
null) {
if (found) {
- throw new DuplicateConstructorException("Multiple
constructors marked with @Constructor", constructor);
+ throw new DuplicateConstructorException("[JCI50002]
Multiple constructors marked with @Constructor", constructor);
}
found = true;
type.setConstructor(definition);
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.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/HeuristicPojoProcessor.java?rev=945147&r1=945146&r2=945147&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
Mon May 17 13:41:01 2010
@@ -255,7 +255,7 @@ public class HeuristicPojoProcessor exte
// no definition, heuristically determine constructor
Constructor[] constructors = clazz.getConstructors();
if (constructors.length == 0) {
- throw new NoConstructorException("No public constructor for
class");
+ throw new NoConstructorException("[JCI50001] No public
constructor for class");
} else if (constructors.length == 1) {
// Only one constructor, take it
constructor = constructors[0];
@@ -266,7 +266,7 @@ public class HeuristicPojoProcessor exte
selected = ctor;
for (Constructor<T> ctor2 : constructors) {
if (selected != ctor2 && allArgsAnnotated(ctor2)) {
- throw new
InvalidConstructorException("Multiple annotated constructors");
+ throw new
InvalidConstructorException("[JCI50005] Multiple annotated constructors");
}
}
}
