Fixes for TUSCANY-2690

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

8 files changed, 16 insertions, 16 deletions

diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
index 9d97e3611a..96bb9a7a35 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.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 AttributeUnrecognizedNamespaceTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("AttributeUnrecognizedNamespace", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
index 80c15dc444..eb2eedb340 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.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 AttributeWithoutNamespaceTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("AttributeWithoutNamespace", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
index 81e8aecfeb..e93918a94c 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.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 BPELProcessNotFoundTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("BPELProcessNotFound", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
index fb0c525aea..2abfe45d24 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.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 CannotResolveWSDLReferenceTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("CannotResolveWSDLReference", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
index 445629457e..b6c3b6c7c9 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.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 MyRolePartnerRoleNullTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("MyRolePartnerRoleNull", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
index 00b904ae65..c623c2b157 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
@@ -21,7 +21,7 @@ package impl.bpel;
 import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
-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 PartnerLinkHasBothAttrTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr"));
+    	assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr"));
     	/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
     	assertNotNull(problem);
         assertEquals("PartnerLinkHasBothAttr", problem.getMessageId());*/
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
index b7a4ee6fef..02a0de4724 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.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 PartnerLinkNoMatchingTypeTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+    	Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
         
     	assertNotNull(problem);
         assertEquals("PartnerLinkNoMatchingType", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
index 32d3211f36..d55c2a66b9 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
@@ -21,7 +21,7 @@ package impl.bpel;
 import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.monitor.Monitor;
-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 PartnerLinkTypeNoRolesTestCase extends TestCase {
 
     public void testCalculator() {
     	Monitor monitor = customDomain.getMonitorInstance();
-    	assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles"));
+    	assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles"));
     	/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();        
     	assertNotNull(problem);
         assertEquals("PartnerLinkTypeNoRoles", problem.getMessageId());*/