Refactor resource bundles to a package

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

2 files changed, 36 insertions, 4 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
new file mode 100644
index 0000000000..d40d72ae98
--- /dev/null
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.assembly.builder;
+
+/**
+ * Constants for resource bundle names
+ */
+public interface Messages {
+    String RESOURCE_PACKAGE = "org.apache.tuscany.sca.assembly.builder.";
+    String ASSEMBLY_VALIDATION = RESOURCE_PACKAGE + "assembly-validation-messages";
+    String ASSEMBLY_CONFORMANCE = RESOURCE_PACKAGE + "assembly-conformance-messages";
+    String DEFINITIONS_VALIDATION = RESOURCE_PACKAGE + "definitions-validation-messages";
+}
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
index ba5a792c64..ead5ecba72 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
@@ -19,6 +19,8 @@
 
 package org.apache.tuscany.sca.definitions.util;
 
+import static org.apache.tuscany.sca.assembly.builder.Messages.DEFINITIONS_VALIDATION;
+
 import java.util.HashSet;
 
 import org.apache.tuscany.sca.definitions.Definitions;
@@ -49,7 +51,7 @@ public class DefinitionsUtil {
             if (intents.contains(intent)){
                 Monitor.error(monitor, 
                               target, 
-                              "definitions-validation-messages", 
+                              DEFINITIONS_VALIDATION, 
                               "DuplicateIntent", 
                               intent.getName().toString());
             } else {          
@@ -62,7 +64,7 @@ public class DefinitionsUtil {
             if (policySets.contains(policySet)){
                 Monitor.error(monitor, 
                               target, 
-                              "definitions-validation-messages", 
+                              DEFINITIONS_VALIDATION, 
                               "DuplicatePolicySet", 
                               policySet.getName().toString());
             } else {          
@@ -75,7 +77,7 @@ public class DefinitionsUtil {
             if (bindingTypes.contains(bindingType)){
                 Monitor.error(monitor, 
                               target, 
-                              "definitions-validation-messages", 
+                              DEFINITIONS_VALIDATION, 
                               "DuplicateBindingType", 
                               bindingType.getType().toString());
             } else {          
@@ -88,7 +90,7 @@ public class DefinitionsUtil {
             if (implementationTypes.contains(implementationType)){
                 Monitor.error(monitor, 
                               target, 
-                              "definitions-validation-messages", 
+                              DEFINITIONS_VALIDATION, 
                               "DuplicateImplementationType", 
                               implementationType.getType().toString());
             } else {