26 files changed, 52 insertions, 52 deletions
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
index ff94ad7b93..773f347170 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -59,7 +59,7 @@ public class UnknownEJBSessionTypeTestCase extends TestCase {
 
     public void testCalculator() {
         Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
 
         assertNotNull(problem);
         assertEquals("UnknownEJBSessionType", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
index a192674aeb..9ebfa0637b 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -58,7 +58,7 @@ public class UnknownEJBVersionTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("UnknownEJBVersion", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
index e0e5347d96..6e7f460a09 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class DoesntProcessActivationSpecTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
        assertEquals("DoesntProcessActivationSpec", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
index 9e08afec09..d32bb33d93 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class DoesntProcessDestinationTypeTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
        assertEquals("DoesntProcessDestinationType", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
index ed96072780..2ba2e6cd12 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 import org.junit.Ignore;
 
 import domain.CustomCompositeBuilder;
@@ -54,7 +54,7 @@ public class DoesntProcessHeadersTestCase extends TestCase {
     @Ignore("TUSCANY-2532")
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
 //       assertEquals("DoesntProcessHeaders", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
index a2a5b0b872..06b5140485 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class DoesntProcessResourceAdapterTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
        assertEquals("DoesntProcessResourceAdapter", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
index 64b41623de..3cd9e54fea 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class DoesntProcessResponseActivationSpecTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
        assertEquals("DoesntProcessResponseActivationSpec", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
index 86fbe51dad..78753fc82f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class DoesntProcessResponseConnectionFactoryTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
        assertEquals("DoesntProcessResponseConnectionFactory", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
index 6e884c41cd..011d9e427d 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class DoesntProcessResponseDestinationTypeTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
        assertEquals("DoesntProcessResponseDestinationType", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
index c237f8af18..f0b798c2e4 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class InvalidCorrelationSchemeTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("InvalidCorrelationScheme", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
index 52dc7e5795..a114501098 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class InvalidJMSDeliveryModeTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("InvalidJMSDeliveryMode", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
index a93df290c3..d31e02054a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class InvalidJMSPriorityTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("InvalidJMSPriority", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
index 949ec02134..1727217fe0 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class InvalidResponseDestinationTypeTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("InvalidResponseDestinationType", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
index d38a88744f..33bf2882e5 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class MissingActivationSpecNameTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+    	Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1);
         
     	assertNotNull(problem);
         assertEquals("MissingActivationSpecName", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
index 6999ae7969..fcb4345293 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class MissingConnectionFactoryNameTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+    	Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1);
         
     	assertNotNull(problem);
         assertEquals("MissingConnectionFactoryName", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
index 7333fc0f1e..04d1ba1055 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class MissingResponseActivationSpecTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+    	Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1);
         
     	assertNotNull(problem);
         assertEquals("MissingResponseActivationSpec", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
index ca0ef9a294..8725a714e8 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class MissingResponseConnectionFactoryTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+    	Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1);
         
     	assertNotNull(problem);
         assertEquals("MissingResponseConnectionFactory", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
index d9e1c782a8..b62cd22d6f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class MustStartWithSchemaTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("MustStartWithSchema", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
index 3e4e36d839..90a82ebe1f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class UnexpectedElementTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
        assertEquals("UnexpectedElement", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
index 60ea47a85f..9227674815 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class UnexpectedResponseElementTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
        assertEquals("UnexpectedResponseElement", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
index 6a75a35f99..df86fe1564 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class UnknownTokenInURITestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("UnknownTokenInURI", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
index c0f60a848f..00e6873361 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class InvalidWsdlElementAttrTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("InvalidWsdlElementAttr", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
index 5a74194796..6b2bf20329 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class MustUseWsdlBindingTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("MustUseWsdlBinding", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
index 7991de7176..8c21abb896 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class WsdlBindingDoesNotMatchTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
        assertEquals("WsdlBindingDoesNotMatch", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
index 1ef5f7b00a..83b4722b60 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class WsdlPortTypeDoesNotMatchTestCase extends TestCase {
 
     public void testCalculator() {
         Monitor monitor = customDomain.getMonitorInstance();
-        Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+        Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
         assertNotNull(problem);
         assertEquals("WsdlPortTypeDoesNotMatch", problem.getMessageId()); 
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
index a0a7d12b9f..8f7786f08a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
@@ -52,7 +52,7 @@ public class WsdlServiceDoesNotMatchTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
        assertEquals("WsdlServiceDoesNotMatch", problem.getMessageId());