Fixing resource bundle location that was missing the package structure

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

3 files changed, 11 insertions, 6 deletions

diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
index 60d62610a1..cdfd6e9467 100644
--- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
+++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositePolicyBuilderImpl.java
@@ -45,6 +45,7 @@ import org.apache.tuscany.sca.monitor.Monitor;
  * @version $Rev$ $Date$
  */
 public class CompositePolicyBuilderImpl extends ComponentPolicyBuilderImpl implements CompositeBuilder {
+    private static final String BUILDER_VALIDATION_BUNDLE = "org.apache.tuscany.sca.builder.builder-validation-messages";
 
     public CompositePolicyBuilderImpl(ExtensionPointRegistry registry) {
         super(registry);
@@ -186,7 +187,7 @@ public class CompositePolicyBuilderImpl extends ComponentPolicyBuilderImpl imple
                     if (policyNames.size() > 1){
                         Monitor.error(context.getMonitor(), 
                                       this, 
-                                      "builder-validation-messages", 
+                                      BUILDER_VALIDATION_BUNDLE, 
                                       "MultiplePolicyLanguagesInEP", 
                                       ep.toString(), 
                                       policyNames.toString());
@@ -209,7 +210,7 @@ public class CompositePolicyBuilderImpl extends ComponentPolicyBuilderImpl imple
                     if (policyNames.size() > 1){
                         Monitor.error(context.getMonitor(), 
                                       this, 
-                                      "builder-validation-messages", 
+                                      BUILDER_VALIDATION_BUNDLE, 
                                       "MultiplePolicyLanguagesInEPR", 
                                       epr.toString(), 
                                       policyNames.toString());
@@ -232,7 +233,7 @@ public class CompositePolicyBuilderImpl extends ComponentPolicyBuilderImpl imple
                 if (policyNames.size() > 1){
                     Monitor.error(context.getMonitor(), 
                                   this, 
-                                  "builder-validation-messages", 
+                                  BUILDER_VALIDATION_BUNDLE, 
                                   "MultiplePolicyLanguagesInImplementation", 
                                   component.toString(), 
                                   policyNames.toString());
diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
index 1971a8d928..6c44d2e9e0 100644
--- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
+++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointBuilderImpl.java
@@ -40,6 +40,8 @@ import org.apache.tuscany.sca.monitor.Monitor;
  * creates endpoint models for component services.
  */
 public class EndpointBuilderImpl implements CompositeBuilder {
+    private static final String BUILDER_VALIDATION_BUNDLE = "org.apache.tuscany.sca.builder.builder-validation-messages";
+    
     private AssemblyFactory assemblyFactory;
 
     public EndpointBuilderImpl(ExtensionPointRegistry registry) {
@@ -97,7 +99,7 @@ public class EndpointBuilderImpl implements CompositeBuilder {
                                 //FIXME create a java validation message resource bundle
                                 Monitor.error(monitor, 
                                               this, 
-                                              "org.apache.tuscany.sca.builder.builder-validation-messages",
+                                              BUILDER_VALIDATION_BUNDLE,
                                               "JaxWSClientAsyncMethodsNotAllowed", 
                                               service, 
                                               service.getName());                  
diff --git a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
index 9b21de3354..c8f4461cdd 100644
--- a/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
+++ b/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAttachmentBuilderImpl.java
@@ -72,6 +72,8 @@ import org.xml.sax.SAXException;
  * @version $Rev$ $Date$
  */
 public class PolicyAttachmentBuilderImpl implements CompositeBuilder {
+    private static final String BUILDER_VALIDATION_BUNDLE = "org.apache.tuscany.sca.builder.builder-validation-messages";
+    
     private StAXHelper staxHelper;
     private DOMHelper domHelper;
     private ExtensionPointRegistry registry;
@@ -160,7 +162,7 @@ public class PolicyAttachmentBuilderImpl implements CompositeBuilder {
                                 (node.getLocalName().equals("property"))){
                                 Monitor.error(monitor, 
                                               this, 
-                                              "org.apache.tuscany.sca.builder.builder-validation-messages", 
+                                              BUILDER_VALIDATION_BUNDLE, 
                                               "PolicyAttachedToProperty", 
                                               ps.getName().toString());
                                 break;
@@ -179,7 +181,7 @@ public class PolicyAttachmentBuilderImpl implements CompositeBuilder {
                             	// models
                                 Monitor.warning(monitor, 
                                         this, 
-                                        "org.apache.tuscany.sca.builder.builder-validation-messages", 
+                                        BUILDER_VALIDATION_BUNDLE, 
                                         "PolicyDOMModelMissmatch", 
                                         ps.getName().toString(),
                                         index);