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

17 files changed, 51 insertions, 17 deletions

diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
index 3cbb9cbabb..e0e5347d96 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/DoesntProcessDestinationTypeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
index c565971650..9e08afec09 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/DoesntProcessHeadersTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
index 691980d686..bae9656433 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/DoesntProcessResourceAdapterTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
index c39c62f14b..a2a5b0b872 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
index 3d78bf6c93..64b41623de 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
index a9a6358061..86fbe51dad 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
index d941663166..6e884c41cd 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/InvalidCorrelationSchemeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
index 1a596b8ed2..c237f8af18 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/InvalidResponseDestinationTypeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
index 49be5ff493..949ec02134 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/MissingActivationSpecNameTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
index b7e05d748f..a974ef0db4 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/MissingConnectionFactoryNameTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
index 7dcfcb3f38..adbaa50dc0 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/MissingResponseActivationSpecTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
index 3e0cb17bdc..4bba6b74de 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/MissingResponseConnectionFactoryTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
index cfb8dd4d82..8f4fc1a739 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/MustStartWithSchemaTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
index d2b36ed202..d9e1c782a8 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/UnexpectedElementTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
index ae3cc5fa1d..3e4e36d839 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/UnexpectedResponseElementTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
index 015687136a..60ea47a85f 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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/binding/jms/UnknownTokenInURITestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
index 49c6292d49..6a75a35f99 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
@@ -19,9 +19,11 @@
 package binding.jms;
 
 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;
 
 /**