Fixes for TUSCANY-2690

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

6 files changed, 12 insertions, 12 deletions

diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
index 9b0d51eb59..0b3a828a41 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.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 ContributionReadException extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("ContributionReadException", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
index e8476991a9..14e47f464a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.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 PolicyImplValidationException extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("PolicyImplValidationException", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
index 8ae156d63e..c4cdc2358d 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.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 PolicyServiceValidationException extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("PolicyServiceValidationException", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
index d757ff98dd..18d9820d10 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.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 UnexpectedBindingElement extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("UnexpectedBindingElement", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
index 9a231a18c7..bd211aad97 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.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 UnexpectedImplementationElement extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("UnexpectedImplementationElement", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
index 4ae88b9ba3..61956a8712 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.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;
 /**
@@ -51,7 +51,7 @@ public class UnexpectedInterfaceElement extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
         assertNotNull(problem);
         assertEquals("UnexpectedInterfaceElement", problem.getMessageId());