From cde3d2629677a07aa09e3c7fbe117b680c0f5df7 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:09:08 +0000 Subject: Moving 2.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835133 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca-equinox/itest/callablereferences/pom.xml | 81 ------------ .../tuscany/sca/itest/callableref/AComponent.java | 39 ------ .../sca/itest/callableref/AComponentImpl.java | 114 ---------------- .../tuscany/sca/itest/callableref/BComponent.java | 30 ----- .../sca/itest/callableref/BComponentImpl.java | 38 ------ .../tuscany/sca/itest/callableref/CComponent.java | 27 ---- .../sca/itest/callableref/CComponentImpl.java | 30 ----- .../tuscany/sca/itest/callableref/DComponent.java | 30 ----- .../sca/itest/callableref/DComponentImpl.java | 65 --------- .../ConversationalService.java | 68 ---------- .../ConversationalServiceImpl.java | 111 ---------------- .../tuscany/sca/itest/callablerefreturn/Alpha.java | 27 ---- .../sca/itest/callablerefreturn/AlphaImpl.java | 86 ------------ .../tuscany/sca/itest/callablerefreturn/Beta.java | 28 ---- .../sca/itest/callablerefreturn/BetaImpl.java | 44 ------- .../tuscany/sca/itest/callablerefreturn/Gamma.java | 35 ----- .../sca/itest/callablerefreturn/GammaImpl.java | 47 ------- .../CallableReferenceConversationalTest.composite | 29 ----- .../CallableReferenceReturnTest.composite | 39 ------ .../main/resources/CallableReferenceTest.composite | 45 ------- .../src/main/resources/nodeA/CompositeA.composite | 46 ------- .../resources/nodeA/META-INF/sca-contribution.xml | 22 ---- .../src/main/resources/nodeB/CompositeB.composite | 43 ------ .../resources/nodeB/META-INF/sca-contribution.xml | 22 ---- .../CallableReferenceConversationalTestCase.java | 109 ---------------- .../CallableReferenceRemoteTestCase.java | 145 --------------------- .../CallableReferenceReturnTestCase.java | 48 ------- .../callableref/CallableReferenceTestCase.java | 83 ------------ 28 files changed, 1531 deletions(-) delete mode 100644 branches/sca-equinox/itest/callablereferences/pom.xml delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceTest.composite delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite delete mode 100644 branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml delete mode 100644 branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java delete mode 100644 branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java (limited to 'branches/sca-equinox/itest/callablereferences') diff --git a/branches/sca-equinox/itest/callablereferences/pom.xml b/branches/sca-equinox/itest/callablereferences/pom.xml deleted file mode 100644 index 7548d39ba5..0000000000 --- a/branches/sca-equinox/itest/callablereferences/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4-EQUINOX-SNAPSHOT - ../pom.xml - - itest-callablereferences - Apache Tuscany SCA Callable References Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4-EQUINOX-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-impl - 1.4-EQUINOX-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4-EQUINOX-SNAPSHOT - runtime - - - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.4-EQUINOX-SNAPSHOT - test - - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.4-EQUINOX-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-binding-sca-axis2 - 1.4-EQUINOX-SNAPSHOT - test - - - diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java deleted file mode 100644 index 5934f16851..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponent.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface AComponent { - String foo(); - - String fooB(); - String fooB1(); - - String fooC(); - String fooC1(); - - String fooStringD(); - String fooD(); - - String fooBC(); - - String invokeDReference(); -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java deleted file mode 100644 index 7c2fd092dc..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import java.io.ByteArrayOutputStream; -import java.io.ObjectOutputStream; - -import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary; -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -@Service(AComponent.class) -public class AComponentImpl implements AComponent { - - @Context - protected ComponentContext componentContext; - - @Reference(name = "bReference") - protected BComponent b; - - @Reference - protected CComponent cReference; - - @Reference - protected ServiceReference cServiceReference; - - @Reference(required=false) - protected DComponent dReference; - - protected DComponent dReference1; - - @Reference(name = "dReference1") - public void setDReference(DComponent dReference) { - this.dReference1 = dReference; - } - - public String foo() { - return "AComponent"; - } - - public String fooB() { - return b.foo(); - } - - public String fooB1() { - CallableReference bRef = componentContext.cast(b); - return bRef.getService().foo(); - } - - public String fooC() { - return cReference.foo(); - } - - public String fooC1() { - return cServiceReference.getService().foo(); - } - - public String fooBC() { - CallableReference cReference = componentContext.getServiceReference(CComponent.class, "cReference"); - return b.fooC(cReference); - } - - public String fooD() { - CallableReference aReference = componentContext.createSelfReference(AComponent.class); - return dReference1.foo(aReference); - } - - /** - * A test case to work out what needs to be done in a transformer to get the - * CallableReference across the wire. Left here for interest in case anyone - * is looking for how to get at the innards of CallableReferences - */ - public String fooStringD() { - CallableReference aReference = componentContext.createSelfReference(AComponent.class); - ByteArrayOutputStream bos = null; - - try { - bos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(bos); - oos.writeObject(aReference); - } catch (Exception ex) { - System.out.println(ex.toString()); - return null; - } - - String aReferenceString = Base64Binary.encode(bos.toByteArray()); - return dReference1.fooString(aReferenceString); - } - - public String invokeDReference() { - return dReference.foo(null); - } - -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java deleted file mode 100644 index ade672b0ab..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponent.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface BComponent { - - String foo(); - - String fooC(CallableReference cComponent); -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java deleted file mode 100644 index 518e77d3a8..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/BComponentImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Service; - -@Service(BComponent.class) -public class BComponentImpl implements BComponent { - - public BComponentImpl() { - } - - public String foo() { - return "BComponent"; - } - - public String fooC(CallableReference cReference) { - return "B" + cReference.getService().foo(); - } - -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java deleted file mode 100644 index fdf80cc1c8..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponent.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface CComponent { - - String foo(); -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java deleted file mode 100644 index cc8ec8f000..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/CComponentImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import org.osoa.sca.annotations.Service; - -@Service(CComponent.class) -public class CComponentImpl implements CComponent { - - public String foo() { - return "CComponent"; - } - -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java deleted file mode 100644 index 48b697df31..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponent.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface DComponent { - - String foo(CallableReference aReference); - - String fooString(String aReferenceString); -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java deleted file mode 100644 index 27ad48b9fe..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/DComponentImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -import org.apache.tuscany.sca.databinding.impl.XSDDataTypeConverter.Base64Binary; -import org.osoa.sca.CallableReference; -import org.osoa.sca.RequestContext; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Service; - -@Service(DComponent.class) -public class DComponentImpl implements DComponent { - - @Context - protected RequestContext requestContext; - - public String foo(CallableReference aReference) { - try { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - ObjectOutputStream oos = new ObjectOutputStream(bos); - oos.writeObject(aReference); - ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray())); - Object obj = ois.readObject(); - aReference = (CallableReference) obj; - } catch (Exception e) { - e.printStackTrace(); - } - System.out.println("Invoking service: " + requestContext.getServiceName()); - return "D" + aReference.getService().foo(); - } - - public String fooString(String aReferenceString) { - CallableReference aReference = null; - try { - ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(Base64Binary.decode(aReferenceString))); - Object obj = ois.readObject(); - aReference = (CallableReference) obj; - } catch (Exception e) { - e.printStackTrace(); - } - System.out.println("Invoking service: " + requestContext.getServiceName()); - return "D" + aReference.getService().foo(); - } -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java deleted file mode 100644 index abcedfa6e1..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalService.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callablerefconversational; - -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Conversational; - -/** - * Simple conversational Service that is used to testing the method - * ComponentContext.createSelfReference() - * - * @version $Date$ $Revision$ - */ -@Conversational -public interface ConversationalService { - /** - * Default value for the user data - */ - String DEFAULT_USER_DATA = "NOT SET"; - - /** - * Retrieves the conversation ID for this Service - * - * @return The conversation ID for this Service - */ - Object getConversationID(); - - /** - * Creates a self reference to this Service - * - * @return A self reference to this Service - */ - ServiceReference createSelfRef(); - - /** - * Sets some user data on the instance - * - * @param a_Data Some data - * - * @See {@link #getUserData()} - */ - void setUserData(String a_Data); - - /** - * Gets some user data on the instance - * - * @return Some data - * - * @See {@link #setUserData(String)} - */ - String getUserData(); -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java deleted file mode 100644 index f2e0ce7582..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefconversational/ConversationalServiceImpl.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callablerefconversational; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * Simple conversational Service that is used to testing the method - * ComponentContext.createSelfReference() - * - * @version $Date$ $Revision$ - */ -@Service(ConversationalService.class) -@Scope("CONVERSATION") -public class ConversationalServiceImpl implements ConversationalService { - - /** - * The Conversation ID - */ - private Object m_ConversationID; - - /** - * Reference to the ComponentContext. - */ - @Context - protected ComponentContext m_Ctx; - - /** - * Some user data - */ - private String m_UserData = DEFAULT_USER_DATA; - - /** - * Constructor - */ - public ConversationalServiceImpl() { - System.out.println("New instance of " + this + " created"); - } - - /** - * Used to inject the Conversation ID - * - * @param a_ConversationID the Conversation ID - */ - @ConversationID - public void setConversationID(Object a_ConversationID) { - m_ConversationID = a_ConversationID; - System.out.println("Converstation ID set on " + this + " to " + a_ConversationID); - } - - /** - * Retrieves the conversation ID for this Service - * - * @return The conversation ID for this Service - */ - public Object getConversationID() { - return m_ConversationID; - } - - /** - * Creates a self reference to this Service - * - * @return A self reference to this Service - */ - public ServiceReference createSelfRef() { - return m_Ctx.createSelfReference(ConversationalService.class); - } - - /** - * Sets some user data on the instance - * - * @param a_Data Some data - * - * @See {@link #getUserData()} - */ - public void setUserData(String a_Data) { - m_UserData = a_Data; - } - - /** - * Gets some user data on the instance - * - * @return Some data - * - * @See {@link #setUserData(String)} - */ - public String getUserData() { - return m_UserData; - } -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java deleted file mode 100644 index ab21421c4d..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Alpha.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callablerefreturn; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface Alpha -{ - boolean run(); -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java deleted file mode 100644 index 5b5984b164..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/AlphaImpl.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callablerefreturn; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.Conversation; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; - -@Scope("COMPOSITE") -public class AlphaImpl implements Alpha { - @Reference - public Beta beta; - - @Context - protected ComponentContext componentContext; - - public boolean run() { - CallableReference gammaRef = null; - try { - Object conversationId1 = null; - Object conversationId2 = null; - - // it is expected that this call returns a reference to Gamma that - // reuses the established Conversation - gammaRef = beta.getRef(); - - // no Conversation exists - Conversation con = gammaRef.getConversation(); - if (con == null) { - System.out.println("Alpha: Conversation to gamma is null"); - } else { - System.out - .println("Alpha: Conversation to gamma exists. conversationId=" - + con.getConversationID()); - conversationId1 = con.getConversationID(); - } - - // this call should reuse a Conversation, but as none exists it - // creates a new conversation - gammaRef.getService().doSomething(); - con = gammaRef.getConversation(); - if (con == null) { - System.out.println("Alpha: Conversation to gamma is null"); - } else { - System.out - .println("Alpha: Conversation to gamma exists. conversationId=" - + con.getConversationID()); - conversationId2 = con.getConversationID(); - } - - if ((conversationId1 == null) || (conversationId2 == null)) { - return false; - } - - boolean testPassed = conversationId1.equals(conversationId2); - return testPassed; - } catch (Exception e) { - e.printStackTrace(); - return false; - } finally { - if (gammaRef != null) { - gammaRef.getService().stop(); - } - } - } - -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java deleted file mode 100644 index 223c467f47..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Beta.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callablerefreturn; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface Beta -{ - CallableReference getRef(); -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java deleted file mode 100644 index ed4e66bec3..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/BetaImpl.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callablerefreturn; - -import org.osoa.sca.CallableReference; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; - -@Scope("COMPOSITE") -public class BetaImpl implements Beta -{ - @Context - protected ComponentContext componentContext; - - @Reference - public Gamma gamma; - - public CallableReference getRef() - { - ServiceReference gammaRef = componentContext.getServiceReference(Gamma.class, "gamma"); - gammaRef.getService().start(); - return gammaRef; - } - -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java deleted file mode 100644 index e32051373f..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callablerefreturn; - -import org.osoa.sca.annotations.Conversational; -import org.osoa.sca.annotations.EndsConversation; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Conversational -public interface Gamma -{ - void start(); - - void doSomething(); - - @EndsConversation - void stop(); -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java deleted file mode 100644 index adf5a1c1ce..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callablerefreturn; - -import org.osoa.sca.annotations.ConversationID; -import org.osoa.sca.annotations.Scope; - -@Scope("CONVERSATION") -public class GammaImpl implements Gamma -{ - @ConversationID - protected String conversationId; - - - public void start() - { - System.out.println("Gamma:start(), conversationId=" + conversationId); - } - - - public void doSomething() - { - System.out.println("Gamma:doSomething(), conversationId=" + conversationId); - } - - - public void stop() - { - System.out.println("Gamma:stop(), conversationId=" + conversationId); - } -} diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite deleted file mode 100644 index 0bf8f7ef1e..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite deleted file mode 100644 index 5b3add1e61..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceTest.composite deleted file mode 100644 index 49b75f56e4..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/resources/CallableReferenceTest.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite deleted file mode 100644 index 9216f44191..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml deleted file mode 100644 index 95021f72a4..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite deleted file mode 100644 index 42d739564c..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml deleted file mode 100644 index 2edda61601..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java deleted file mode 100644 index a9cbb5d0a1..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.itest.callablerefconversational.ConversationalService; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osoa.sca.ServiceReference; - -/** - * Simple test case that creates a ServiceReference to a Conversational Component - * using ComponentContext.createSelfReference() - *

- * This test case is for TUSCANY-2208 - * - * @version $Date$ $Revision$ - */ -public class CallableReferenceConversationalTestCase { - private static SCADomain domain; - private static ConversationalService acomponent; - - @BeforeClass - public static void init() throws Exception { - domain = SCADomain.newInstance("CallableReferenceConversationalTest.composite"); - Assert.assertNotNull(domain); - acomponent = domain.getService(ConversationalService.class, "ConversationalComponent"); - } - - @AfterClass - public static void destroy() throws Exception { - if (domain != null) { - domain.close(); - } - } - - /** - * This is a dummy test so that this Unit Test has a test so it will build. - * Once TUSCANY-2208 is fixed, this dummy test method can be removed - */ - @Test - public void dummyTestRemoveWhenTuscany2208IsFixed() { - } - - /** - * Tests creating Self References and validate them with Conversation IDs - */ - // Disabled until TUSCANY-2208 is fixed - // @Test - public void testCreateSelfRefUsingConvID() { - Assert.assertNotNull(acomponent); - - final Object origConvID = acomponent.getConversationID(); - Assert.assertNotNull(origConvID); - final ServiceReference ref = acomponent.createSelfRef(); - Assert.assertNotNull(ref); - - final ConversationalService resolvedRef = ref.getService(); - Assert.assertNotNull(resolvedRef); - final Object newConvID = resolvedRef.getConversationID(); - Assert.assertNotNull(newConvID); - - Assert.assertEquals(origConvID, newConvID); - } - - /** - * Tests creating Self References and validate them with user specified data - */ - // Disabled until TUSCANY-2208 is fixed - // @Test - public void testCreateSelfRefUsingUserData() { - Assert.assertNotNull(acomponent); - - final String origUserData = acomponent.getUserData(); - Assert.assertEquals(ConversationalService.DEFAULT_USER_DATA, origUserData); - - final String userData = "Some new user data set at " + System.currentTimeMillis(); - acomponent.setUserData(userData); - - final ServiceReference ref = acomponent.createSelfRef(); - Assert.assertNotNull(ref); - - final ConversationalService resolvedRef = ref.getService(); - Assert.assertNotNull(resolvedRef); - final String newUserData = resolvedRef.getUserData(); - Assert.assertNotNull(newUserData); - - Assert.assertEquals(userData, newUserData); - } -} diff --git a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java deleted file mode 100644 index 927e91a8bc..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - - -import static junit.framework.Assert.assertEquals; - -import java.io.File; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.Client; -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - - -/** - * Runs a distributed domain in a single VM by using and in memory - * implementation of the distributed domain - */ -public class CallableReferenceRemoteTestCase { - - private static Node nodeA; - private static Node nodeB; - - private static AComponent acomponent; - - @BeforeClass - public static void init() throws Exception { - - try { - - System.out.println("Setting up nodes"); - - NodeFactory nodeFactory = NodeFactory.newInstance(); - nodeA = nodeFactory.createNode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(), - new Contribution("TestContribution", - new File("src/main/resources/nodeA").toURL().toString())); - - - nodeB = nodeFactory.createNode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(), - new Contribution("TestContribution", - new File("src/main/resources/nodeB").toURL().toString())); - - - nodeA.start(); - nodeB.start(); - - acomponent = ((Client)nodeA).getService(AComponent.class, "AComponent/AComponent"); - - } catch (Throwable ex) { - System.out.println(ex.toString()); - // Print detailed cause information. - ex.printStackTrace(); - StringBuffer sb = new StringBuffer(); - Throwable cause = ex.getCause(); - while ( cause != null ) { - sb.append( " " ); - System.out.println( sb.toString() + "Cause: " + cause ); - if (cause instanceof java.lang.reflect.InvocationTargetException) - System.out.println( sb.toString() + "Target Exception: " + ((java.lang.reflect.InvocationTargetException)cause).getTargetException() ); - cause = cause.getCause(); - } - } - } - - @AfterClass - public static void destroy() throws Exception { - // stop the nodes and hence the domains they contain - nodeA.stop(); - nodeB.stop(); - } - - //@Test - public void testKeepServerRunning1() throws Exception { - System.out.println("press enter to continue"); - System.in.read(); - } - - @Test - public void testBReference() { - assertEquals("BComponent", acomponent.fooB()); - } - - @Test - public void testBCast() { - assertEquals("BComponent", acomponent.fooB1()); - } - - @Test - public void testCReference() { - assertEquals("CComponent", acomponent.fooC()); - } - - @Test - public void testCServiceReference() { - assertEquals("CComponent", acomponent.fooC1()); - } - - @Test - public void testDReferenceString() { - assertEquals("DAComponent", acomponent.fooStringD()); - } - - @Test - public void testDReference() { - assertEquals("DAComponent", acomponent.fooD()); - } - - - @Test - public void testBCReference() { - assertEquals("BCComponent", acomponent.fooBC()); - } - - @Test - public void testRequiredFalseReference() { - try { - acomponent.invokeDReference(); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - -} diff --git a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java deleted file mode 100644 index f2d8fe5d64..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.itest.callablerefreturn.Alpha; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -public class CallableReferenceReturnTestCase { - private static SCADomain domain; - private static Alpha alpha; - - @BeforeClass - public static void init() throws Exception { - domain = SCADomain.newInstance("CallableReferenceReturnTest.composite"); - alpha = domain.getService(Alpha.class, "Alpha"); - } - - @AfterClass - public static void destroy() throws Exception { - domain.close(); - } - - @Test - public void testCallableReferenceReturn() { - Assert.assertTrue(alpha.run()); - } - -} diff --git a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java deleted file mode 100644 index d785a6a397..0000000000 --- a/branches/sca-equinox/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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 org.apache.tuscany.sca.itest.callableref; - -import static junit.framework.Assert.assertEquals; -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class CallableReferenceTestCase { - private static SCADomain domain; - private static AComponent acomponent; - - @BeforeClass - public static void init() throws Exception { - domain = SCADomain.newInstance("CallableReferenceTest.composite"); - acomponent = domain.getService(AComponent.class, "AComponent"); - } - - @AfterClass - public static void destroy() throws Exception { - domain.close(); - } - - @Test - public void testBReference() { - assertEquals("BComponent", acomponent.fooB()); - } - - @Test - public void testBCast() { - assertEquals("BComponent", acomponent.fooB1()); - } - - @Test - public void testCReference() { - assertEquals("CComponent", acomponent.fooC()); - } - - @Test - public void testCServiceReference() { - assertEquals("CComponent", acomponent.fooC1()); - } - - @Test - public void testDReference() { - assertEquals("DAComponent", acomponent.fooD()); - } - - @Test - public void testBCReference() { - assertEquals("BCComponent", acomponent.fooBC()); - } - - @Test - public void testRequiredFalseReference() { - try { - acomponent.invokeDReference(); - } catch (Exception e) { - Assert.assertTrue(true); - } - } - -} -- cgit v1.2.3