diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-03 23:59:53 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-03 23:59:53 +0000 |
commit | 523048c014f0ce4ac463cb864bcc40efc614120b (patch) | |
tree | af5117cb106f92d057a8cc18e15c1a7b967ef2ba /branches/sca-java-1.3/itest/validation/src/test/java/binding | |
parent | 016167dc07fc1674770488005f96bea60267d55c (diff) |
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
Diffstat (limited to '')
23 files changed, 66 insertions, 24 deletions
diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java index bb91ce4404..1cef8a902e 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java @@ -19,9 +19,11 @@ package binding.ejb; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java index a930de1d6e..bacddc93a8 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java @@ -19,10 +19,12 @@ package binding.ejb; import junit.framework.TestCase; -import domain.CustomCompositeBuilder; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + +import domain.CustomCompositeBuilder; /** * This shows how to test the Calculator service component. diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java index 3cbb9cbabb..e0e5347d96 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java index c565971650..9e08afec09 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java index 691980d686..bae9656433 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java index c39c62f14b..a2a5b0b872 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java index 3d78bf6c93..64b41623de 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java index a9a6358061..86fbe51dad 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java index d941663166..6e884c41cd 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java index 1a596b8ed2..c237f8af18 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java index 49be5ff493..949ec02134 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java index b7e05d748f..a974ef0db4 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java index 7dcfcb3f38..adbaa50dc0 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java index 3e0cb17bdc..4bba6b74de 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java index cfb8dd4d82..8f4fc1a739 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java index d2b36ed202..d9e1c782a8 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java index ae3cc5fa1d..3e4e36d839 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java index 015687136a..60ea47a85f 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java index 49c6292d49..6a75a35f99 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java @@ -19,9 +19,11 @@ package binding.jms; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + import domain.CustomCompositeBuilder; /** diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java index 9f8ca78406..c0f60a848f 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java @@ -19,9 +19,10 @@ package binding.wsxml; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; import domain.CustomCompositeBuilder; diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java index e9e56686e0..5a74194796 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java @@ -19,9 +19,10 @@ package binding.wsxml; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; import domain.CustomCompositeBuilder; diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java index baea34c8ab..7991de7176 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java @@ -19,9 +19,10 @@ package binding.wsxml; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; import domain.CustomCompositeBuilder; diff --git a/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java index 5fc5e39f9c..a0a7d12b9f 100644 --- a/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java +++ b/branches/sca-java-1.3/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java @@ -19,9 +19,10 @@ package binding.wsxml; import junit.framework.TestCase; + import org.apache.tuscany.sca.monitor.Monitor; import org.apache.tuscany.sca.monitor.Problem; -import org.apache.tuscany.sca.monitor.impl.DefaultLoggingMonitorImpl; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; import domain.CustomCompositeBuilder; |