From 3c7c4a749baafcf375f4785a7668d3a25c9063e3 Mon Sep 17 00:00:00 2001 From: lresende Date: Fri, 13 Nov 2009 01:42:27 +0000 Subject: Moving 1.x trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835700 13f79535-47bb-0310-9956-ffa450edef68 --- .../samples/implementation-composite/README | 116 ---- .../samples/implementation-composite/build.xml | 72 --- .../implementation-composite.png | Bin 47415 -> 0 bytes .../implementation-composite.svg | 658 --------------------- .../samples/implementation-composite/pom.xml | 72 --- .../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 | 59 -- .../src/main/java/composite/Target.java | 30 - .../src/main/java/composite/TargetImpl.java | 44 -- .../src/main/resources/InnerComposite.composite | 41 -- .../src/main/resources/InnerComposite2.composite | 33 -- .../main/resources/META-INF/sca-contribution.xml | 24 - .../src/main/resources/OuterComposite.composite | 39 -- .../src/test/java/composite/CompositeTestCase.java | 50 -- 16 files changed, 1327 deletions(-) delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/README delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/build.xml delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/implementation-composite.png delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/implementation-composite.svg delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/pom.xml delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/CompositeClient.java delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/Source.java delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceCallback.java delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/Target.java delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/TargetImpl.java delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/main/resources/InnerComposite.composite delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/main/resources/InnerComposite2.composite delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/main/resources/OuterComposite.composite delete mode 100644 branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java (limited to 'branches/sca-java-1.x/samples/implementation-composite') diff --git a/branches/sca-java-1.x/samples/implementation-composite/README b/branches/sca-java-1.x/samples/implementation-composite/README deleted file mode 100644 index 27de00e8ef..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/README +++ /dev/null @@ -1,116 +0,0 @@ -Composite Implementation Sample -=============================== - -This sample shows how composites can be used to implement components. - -The README in the samples directory (the directory above this) provides -general instructions about building and running samples. Take a look there -first. - -If you just want to run it to see what happens open a command prompt, navigate -to this sample directory and do: - -ant run - -OR if you don't have ant, on Windows do - -java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-implementation-composite.jar composite.CompositeClient - -and on *nix do - -java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-implementation-composite.jar composite.CompositeClient - - -Sample Overview ---------------- - -The sample is comprised of three composites. Take a look at the composite file -or the .svg/.png file which shows the composite file in pictorial form. The -OuterComposite defines three components two of which are implemented using -composites. The SourceComponent calls each TargetComponent in turn. There is a -callback which returns from each TargetComponent to the SourceComponent. - -implementation-composite/ - src/ - main/ - java/ - composite/ - Source.java - interface for the source component - SourceImpl.java - implementation for the source component - SourceCallback.java - source component callback interface - Target.java - interface for the target component - TargetImpl.java - implementation for the target component - CompositeClient.java - starts the SCA Runtime and - deploys the OuterComposite.composite. - This in turn pulls in the two inner - composites - resources/ - META-INF/ - sca-contribution.xml - specifies the composite to be deployed - OuterComposite.composite - the top level SCA assembly for this sample - InnerComposite.composite - included by OuterComposite.composite - InnerComposite2.composite - included by OuterComposite.composite - test/ - java/ - composite/ - CompositeTestCase.java - JUnit test case - implementation-composite.png - a pictorial representation of the sample - .composite file - build.xml - the Ant build file - pom.xml - the Maven build file - -Building And Running The Sample Using Ant ------------------------------------------ -With the binary distribution the sample can be built and run using Ant as -follows - -cd implementation-composite -ant compile -ant run - -You should see the following output from the run target. - -run: - [java] Main thread Thread[main,5,main] - [java] Source: Client.main -> Source.clientMethod - [java] Source: Client.main => Source.clientMethod2 - [java] Sleeping ... - [java] Target: Client.main -> Source.clientMethod - [java] Work thread Thread[pool-1-thread-1,5,main] - [java] Result: Client.main -> Source.clientMethod -> Target.someMethod - [java] Target: Client.main => Source.clientMethod2 - [java] Work thread Thread[pool-1-thread-2,5,main] - [java] Result: Client.main => Source.clientMethod2 -> Target.someMethod - - -Building And Running The Sample Using Maven -------------------------------------------- -With either the binary or source distributions the sample can be built and run -using Maven as follows. - -cd implementation-composite -mvn - -You should see the following output from the test phase. - -------------------------------------------------------- - T E S T S -------------------------------------------------------- -Running composite.CompositeTestCase -Main thread Thread[main,5,main] -Source: Client.main -> Source.clientMethod -Source: Client.main => Source.clientMethod2 -Sleeping ... -Target: Client.main => Source.clientMethod2 -Work thread Thread[pool-1-thread-2,5,main] -Result: Client.main => Source.clientMethod2 -> Target.someMethod -Target: Client.main -> Source.clientMethod -Work thread Thread[pool-1-thread-1,5,main] -Result: Client.main -> Source.clientMethod -> Target.someMethod -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.973 sec - -Results : - -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0 - -This shows that the Junit test cases have run successfully. diff --git a/branches/sca-java-1.x/samples/implementation-composite/build.xml b/branches/sca-java-1.x/samples/implementation-composite/build.xml deleted file mode 100644 index 7aa31aab8b..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/build.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/samples/implementation-composite/implementation-composite.png b/branches/sca-java-1.x/samples/implementation-composite/implementation-composite.png deleted file mode 100644 index 4c6d71bc03..0000000000 Binary files a/branches/sca-java-1.x/samples/implementation-composite/implementation-composite.png and /dev/null differ diff --git a/branches/sca-java-1.x/samples/implementation-composite/implementation-composite.svg b/branches/sca-java-1.x/samples/implementation-composite/implementation-composite.svg deleted file mode 100644 index 0e60354aab..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/implementation-composite.svg +++ /dev/null @@ -1,658 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - OuterComposite - InnerComposite - - OuterComposite.composite - InnerComposite.composite - InnerComposite2.composite - SourceComponent - - TargetComponentRef TargetComponentRef2 - - TargetComponent - - TargetComponent2 - - - InnerSourceService - InnerSourceComponent - - - - - - TargetComponentRef TargetComponentRef2 - - promote promote - InnerTargetService - InnerTargetComponent - - TargetImpl Target - - Target - - SourceImpl - Source - SourceCallback - - - - - Target Source - InnerComposite2 promote promote - diff --git a/branches/sca-java-1.x/samples/implementation-composite/pom.xml b/branches/sca-java-1.x/samples/implementation-composite/pom.xml deleted file mode 100644 index b7bae958c8..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 1.6-SNAPSHOT - ../../pom.xml - - sample-implementation-composite - Apache Tuscany SCA Sample Composite Implementation - A sample showing local wiring of a component implemented by a nested composite - - - - apache.incubator - http://people.apache.org/repo/m2-incubating-repository - - - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.6-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.6-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.6-SNAPSHOT - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - - diff --git a/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/CompositeClient.java b/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/CompositeClient.java deleted file mode 100644 index bf743e1797..0000000000 --- a/branches/sca-java-1.x/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.x/samples/implementation-composite/src/main/java/composite/Source.java b/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/Source.java deleted file mode 100644 index d0efcc1df1..0000000000 --- a/branches/sca-java-1.x/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.x/samples/implementation-composite/src/main/java/composite/SourceCallback.java b/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceCallback.java deleted file mode 100644 index baa95a8e39..0000000000 --- a/branches/sca-java-1.x/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.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java b/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java deleted file mode 100644 index 72bf552a1e..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/SourceImpl.java +++ /dev/null @@ -1,59 +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 { - - public static int callbackCount = 0; - 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) { - synchronized(this) { - callbackCount += 1; - } - System.out.println("Work thread " + Thread.currentThread()); - System.out.println("Result: " + result); - } -} diff --git a/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/Target.java b/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/Target.java deleted file mode 100644 index 9a8f68a7fa..0000000000 --- a/branches/sca-java-1.x/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.x/samples/implementation-composite/src/main/java/composite/TargetImpl.java b/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/TargetImpl.java deleted file mode 100644 index e744aa7967..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/src/main/java/composite/TargetImpl.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 composite; - -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Context; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - - -@Service(Target.class) -@Scope("COMPOSITE") -public class TargetImpl implements Target { - - private ComponentContext ctx; - - @Context - public void setContext(ComponentContext context) { - ctx = context; - } - - public void someMethod(String arg) { - System.out.println("Target: " + arg); - SourceCallback sourceCallback = (SourceCallback)ctx.getRequestContext().getCallbackReference().getService(); - sourceCallback.receiveResult(arg + " -> Target.someMethod"); - } -} diff --git a/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/InnerComposite.composite b/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/InnerComposite.composite deleted file mode 100644 index 3376ac8ff5..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/InnerComposite.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/InnerComposite2.composite b/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/InnerComposite2.composite deleted file mode 100644 index c9eff4fa9d..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/InnerComposite2.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 5190f402a8..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/OuterComposite.composite b/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/OuterComposite.composite deleted file mode 100644 index cb1c1e13d4..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/src/main/resources/OuterComposite.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java b/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java deleted file mode 100644 index 980552ac06..0000000000 --- a/branches/sca-java-1.x/samples/implementation-composite/src/test/java/composite/CompositeTestCase.java +++ /dev/null @@ -1,50 +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 { - System.out.println("Main thread " + Thread.currentThread()); - source.clientMethod("Client.main"); - System.out.println("Sleeping ..."); - Thread.sleep(1000); - if (SourceImpl.callbackCount != 2) { - throw new IllegalStateException("Expected callbacks not received"); - } - } -} -- cgit v1.2.3