diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-29 15:06:57 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2012-02-29 15:06:57 +0000 |
commit | 17e573358db8a4a83247037b957db32127bdd00a (patch) | |
tree | 6f5fdc4e5169f822571dd7b02e3a023d16a351c1 /sca-java-2.x/trunk/modules/interface-java/src | |
parent | a0a8ac0a56f74f88e0ffbc54aa45a85dbb14c419 (diff) |
TUSCANY-4020 - move hardcoded message strings into properties files
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1295144 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
2 files changed, 16 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java index b321b0d5de..ed5fe421e2 100644 --- a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java +++ b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java @@ -33,6 +33,7 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import javax.xml.ws.WebServiceClient; +import org.apache.tuscany.sca.assembly.xml.Messages; import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; @@ -233,13 +234,18 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa javaInterface.setContributionContainingClass(classReference.getContributionContainingClass()); } catch (InvalidInterfaceException e) { - ContributionResolveException ce = new ContributionResolveException("Resolving Java interface " + javaInterface.getName(), e); - //error("ContributionResolveException", javaFactory, ce); + ContributionResolveException ce = new ContributionResolveException(context.getMonitor().getMessageString(JavaInterfaceProcessor.class.getName(), + "interface-javaxml-validation-messages", + "ResolvingInterface") + + javaInterface.getName(), e); error(monitor, "InvalidInterfaceException", javaFactory, e); return javaInterface; - //throw ce; } catch ( Exception e ) { - throw new ContributionResolveException( "Resolving Java interface " + javaInterface.getName(), e ); + throw new ContributionResolveException(context.getMonitor().getMessageString(JavaInterfaceProcessor.class.getName(), + "interface-javaxml-validation-messages", + "ResolvingInterface") + + " " + + javaInterface.getName(), e ); } // end try // Cache the resolved interface @@ -268,8 +274,11 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa checkForbiddenAnnotations(monitor, javaInterfaceContract); } catch (Exception e) { - throw new ContributionResolveException("Resolving Java Interface " + javaInterfaceContract.getInterface() - .toString(), e); + throw new ContributionResolveException(context.getMonitor().getMessageString(JavaInterfaceProcessor.class.getName(), + "interface-javaxml-validation-messages", + "ResolvingInterface") + + " " + + javaInterfaceContract.getInterface().toString(), e); } // end try } diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties b/sca-java-2.x/trunk/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties index 329f55e0a7..c82d3876e9 100644 --- a/sca-java-2.x/trunk/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties +++ b/sca-java-2.x/trunk/modules/interface-java/src/main/resources/interface-javaxml-validation-messages.properties @@ -25,4 +25,5 @@ ForbiddenAnnotationJCA30006 = [JCA30006] Forbidden annotation {0} found on servi ForbiddenAnnotationJCA30007 = [JCA30007] Forbidden annotation {0} found on callback interface in class {1} ForbiddenAnnotationJCA30008 = [JCA30008] Forbidden annotation {0} found in class {1} ForbiddenAnnotationJCA100018 = [JCA100018] Forbidden annotation {0} found in class {1} +ResolvingInterface = Resolving Java interface |