Fix for TUSCANY-2409

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@675358 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 7 insertions, 7 deletions

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
index 7854975d40..d05e4712a1 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
@@ -25,9 +25,9 @@ import java.io.File;
 

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;

 import org.apache.tuscany.sca.node.SCAClient;

+import org.apache.tuscany.sca.node.SCAContribution;

 import org.apache.tuscany.sca.node.SCANode2;

 import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;

 import org.junit.After;

 import org.junit.Assert;

 import org.junit.Before;

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
index d0f9692e2e..7eec461476 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
@@ -30,9 +30,9 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceSta
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 import org.apache.tuscany.sca.node.SCAClient;

+import org.apache.tuscany.sca.node.SCAContribution;

 import org.apache.tuscany.sca.node.SCANode2;

 import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
index 2ce6394b58..39ab4319f7 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
@@ -31,9 +31,9 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceReq
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 import org.apache.tuscany.sca.node.SCAClient;

+import org.apache.tuscany.sca.node.SCAContribution;

 import org.apache.tuscany.sca.node.SCANode2;

 import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
index bae7d4cbd8..28df937283 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
@@ -30,9 +30,9 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 import org.apache.tuscany.sca.node.SCAClient;

+import org.apache.tuscany.sca.node.SCAContribution;

 import org.apache.tuscany.sca.node.SCANode2;

 import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
index 0df71474da..02295b0ca6 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
@@ -30,9 +30,9 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 import org.apache.tuscany.sca.node.SCAClient;

+import org.apache.tuscany.sca.node.SCAContribution;

 import org.apache.tuscany.sca.node.SCANode2;

 import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
index fc43064999..fce6ee0d50 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
@@ -29,9 +29,9 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 import org.apache.tuscany.sca.node.SCAClient;

+import org.apache.tuscany.sca.node.SCAContribution;

 import org.apache.tuscany.sca.node.SCANode2;

 import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;

diff --git a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
index 871f806c36..6df7767823 100644
--- a/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ b/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
@@ -29,9 +29,9 @@ import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStat
 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;

 import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;

 import org.apache.tuscany.sca.node.SCAClient;

+import org.apache.tuscany.sca.node.SCAContribution;

 import org.apache.tuscany.sca.node.SCANode2;

 import org.apache.tuscany.sca.node.SCANode2Factory;

-import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

 import org.junit.Test;