summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x/itest/validation
diff options
context:
space:
mode:
authorramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>2008-11-26 10:53:06 +0000
committerramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>2008-11-26 10:53:06 +0000
commit7ac90896b8149bb6ba09a5f631c7213af191d65f (patch)
tree525e3eeb3455c96febfa2f06e290a601b5aecdc3 /branches/sca-java-1.x/itest/validation
parent7e3b571f1ba4a17a09070adab74e8f159841da7c (diff)
Fixes for TUSCANY-2690
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@720798 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/itest/validation')
-rw-r--r--branches/sca-java-1.x/itest/validation/pom.xml2
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java4
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java2
-rw-r--r--branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java4
95 files changed, 188 insertions, 188 deletions
diff --git a/branches/sca-java-1.x/itest/validation/pom.xml b/branches/sca-java-1.x/itest/validation/pom.xml
index 828b209520..c671f4bf06 100644
--- a/branches/sca-java-1.x/itest/validation/pom.xml
+++ b/branches/sca-java-1.x/itest/validation/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-monitor-logging</artifactId>
+ <artifactId>tuscany-monitor</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
index 9b0d51eb59..0b3a828a41 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class ContributionReadException extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ContributionReadException", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
index e8476991a9..14e47f464a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class PolicyImplValidationException extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PolicyImplValidationException", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
index 8ae156d63e..c4cdc2358d 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class PolicyServiceValidationException extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PolicyServiceValidationException", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
index d757ff98dd..18d9820d10 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class UnexpectedBindingElement extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnexpectedBindingElement", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
index 9a231a18c7..bd211aad97 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class UnexpectedImplementationElement extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnexpectedImplementationElement", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
index 4ae88b9ba3..61956a8712 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
/**
@@ -51,7 +51,7 @@ public class UnexpectedInterfaceElement extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnexpectedInterfaceElement", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
index ff94ad7b93..773f347170 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -59,7 +59,7 @@ public class UnknownEJBSessionTypeTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnknownEJBSessionType", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
index a192674aeb..9ebfa0637b 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -58,7 +58,7 @@ public class UnknownEJBVersionTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnknownEJBVersion", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
index e0e5347d96..6e7f460a09 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class DoesntProcessActivationSpecTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DoesntProcessActivationSpec", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
index 9e08afec09..d32bb33d93 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class DoesntProcessDestinationTypeTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DoesntProcessDestinationType", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
index ed96072780..2ba2e6cd12 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.junit.Ignore;
import domain.CustomCompositeBuilder;
@@ -54,7 +54,7 @@ public class DoesntProcessHeadersTestCase extends TestCase {
@Ignore("TUSCANY-2532")
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
// assertEquals("DoesntProcessHeaders", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
index a2a5b0b872..06b5140485 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class DoesntProcessResourceAdapterTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DoesntProcessResourceAdapter", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
index 64b41623de..3cd9e54fea 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class DoesntProcessResponseActivationSpecTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DoesntProcessResponseActivationSpec", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
index 86fbe51dad..78753fc82f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class DoesntProcessResponseConnectionFactoryTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DoesntProcessResponseConnectionFactory", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
index 6e884c41cd..011d9e427d 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class DoesntProcessResponseDestinationTypeTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DoesntProcessResponseDestinationType", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
index c237f8af18..f0b798c2e4 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class InvalidCorrelationSchemeTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("InvalidCorrelationScheme", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
index 52dc7e5795..a114501098 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSDeliveryModeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class InvalidJMSDeliveryModeTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("InvalidJMSDeliveryMode", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
index a93df290c3..d31e02054a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidJMSPriorityTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class InvalidJMSPriorityTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("InvalidJMSPriority", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
index 949ec02134..1727217fe0 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class InvalidResponseDestinationTypeTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("InvalidResponseDestinationType", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
index d38a88744f..33bf2882e5 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class MissingActivationSpecNameTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+ Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1);
assertNotNull(problem);
assertEquals("MissingActivationSpecName", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
index 6999ae7969..fcb4345293 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class MissingConnectionFactoryNameTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+ Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1);
assertNotNull(problem);
assertEquals("MissingConnectionFactoryName", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
index 7333fc0f1e..04d1ba1055 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class MissingResponseActivationSpecTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+ Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1);
assertNotNull(problem);
assertEquals("MissingResponseActivationSpec", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
index ca0ef9a294..8725a714e8 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class MissingResponseConnectionFactoryTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(1);
+ Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(1);
assertNotNull(problem);
assertEquals("MissingResponseConnectionFactory", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
index d9e1c782a8..b62cd22d6f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class MustStartWithSchemaTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("MustStartWithSchema", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
index 3e4e36d839..90a82ebe1f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class UnexpectedElementTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnexpectedElement", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
index 60ea47a85f..9227674815 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class UnexpectedResponseElementTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnexpectedResponseElement", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
index 6a75a35f99..df86fe1564 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class UnknownTokenInURITestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnknownTokenInURI", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
index c0f60a848f..00e6873361 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class InvalidWsdlElementAttrTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("InvalidWsdlElementAttr", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
index 5a74194796..6b2bf20329 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class MustUseWsdlBindingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("MustUseWsdlBinding", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
index 7991de7176..8c21abb896 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class WsdlBindingDoesNotMatchTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("WsdlBindingDoesNotMatch", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
index 1ef5f7b00a..83b4722b60 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class WsdlPortTypeDoesNotMatchTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("WsdlPortTypeDoesNotMatch", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
index a0a7d12b9f..8f7786f08a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class WsdlServiceDoesNotMatchTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("WsdlServiceDoesNotMatch", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
index 555810f453..6426e8599b 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -68,7 +68,7 @@ public class ComponentReferenceTargetNotFoundTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ComponentReferenceTargetNotFound", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
index 4d70df1102..5e41d1d1ed 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -53,7 +53,7 @@ public class DuplicateComponentNameTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DuplicateComponentName", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
index 7593f39991..173d1e4a20 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ b/branches/sca-java-1.x/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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
@@ -56,7 +56,7 @@ public class DuplicateImplementationPropertyNameTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DuplicateImplementationPropertyName", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
index 0a711175dc..e016a1465b 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ b/branches/sca-java-1.x/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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
@@ -57,7 +57,7 @@ public class DuplicateImplementationReferenceNameTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DuplicateImplementationReferenceName", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
index 10660795a7..2e4a3daeca 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class DuplicatePropertyNameTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DuplicateComponentPropertyName", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
index 15b4b15989..38bb190af6 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class DuplicateReferenceNameTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DuplicateComponentReferenceName", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
index 55741ec2ef..0bbb3a5074 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class MultipleBindingsForServiceTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("MultipleBindingsForService", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
index 7f8bd68e5e..d8a19eb5c7 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
@@ -58,7 +58,7 @@ public class NoComponentImplementationTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("NoComponentImplementation", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
index 1f26d3a7d6..313c8fdbe0 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class NoCompositeNamespaceTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("NoCompositeNamespace", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
index d398efc9ea..cf86d01f3d 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -64,7 +64,7 @@ public class NoMatchingBindingTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("NoMatchingBinding", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
index 9d2f028dea..3578567b2a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class PromotedReferenceNotFoundTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PromotedReferenceNotFound", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
index 7f836e4b01..4688f836e0 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class PromotedServiceNotFoundTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PromotedServiceNotFound", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
index 04c2594cd3..b0883a5227 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class PropertyAttributeMustSupplyNullTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PropertyMustSupplyNull", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
index 3dabfecbb6..1d6f905c20 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class PropertyAttributeTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PropertyMustSupplyIncompatible", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
index 0dca8ed1df..4d91dfb79c 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class PropertyNotFoundTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PropertyNotFound", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
index 37f7ef352e..73a83dd074 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class PropertyOverrideManyAttributeTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PropertyOverrideManyAttribute", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
index ab57283a9e..993ccde9fd 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class ReferenceIncompatibleComponentInterfaceTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ReferenceIncompatibleComponentInterface", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
index 4c3cc3856a..6dc8a321fc 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class ReferenceIncompatibleInterfaceTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ReferenceIncompatibleInterface", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
index 06fb06f6ad..66b233b87a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class ReferenceIncompatibleMultiplicityTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ReferenceIncompatibleMultiplicity", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
index 6bacc8b05e..2e676282ae 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -73,7 +73,7 @@ public class ReferenceNotFoundTestCase extends TestCase {
public void testCalculator() throws Exception {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ReferenceNotFound", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
index d615857105..ef67ece5e9 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class ReferenceWithoutTargetsTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ReferenceWithoutTargets", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
index e9b920119a..b9bbd3fdd3 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAClient;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
@@ -62,7 +62,7 @@ public class ServiceNotFoundForComponentServiceTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ServiceNotFoundForComponentService", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
index 4d950e30ff..040adc09c7 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.node.SCAContribution;
import org.apache.tuscany.sca.node.SCANode;
import org.apache.tuscany.sca.node.SCANodeFactory;
@@ -58,7 +58,7 @@ public class UnresolvedComponentImplementationTestCase extends TestCase {
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
Monitor monitor = monitorFactory.createMonitor();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnresolvedComponentImplementation", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
index 04135ab2cc..c306373ecb 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class AttributePackageMissingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("AttributePackageMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
index ab0afc6f65..c412a16f24 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class AttributeNameSpaceMissingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("AttributeNameSpaceMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
index b01ec2a254..05b0ee7771 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class AttributeURIMissingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getProblems().get(2);
+ Problem problem = ((DefaultMonitorImpl)monitor).getProblems().get(2);
assertNotNull(problem);
assertEquals("AttributeURIMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
index 32c1a8b3a8..e966c5104a 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class AttributeCompositeMissingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("AttributeCompositeMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
index 0a71ea06c7..28bc3af4e3 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/contribution/xml/MultipleCompositeErrorsTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -54,7 +54,7 @@ public class MultipleCompositeErrorsTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals(5, monitor.getProblems().size());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
index 9d97e3611a..96bb9a7a35 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class AttributeUnrecognizedNamespaceTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("AttributeUnrecognizedNamespace", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
index 80c15dc444..eb2eedb340 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class AttributeWithoutNamespaceTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("AttributeWithoutNamespace", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
index 81e8aecfeb..e93918a94c 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class BPELProcessNotFoundTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("BPELProcessNotFound", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
index fb0c525aea..2abfe45d24 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class CannotResolveWSDLReferenceTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("CannotResolveWSDLReference", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
index 445629457e..b6c3b6c7c9 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class MyRolePartnerRoleNullTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("MyRolePartnerRoleNull", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
index 00b904ae65..c623c2b157 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
@@ -21,7 +21,7 @@ package impl.bpel;
import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -51,7 +51,7 @@ public class PartnerLinkHasBothAttrTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr"));
+ assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("PartnerLinkHasBothAttr"));
/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PartnerLinkHasBothAttr", problem.getMessageId());*/
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
index b7a4ee6fef..02a0de4724 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class PartnerLinkNoMatchingTypeTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PartnerLinkNoMatchingType", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
index 32d3211f36..d55c2a66b9 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
@@ -21,7 +21,7 @@ package impl.bpel;
import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -51,7 +51,7 @@ public class PartnerLinkTypeNoRolesTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles"));
+ assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("PartnerLinkTypeNoRoles"));
/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PartnerLinkTypeNoRoles", problem.getMessageId());*/
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
index b31451c433..e0a3216d52 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/ejb/EJBLinkAttributeMissingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class EJBLinkAttributeMissingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("EJBLinkAttributeMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
index 3a7745722a..24d1c197a6 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class ClassNotFoundExceptionTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ClassNotFoundException", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
index 59fc3ce79c..e3e38e86c3 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class ContributionResolveExceptionTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
index 6f54ad140c..b51403fec1 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
import domain.CustomCompositeBuilder;
@@ -56,7 +56,7 @@ public class CouldNotLocateOSGiBundleTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("CouldNotLocateOSGiBundle", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
index 3d75fa8ccc..e6ee9d42fe 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
import domain.CustomCompositeBuilder;
@@ -56,7 +56,7 @@ public class MissingComponentTypeFileTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("MissingComponentTypeFile", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
index 117a94337a..4a82f569de 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
import domain.CustomCompositeBuilder;
@@ -56,7 +56,7 @@ public class PropertyShouldSpecifySRTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("PropertyShouldSpecifySR", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
index 14ba8e992e..5881d866a0 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
+++ b/branches/sca-java-1.x/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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -51,7 +51,7 @@ public class CouldNotResolveLocationTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
Assert.assertNotNull(problem);
Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
index 461895f824..8fefaa05eb 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class LocationAttributeMissingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("LocationAttributeMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
index 9b7dbef3dd..ebdd05d980 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
@@ -21,7 +21,7 @@ package impl.spring;
import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -51,7 +51,7 @@ public class ContributionResolveExceptionTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("ContributionResolveException"));
+ assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("ContributionResolveException"));
//assertEquals("ContributionResolveException", problem.getMessageId());
}
}
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
index cd38b53f66..7974aa5daf 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class LocationAttributeMissingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("LocationAttributeMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
index 83550ae58d..0ad7bc0918 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class UnableToResolveComponentTypeTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
//assertNotNull(problem);
//assertEquals("UnableToResolveComponentType", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
index d098bb4bf8..3935afa79c 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
+++ b/branches/sca-java-1.x/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.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -51,7 +51,7 @@ public class CouldNotResolveLocationTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
Assert.assertNotNull(problem);
Assert.assertEquals("CouldNotResolveLocation", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
index 2f85d8ed4a..daf8eab56f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class LocationAttributeMissingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("LocationAttributeMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
index f90fc3b83f..3dbbc61d9c 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class CouldNotLocateFileTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("CouldNotLocateFile", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
index 01450a8836..584c11c061 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class LocationAttributeMissingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("LocationAttributeMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
index a03e056298..d941f41d2e 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class ClassNotFoundTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ClassNotFoundException", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
index e0524f57b7..0fb397011b 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class ContributionResolveExceptionTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
//assertNotNull(problem);
//assertEquals("ContributionResolveException", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
index e212477c61..f244ca7ec6 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class InvalidWSDLInterfaceAttrTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("InvalidWSDLInterfaceAttr", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
index df2a2671df..2149942c25 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class WsdlInterfaceDoesNotMatchTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("WsdlInterfaceDoesNotMatch", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
index 361e2f2bfb..1254f273b7 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class AlwaysProvidedIntentNotFoundTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("AlwaysProvidedIntentNotFound", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
index a85dc334f4..150a9267c1 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class ErrorInPolicyIntentDefinitionTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("ErrorInPolicyIntentDefinition", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
index 3f98757ce5..1e243689d6 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
@@ -21,7 +21,7 @@ package policy.xml;
import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -51,7 +51,7 @@ public class IntentNotSpecifiedTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- assertTrue(((DefaultLoggingMonitorImpl)monitor).isMessageLogged("IntentNotSpecified"));
+ assertTrue(((DefaultMonitorImpl)monitor).isMessageLogged("IntentNotSpecified"));
/*Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("IntentNotSpecified", problem.getMessageId());*/
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
index 3b8d075165..f2b0b7222f 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class MayProvideIntentNotFoundTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("MayProvideIntentNotFound", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
index bcf1f82392..e5aba5b481 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class RequiredAttributeMissingTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("RequiredAttributeMissing", problem.getMessageId());
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
index 5683d54e64..5bfc77d267 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
@@ -21,7 +21,7 @@ package policy.xml;
import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import org.junit.Ignore;
import domain.CustomCompositeBuilder;
diff --git a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
index eec39d711e..64b527e131 100644
--- a/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
+++ b/branches/sca-java-1.x/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
@@ -22,7 +22,7 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
+import org.apache.tuscany.sca.monitor.impl.DefaultMonitorImpl;
import domain.CustomCompositeBuilder;
@@ -52,7 +52,7 @@ public class UnrecognizedIntentAttachPointTypeTestCase extends TestCase {
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
+ Problem problem = ((DefaultMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("UnrecognizedIntentAttachPointType", problem.getMessageId());