Fixes for TUSCANY-2690

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

5 files changed, 10 insertions, 10 deletions

diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
index 04135ab2cc..c306373ecb 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.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 AttributePackageMissingTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("AttributePackageMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
index ab0afc6f65..c412a16f24 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.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 AttributeNameSpaceMissingTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("AttributeNameSpaceMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
index b01ec2a254..05b0ee7771 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.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 AttributeURIMissingTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(2);
+    	Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(2);
         
     	assertNotNull(problem);
         assertEquals("AttributeURIMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
index 32c1a8b3a8..e966c5104a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.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 AttributeCompositeMissingTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("AttributeCompositeMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
index 0a71ea06c7..28bc3af4e3 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.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;
 
@@ -54,7 +54,7 @@ public class MultipleCompositeErrorsTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
     	assertEquals(5, monitor.getProblems().size());