From 6a3ca6736c808c1647854e405ef379b609f276db Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:07:45 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835126 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/composite/CompositeClient.java | 41 ---------------- .../src/main/java/composite/Source.java | 24 ---------- .../src/main/java/composite/SourceCallback.java | 24 ---------- .../src/main/java/composite/SourceImpl.java | 55 ---------------------- .../src/main/java/composite/Target.java | 30 ------------ .../src/main/java/composite/TargetImpl.java | 41 ---------------- .../src/main/resources/InnerComposite.composite | 41 ---------------- .../src/main/resources/InnerComposite2.composite | 33 ------------- .../main/resources/META-INF/sca-contribution.xml | 25 ---------- .../src/main/resources/OuterComposite.composite | 39 --------------- .../src/test/java/composite/CompositeTestCase.java | 51 -------------------- 11 files changed, 404 deletions(-) delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite delete mode 100644 branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java (limited to 'branches/sca-java-1.2.1/samples/implementation-composite/src') diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java deleted file mode 100644 index bf743e1797..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/CompositeClient.java +++ /dev/null @@ -1,41 +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 composite; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * Simple client program that invokes the components that we wired together. - */ -public class CompositeClient { - - public static void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance(); - - Source source = scaDomain.getService(Source.class, "SourceComponent"); - - System.out.println("Main thread " + Thread.currentThread()); - source.clientMethod("Client.main"); - System.out.println("Sleeping ..."); - Thread.sleep(1000); - - scaDomain.close(); - } -} diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java b/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java deleted file mode 100644 index d0efcc1df1..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Source.java +++ /dev/null @@ -1,24 +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 composite; - -public interface Source { - - void clientMethod(String arg); -} diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java deleted file mode 100644 index baa95a8e39..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceCallback.java +++ /dev/null @@ -1,24 +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 composite; - -public interface SourceCallback { - - void receiveResult(String result); -} diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java deleted file mode 100644 index b9a0c7ff74..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/SourceImpl.java +++ /dev/null @@ -1,55 +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 composite; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -@Service(Source.class) -@Scope("COMPOSITE") -public class SourceImpl implements Source, SourceCallback { - - private Target targetReference; - private Target targetReference2; - - @Reference - public void setTargetReference(Target target) { - this.targetReference = target; - } - - @Reference - public void setTargetReference2(Target target) { - this.targetReference2 = target; - } - - public void clientMethod(String arg) { - System.out.println("Source: " + arg + " -> Source.clientMethod"); - targetReference.someMethod(arg + " -> Source.clientMethod"); - - System.out.println("Source: " + arg + " => Source.clientMethod2"); - targetReference2.someMethod(arg + " => Source.clientMethod2"); - } - - public void receiveResult(String result) { - System.out.println("Work thread " + Thread.currentThread()); - System.out.println("Result: " + result); - } -} diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java b/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.java deleted file mode 100644 index 9a8f68a7fa..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/Target.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 composite; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; - - -@Callback(SourceCallback.class) -public interface Target { - - @OneWay - void someMethod(String arg); -} diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java deleted file mode 100644 index 86686e9233..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/java/composite/TargetImpl.java +++ /dev/null @@ -1,41 +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 composite; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -@Service(Target.class) -@Scope("COMPOSITE") -public class TargetImpl implements Target { - - private SourceCallback sourceCallback; - - @Callback - public void setSourceCallback(SourceCallback sourceCallback) { - this.sourceCallback = sourceCallback; - } - - public void someMethod(String arg) { - System.out.println("Target: " + arg); - sourceCallback.receiveResult(arg + " -> Target.someMethod"); - } -} diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite b/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite deleted file mode 100644 index 3376ac8ff5..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite deleted file mode 100644 index c9eff4fa9d..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/InnerComposite2.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index c8039b7dc7..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite b/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite deleted file mode 100644 index cb1c1e13d4..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/main/resources/OuterComposite.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java deleted file mode 100644 index 9e9a4b44a4..0000000000 --- a/branches/sca-java-1.2.1/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java +++ /dev/null @@ -1,51 +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 composite; - -import junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -public class CompositeTestCase extends TestCase { - - private SCADomain scaDomain; - private Source source; - - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance(); - source = scaDomain.getService(Source.class, "SourceComponent"); - } - - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void test() throws Exception { - try { - System.out.println("Main thread " + Thread.currentThread()); - source.clientMethod("Client.main"); - System.out.println("Sleeping ..."); - Thread.sleep(1000); - } catch (Throwable t) { - t.printStackTrace(); - } - } -} -- cgit v1.2.3