From 523048c014f0ce4ac463cb864bcc40efc614120b Mon Sep 17 00:00:00 2001 From: rfeng Date: Thu, 3 Jul 2008 23:59:53 +0000 Subject: Merge the fix from trunk to fix compilation errors caused by r673817 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@673874 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/java/assembly/xml/ContributionReadException.java | 3 ++- .../src/test/java/assembly/xml/PolicyImplValidationException.java | 3 ++- .../src/test/java/assembly/xml/PolicyServiceValidationException.java | 3 ++- .../src/test/java/assembly/xml/UnexpectedBindingElement.java | 3 ++- .../src/test/java/assembly/xml/UnexpectedImplementationElement.java | 3 ++- .../src/test/java/assembly/xml/UnexpectedInterfaceElement.java | 4 +++- 6 files changed, 13 insertions(+), 6 deletions(-) (limited to 'branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml') diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/ContributionReadException.java index 0200e6bd84..9b0d51eb59 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/ContributionReadException.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/ContributionReadException.java @@ -19,9 +19,10 @@ package assembly.xml; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; import domain.CustomCompositeBuilder; diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java index ce5506a67c..e8476991a9 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java @@ -19,9 +19,10 @@ package assembly.xml; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; import domain.CustomCompositeBuilder; diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java index b9260c4e26..8ae156d63e 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java @@ -19,9 +19,10 @@ package assembly.xml; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; import domain.CustomCompositeBuilder; diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java index 4c5aa48373..d757ff98dd 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java @@ -19,9 +19,10 @@ package assembly.xml; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; import domain.CustomCompositeBuilder; diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java index 3ba5dc4b74..9a231a18c7 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java @@ -19,9 +19,10 @@ package assembly.xml; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; import domain.CustomCompositeBuilder; diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java index f20d89abac..4ae88b9ba3 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java @@ -19,9 +19,11 @@ package assembly.xml; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** * This shows how to test the Calculator service component. -- cgit v1.2.3