Updates to get the basic one node test working again after the renames

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

2 files changed, 37 insertions, 17 deletions

diff --git a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java b/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java
index 8b98aa9f3e..ee5e346bcf 100644
--- a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java
+++ b/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestClientImpl.java
@@ -23,14 +23,11 @@ import itest.iface.NonSimpleType;
 import itest.iface.SomeException;

 import itest.iface.TestService;

 

-import org.oasisopen.sca.annotation.EagerInit;

-import org.oasisopen.sca.annotation.Init;

 import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

+import org.oasisopen.sca.annotation.Service;

 

-@Scope("COMPOSITE")

-@EagerInit

-public class TestClientImpl implements TestService {

+@Service(TestIt.class)

+public class TestClientImpl implements TestIt, TestService {

 

     @Reference

     protected TestService service;

@@ -47,22 +44,19 @@ public class TestClientImpl implements TestService {
         return service.testCT(name);

     }

     

-    @Init

-    public void init() {

+    public boolean testIt() {

         try {

             System.out.println(sayHello("petra"));            

-        } catch (Exception e) {

-            e.printStackTrace();

-        }

-        try {

             System.out.println(testCT(new NonSimpleType("beate")).getName());            

+            try {

+                System.out.println(testCT(new NonSimpleType("bang")).getName());            

+            } catch (SomeException e) {

+                // expected

+            }

+            return true;

         } catch (Exception e) {

             e.printStackTrace();

-        }

-        try {

-            System.out.println(testCT(new NonSimpleType("bang")).getName());            

-        } catch (Exception e) {

-            e.printStackTrace();

+            return false;

         }

     }

 }

diff --git a/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java b/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java
new file mode 100644
index 0000000000..5623be9d9a
--- /dev/null
+++ b/sca-java-2.x/trunk/itest/import-export/client/src/main/java/itest/test/TestIt.java
@@ -0,0 +1,26 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package itest.test;

+

+public interface TestIt {

+    

+    boolean testIt();

+

+}