Merge the fix from trunk to fix compilation errors caused by r673817

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

8 files changed, 16 insertions, 10 deletions

diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
index f38432fe6d..9d97e3611a 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
@@ -19,9 +19,10 @@
 package impl.bpel;
 
 import junit.framework.TestCase;
+
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
index 767744ba73..80c15dc444 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
@@ -19,9 +19,10 @@
 package impl.bpel;
 
 import junit.framework.TestCase;
+
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
index 3a0af571fe..81e8aecfeb 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
@@ -19,9 +19,10 @@
 package impl.bpel;
 
 import junit.framework.TestCase;
+
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
index a3e19103e3..fb0c525aea 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
@@ -19,9 +19,10 @@
 package impl.bpel;
 
 import junit.framework.TestCase;
+
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
index d08f8c0ce1..445629457e 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
@@ -19,9 +19,10 @@
 package impl.bpel;
 
 import junit.framework.TestCase;
+
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
index 78cc0cef16..00b904ae65 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
@@ -19,9 +19,9 @@
 package impl.bpel;
 
 import junit.framework.TestCase;
+
 import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
index 4981105395..b7a4ee6fef 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
@@ -19,9 +19,10 @@
 package impl.bpel;
 
 import junit.framework.TestCase;
+
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
index 4007aace79..32d3211f36 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
@@ -19,9 +19,9 @@
 package impl.bpel;
 
 import junit.framework.TestCase;
+
 import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;