Move resource bundles to a package

Set DynamicImport-Package * so that the Monitor can find resource bundles

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

4 files changed, 6 insertions, 4 deletions

diff --git a/java/sca/modules/monitor/META-INF/MANIFEST.MF b/java/sca/modules/monitor/META-INF/MANIFEST.MF
index 161cbe7a8c..47de9d5253 100644
--- a/java/sca/modules/monitor/META-INF/MANIFEST.MF
+++ b/java/sca/modules/monitor/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

 Bundle-Description: Apache Tuscany SCA Monitor

 Import-Package: org.apache.tuscany.sca.monitor;version="2.0.0"

+DynamicImport-Package: *

 Bundle-SymbolicName: org.apache.tuscany.sca.monitor

 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/java/sca/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java b/java/sca/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
index 6e5fcd9015..b0d9ffb8ce 100644
--- a/java/sca/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
+++ b/java/sca/modules/monitor/src/test/java/org/apache/tuscany/sca/monitor/MonitorTestCase.java
@@ -31,6 +31,7 @@ import org.junit.Test;
  */
 public class MonitorTestCase {
 
+    private static final String MESSAGES = "org.apache.tuscany.sca.monitor.tuscany-monitor-test-messages";
     private static MonitorFactory monitorFactory;
 
     @BeforeClass
@@ -53,7 +54,7 @@ public class MonitorTestCase {
 
         problem =
             monitor.createProblem(this.getClass().getName(),
-                                  "tuscany-monitor-test-messages",
+                                  MESSAGES,
                                   Severity.WARNING,
                                   dummyModelObject,
                                   "MESSAGE1");
@@ -63,7 +64,7 @@ public class MonitorTestCase {
 
         problem =
             monitor.createProblem(this.getClass().getName(),
-                                  "tuscany-monitor-test-messages",
+                                  MESSAGES,
                                   Severity.WARNING,
                                   dummyModelObject,
                                   "MESSAGE2",
@@ -72,7 +73,7 @@ public class MonitorTestCase {
 
         problem =
             monitor.createProblem(this.getClass().getName(),
-                                  "tuscany-monitor-test-messages",
+                                  MESSAGES,
                                   Severity.WARNING,
                                   dummyModelObject,
                                   "MESSAGE3",
@@ -85,7 +86,7 @@ public class MonitorTestCase {
 
         problem =
             monitor.createProblem(this.getClass().getName(),
-                                  "tuscany-monitor-test-messages",
+                                  MESSAGES,
                                   Severity.ERROR,
                                   dummyModelObject,
                                   "MESSAGE4",
diff --git a/java/sca/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties b/java/sca/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties
index 523263da40..523263da40 100644
--- a/java/sca/modules/monitor/src/test/resources/tuscany-monitor-test-messages.properties
+++ b/java/sca/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages.properties
diff --git a/java/sca/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties b/java/sca/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties
index 523263da40..523263da40 100644
--- a/java/sca/modules/monitor/src/test/resources/tuscany-monitor-test-messages_it.properties
+++ b/java/sca/modules/monitor/src/test/resources/org/apache/tuscany/sca/monitor/tuscany-monitor-test-messages_it.properties