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

branches/sca-java-1.3/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java

@@ -20,6 +20,7 @@ package calculator.warning;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.osoa.sca.annotations.Property;
 
 /**

branches/sca-java-1.3/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java

@@ -20,6 +20,7 @@ package calculator.warning;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.osoa.sca.annotations.Property;
 import org.osoa.sca.annotations.Service;
 

branches/sca-java-1.3/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java

@@ -20,6 +20,7 @@ package calculator.warning;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.osoa.sca.annotations.Service;
 
 /**

branches/sca-java-1.3/itest/validation/src/main/java/impl/java/AddServiceImpl.java

@@ -20,6 +20,7 @@ package impl.java;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.osoa.sca.annotations.Property;
 
 /**

branches/sca-java-1.3/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java

@@ -19,6 +19,7 @@
 package interfacejava.xml;
 
 import org.osoa.sca.annotations.Reference;
+
 import calculator.warning.AddService;
 import calculator.warning.DivideService;
 import calculator.warning.MultiplyService;

branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/ContributionReadException.java

@@ -19,9 +19,10 @@
 package assembly.xml;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java

@@ -19,9 +19,10 @@
 package assembly.xml;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java

@@ -19,9 +19,10 @@
 package assembly.xml;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java

@@ -19,9 +19,10 @@
 package assembly.xml;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java

@@ -19,9 +19,10 @@
 package assembly.xml;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java

@@ -19,9 +19,11 @@
 package assembly.xml;
 
 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;
 /**
  * This shows how to test the Calculator service component.

branches/sca-java-1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java

@@ -19,9 +19,11 @@
 package binding.ejb;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java

@@ -19,10 +19,12 @@
 package binding.ejb;
 
 import junit.framework.TestCase;
-import domain.CustomCompositeBuilder;
+
 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;
 
 /**
  * This shows how to test the Calculator service component.

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java

@@ -19,9 +19,10 @@
 package binding.wsxml;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java

@@ -19,9 +19,10 @@
 package binding.wsxml;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java

@@ -19,9 +19,10 @@
 package binding.wsxml;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java

@@ -19,9 +19,10 @@
 package binding.wsxml;
 
 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;
 

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.
  */

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.
  */

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;

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;

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.
  */

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.
  */

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.
  */

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.
  */

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.
  */

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.

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.
  */

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.
  */

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.
  */

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.
  */

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.
  */

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.
  */

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.
  */

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.
  */

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.
  */

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.
  */

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.
  */

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.
  */

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.
  */

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.

branches/sca-java-1.3/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java

@@ -19,9 +19,10 @@
 package contribution.java;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java

@@ -19,9 +19,10 @@
 package contribution.namespace;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java

@@ -19,9 +19,10 @@
 package contribution.resource;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java

@@ -19,9 +19,10 @@
 package contribution.xml;
 
 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;
 

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;
 

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;
 

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;
 

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;
 

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;
 

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.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 

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;
 

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.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 

branches/sca-java-1.3/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java

@@ -19,9 +19,10 @@
 package impl.java;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java

@@ -19,9 +19,10 @@
 package impl.java;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java

@@ -19,10 +19,12 @@
 package impl.osgi;
 
 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 org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
+
 import domain.CustomCompositeBuilder;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java

@@ -19,10 +19,12 @@
 package impl.osgi;
 
 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 org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
+
 import domain.CustomCompositeBuilder;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java

@@ -19,10 +19,12 @@
 package impl.osgi;
 
 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 org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
+
 import domain.CustomCompositeBuilder;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java

@@ -23,7 +23,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.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 

branches/sca-java-1.3/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java

@@ -19,9 +19,10 @@
 package impl.resource;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java

@@ -19,9 +19,10 @@
 package impl.spring;
 
 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.DefaultLoggingMonitorImpl;
+
 import domain.CustomCompositeBuilder;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java

@@ -19,9 +19,11 @@
 package impl.spring;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java

@@ -19,9 +19,11 @@
 package impl.spring;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java

@@ -23,7 +23,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.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
 
 import domain.CustomCompositeBuilder;
 

branches/sca-java-1.3/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java

@@ -19,9 +19,10 @@
 package impl.widget;
 
 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;
 

branches/sca-java-1.3/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java

@@ -19,9 +19,11 @@
 package impl.xquery;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java

@@ -19,9 +19,11 @@
 package impl.xquery;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java

@@ -19,9 +19,11 @@
 package interfacejava.xml;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java

@@ -19,9 +19,11 @@
 package interfacejava.xml;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java

@@ -19,9 +19,11 @@
 package interfacewsdl.xml;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java

@@ -19,9 +19,11 @@
 package interfacewsdl.xml;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java

@@ -19,9 +19,11 @@
 package policy.xml;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java

@@ -19,9 +19,11 @@
 package policy.xml;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java

@@ -19,9 +19,10 @@
 package policy.xml;
 
 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.DefaultLoggingMonitorImpl;
+
 import domain.CustomCompositeBuilder;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java

@@ -19,9 +19,11 @@
 package policy.xml;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java

@@ -19,9 +19,11 @@
 package policy.xml;
 
 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;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java

@@ -19,9 +19,10 @@
 package policy.xml;
 
 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.DefaultLoggingMonitorImpl;
+
 import domain.CustomCompositeBuilder;
 
 /**

branches/sca-java-1.3/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java

@@ -19,9 +19,11 @@
 package policy.xml;
 
 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;
 
 /**