Convert, clean and bring up a set of itests

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

7 files changed, 13 insertions, 15 deletions

diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
index 1304ba4288..ced30864ff 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
+++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
@@ -23,5 +23,5 @@ import org.osoa.sca.annotations.Remotable;
 
 @Remotable
 public interface AComponent {
-	String foo();
+    String foo();
 }
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
index 3577e09add..627ff4976f 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
+++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
@@ -21,8 +21,8 @@ package org.apache.tuscany.sca.itest.services;
 
 public class AComponentImpl implements AComponent {
 
-	public String foo() {
-		return "AComponent";
-	}
+    public String foo() {
+        return "AComponent";
+    }
 
 }
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
index 2e9b56d64d..d04bd1b985 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
+++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
@@ -21,5 +21,5 @@ package org.apache.tuscany.sca.itest.services;
 
 public interface BComponent {
 
-	String foo();
+    String foo();
 }
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
index cda3f38636..14b70dff04 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
+++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
@@ -24,8 +24,8 @@ import org.osoa.sca.annotations.Service;
 @Service(BComponent.class)
 public class BComponentImpl implements BComponent {
 
-	public String foo() {
-		return "BComponent";
-	}
+    public String foo() {
+        return "BComponent";
+    }
 
 }
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
index aa745deb63..842a85e000 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
+++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.itest.services;
 
-
 public interface D1Component {
-	String foo1();
+    String foo1();
 }
diff --git a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
index 83da15089f..8a3923b351 100644
--- a/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
+++ b/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.itest.services;
 
-
 public interface DComponent {
-	String foo();
+    String foo();
 }
diff --git a/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java b/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
index 9f4dfa39e4..977daf9f6a 100644
--- a/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
+++ b/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
@@ -19,14 +19,14 @@
 
 package org.apache.tuscany.sca.itest.services;
 
-import static junit.framework.Assert.assertEquals;
-import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
 
 import org.apache.tuscany.sca.node.Contribution;
 import org.apache.tuscany.sca.node.ContributionLocationHelper;
 import org.apache.tuscany.sca.node.Node;
 import org.apache.tuscany.sca.node.NodeFactory;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.osoa.sca.ServiceRuntimeException;
@@ -38,7 +38,7 @@ public class ServicesTestCase {
     public static void init() throws Exception {
         String location = ContributionLocationHelper.getContributionLocation("ServicesTest.composite");
         node = NodeFactory.newInstance().createNode("ServicesTest.composite", new Contribution("c1", location));
-        node.start();        
+        node.start();
     }
 
     @AfterClass