From 3eeeee0709d92f0d48dc969d4b6fcf3c29cb27a0 Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 29 Sep 2010 09:42:19 +0000 Subject: Rename helloworld contribution to have -contribution at the end git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1002539 13f79535-47bb-0310-9956-ffa450edef68 --- .../getting-started/contribution-helloworld/README | 7 --- .../contribution-helloworld/pom.xml | 58 ---------------------- .../src/main/java/sample/Helloworld.java | 28 ----------- .../src/main/java/sample/HelloworldImpl.java | 37 -------------- .../main/resources/META-INF/sca-contribution.xml | 28 ----------- .../src/main/resources/helloworld.composite | 29 ----------- .../src/main/resources/helloworldws.composite | 32 ------------ .../src/test/java/sample/HelloworldTestCase.java | 33 ------------ .../getting-started/helloworld-contribution/README | 7 +++ .../helloworld-contribution/pom.xml | 58 ++++++++++++++++++++++ .../src/main/java/sample/Helloworld.java | 28 +++++++++++ .../src/main/java/sample/HelloworldImpl.java | 37 ++++++++++++++ .../main/resources/META-INF/sca-contribution.xml | 28 +++++++++++ .../src/main/resources/helloworld.composite | 29 +++++++++++ .../src/main/resources/helloworldws.composite | 32 ++++++++++++ .../src/test/java/sample/HelloworldTestCase.java | 33 ++++++++++++ 16 files changed, 252 insertions(+), 252 deletions(-) delete mode 100644 sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/README delete mode 100644 sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/java/sample/Helloworld.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/java/sample/HelloworldImpl.java delete mode 100644 sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/helloworld.composite delete mode 100644 sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/helloworldws.composite delete mode 100644 sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/test/java/sample/HelloworldTestCase.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/README create mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/java/sample/Helloworld.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/java/sample/HelloworldImpl.java create mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/helloworld.composite create mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/helloworldws.composite create mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/test/java/sample/HelloworldTestCase.java diff --git a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/README b/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/README deleted file mode 100644 index ed0f1d0ce4..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/README +++ /dev/null @@ -1,7 +0,0 @@ -The README in the /samples directory provides -general instructions about building and running samples. (where -distribution-unpack-dir is the directory in which you unpacked the tuscany -binary distribution archive). Take a look there first (noting at you read it that this sample -is not a new style sample). - -TODO - finish this \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/pom.xml b/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/pom.xml deleted file mode 100644 index e510599a58..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../pom.xml - - - jar - sample-helloworld - Apache Tuscany SCA Sample Helloworld - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT - provided - - - junit - junit - 4.8.1 - test - - - - - ${artifactId} - - - org.apache.tuscany.maven.plugins - maven-tuscany-plugin - 2.0-SNAPSHOT - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/java/sample/Helloworld.java deleted file mode 100644 index f4e8c50448..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/java/sample/Helloworld.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 sample; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Helloworld { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/java/sample/HelloworldImpl.java deleted file mode 100644 index aa563cbdf3..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/java/sample/HelloworldImpl.java +++ /dev/null @@ -1,37 +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 sample; - -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Scope; -import org.oasisopen.sca.annotation.EagerInit; - -@Scope("COMPOSITE") @EagerInit -public class HelloworldImpl implements Helloworld { - - public String sayHello(String name) { - System.out.println("HelloworldImpl.sayHello " + name); - return "Hello " + name; - } - - @Init - public void init() { - System.out.println(sayHello("world")); - } -} diff --git a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 696b1f9875..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/helloworld.composite deleted file mode 100644 index 324395c246..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/helloworld.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/helloworldws.composite b/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/helloworldws.composite deleted file mode 100644 index 52436d8b0a..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/test/java/sample/HelloworldTestCase.java deleted file mode 100644 index 7e679ec0e9..0000000000 --- a/sca-java-2.x/trunk/samples/getting-started/contribution-helloworld/src/test/java/sample/HelloworldTestCase.java +++ /dev/null @@ -1,33 +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 sample; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -public class HelloworldTestCase { - - @Test - public void testSayHello() { - HelloworldImpl helloworld = new HelloworldImpl(); - assertEquals("Hello Petra", helloworld.sayHello("Petra")); - } - -} diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/README b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/README new file mode 100644 index 0000000000..ed0f1d0ce4 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/README @@ -0,0 +1,7 @@ +The README in the /samples directory provides +general instructions about building and running samples. (where +distribution-unpack-dir is the directory in which you unpacked the tuscany +binary distribution archive). Take a look there first (noting at you read it that this sample +is not a new style sample). + +TODO - finish this \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml new file mode 100644 index 0000000000..bd95e76268 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/pom.xml @@ -0,0 +1,58 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-samples + 2.0-SNAPSHOT + ../pom.xml + + + jar + helloworld-contribution + Apache Tuscany SCA Samples - Getting Started - helloworld-contribution + + + + org.apache.tuscany.sca + tuscany-sca-api + 2.0-SNAPSHOT + provided + + + junit + junit + 4.8.1 + test + + + + + ${artifactId} + + + org.apache.tuscany.maven.plugins + maven-tuscany-plugin + 2.0-SNAPSHOT + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/java/sample/Helloworld.java new file mode 100644 index 0000000000..f4e8c50448 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/java/sample/Helloworld.java @@ -0,0 +1,28 @@ +/* + * 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 sample; + +import org.oasisopen.sca.annotation.Remotable; + +@Remotable +public interface Helloworld { + + String sayHello(String name); + +} diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/java/sample/HelloworldImpl.java new file mode 100644 index 0000000000..aa563cbdf3 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/java/sample/HelloworldImpl.java @@ -0,0 +1,37 @@ +/* + * 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 sample; + +import org.oasisopen.sca.annotation.Init; +import org.oasisopen.sca.annotation.Scope; +import org.oasisopen.sca.annotation.EagerInit; + +@Scope("COMPOSITE") @EagerInit +public class HelloworldImpl implements Helloworld { + + public String sayHello(String name) { + System.out.println("HelloworldImpl.sayHello " + name); + return "Hello " + name; + } + + @Init + public void init() { + System.out.println(sayHello("world")); + } +} diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..696b1f9875 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/META-INF/sca-contribution.xml @@ -0,0 +1,28 @@ + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/helloworld.composite new file mode 100644 index 0000000000..324395c246 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/helloworld.composite @@ -0,0 +1,29 @@ + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/helloworldws.composite b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/helloworldws.composite new file mode 100644 index 0000000000..52436d8b0a --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/main/resources/helloworldws.composite @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/test/java/sample/HelloworldTestCase.java new file mode 100644 index 0000000000..7e679ec0e9 --- /dev/null +++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-contribution/src/test/java/sample/HelloworldTestCase.java @@ -0,0 +1,33 @@ +/* + * 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 sample; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class HelloworldTestCase { + + @Test + public void testSayHello() { + HelloworldImpl helloworld = new HelloworldImpl(); + assertEquals("Hello Petra", helloworld.sayHello("Petra")); + } + +} -- cgit v1.2.3