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

24 files changed, 22 insertions, 80 deletions

diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
index ddebf877bb..910284572b 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
index 4fabf946a9..fa81f6e277 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
index 979e8e389f..1a61cec239 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
@@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
index 4b09a561a2..5e445ba732 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
@@ -27,7 +27,7 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
index 2313fa6c61..e3a145d01a 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
index 43b7c811d9..586ff2c48a 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
index bfb662379b..284b657035 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
index 100a6c2011..3529bc2bf4 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
@@ -27,14 +27,12 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
index 53d1136065..b19f26eb77 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
index 700e550467..1cdfa0ae80 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
@@ -23,17 +23,10 @@ import java.io.File;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
 
 /**
  * This shows how to test the Calculator service component.
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
index 0c14651b16..ca2cd0b6c8 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
index dc384c8047..a79e902b2b 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
index 3435befd97..06d4f4c3e0 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
index aea571fead..49f6868159 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
index 5a1554976c..f0123787ae 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
index 22d70042aa..53a99ce8ab 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
index c7b691810b..c2111faef3 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
index 170e4ff801..c700768fba 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
index 4d4adfbf32..8c9e0b2ffb 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
index 2c239bb003..4692cae18f 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
index a8fb1d07cf..15294e04a6 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
index 9ea6d8915a..7876354ae1 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
@@ -27,15 +27,13 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
index 268a8539e1..e72c6842df 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
@@ -27,14 +27,12 @@ import org.apache.tuscany.sca.core.UtilityExtensionPoint;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 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 org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
 import org.apache.tuscany.sca.node.impl.NodeImpl;
 
-import calculator.warning.CalculatorService;
-
 /**
  * This shows how to test the Calculator service component.
  */
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
index ea771deaca..0e7ad31597 100644
--- a/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ b/branches/sca-java-1.3/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
@@ -20,23 +20,12 @@ package calculator.warning;
 
 import java.io.File;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCANode2;
 import org.apache.tuscany.sca.node.SCANode2Factory;
 import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
-import org.osoa.sca.ServiceRuntimeException;
-
-import calculator.warning.CalculatorService;
 
 /**
  * This shows how to test the Calculator service component.