From e5b7380c874745c989d1816b8f552504f038e1bc Mon Sep 17 00:00:00 2001 From: lresende Date: Thu, 26 Sep 2013 20:33:20 +0000 Subject: 2.0 branch for possible maintenance release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1526672 13f79535-47bb-0310-9956-ffa450edef68 --- .../getting-started/helloworld-withdeps/README | 22 ++++ .../getting-started/helloworld-withdeps/node.xml | 27 +++++ .../getting-started/helloworld-withdeps/pom.xml | 123 +++++++++++++++++++++ .../resources/META-INF/helloworld.composite | 29 +++++ .../resources/META-INF/sca-contribution.xml | 25 +++++ .../helloworld-withdeps/src/main/assembly/zip.xml | 41 +++++++ .../src/main/java/sample/Helloworld.java | 28 +++++ .../src/main/java/sample/HelloworldImpl.java | 29 +++++ .../src/test/java/sample/HelloworldTestCase.java | 49 ++++++++ 9 files changed, 373 insertions(+) create mode 100644 sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/README create mode 100644 sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/node.xml create mode 100644 sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/pom.xml create mode 100644 sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/resources/META-INF/helloworld.composite create mode 100644 sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/resources/META-INF/sca-contribution.xml create mode 100644 sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/zip.xml create mode 100644 sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/java/sample/Helloworld.java create mode 100644 sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/java/sample/HelloworldImpl.java create mode 100644 sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/test/java/sample/HelloworldTestCase.java (limited to 'sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps') diff --git a/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/README b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/README new file mode 100644 index 0000000000..5bb69df953 --- /dev/null +++ b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/README @@ -0,0 +1,22 @@ +Tuscany - Getting Started - Helloworld With Dependencies Sample +--------------------------------------------------------------- + +This sample extends the helloworld sample to show how to use ZIP format contributions which include dependencys jar which are made available on the contribution classpath. To demonstrate this the Helloworld service is updated to use a Apache Commons Lang 3.0 utility to capatalize the first letter of the name. + +The changes to the helloworld sample are: +- update sample.HelloworldImpl class is updated to use the Apache Commons Lang 3.0 WordUtils utility +- the Maven build is updated to use the Assembly plugin to create a ZIP archive of the contrubution which includes the dependency jars +- use a node.xml file to configure the contributions used by the Tuscany maven plugin + +As with all the getting-started samples you can run this sample with: + + mvn tuscany:run + +And then as with the original helloworld sample you may explore the state of the domain with Shell commands and test the service by using the Shell "invoke" command: + + invoke HelloworldComponent sayHello yourName + +which should return a hello text with the name capatilized: + + Hello YourName + diff --git a/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/node.xml b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/node.xml new file mode 100644 index 0000000000..2af170d609 --- /dev/null +++ b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/node.xml @@ -0,0 +1,27 @@ + + + + + + + \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/pom.xml b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/pom.xml new file mode 100644 index 0000000000..c05d63dd2e --- /dev/null +++ b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/pom.xml @@ -0,0 +1,123 @@ + + + + 4.0.0 + + + org.apache.tuscany.sca.samples + tuscany-samples + 2.0 + + + helloworld-withdeps + 2.0 + + Apache Tuscany SCA Samples Helloworld With Dependencies + + + ${project.version} + + + + + apache.snapshots + Apache Snapshot Repository + http://repository.apache.org/snapshots + false + + + apache.snapshots + Apache Snapshot Repository + http://repository.apache.org/snapshots + false + + + + + + org.apache.tuscany.sca + tuscany-sca-api + ${tuscany.version} + provided + + + + org.apache.commons + commons-lang3 + 3.0 + + + + junit + junit + 4.8.1 + test + + + + org.apache.tuscany.sca + tuscany-base-runtime + ${tuscany.version} + test + + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2.1 + + + zip + package + + single + + + false + + src/main/assembly/zip.xml + + + + + + + + + org.apache.tuscany.sca + tuscany-maven-plugin + ${tuscany.version} + + node.xml + + + + + + + + diff --git a/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/resources/META-INF/helloworld.composite b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/resources/META-INF/helloworld.composite new file mode 100644 index 0000000000..8e23a93895 --- /dev/null +++ b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/resources/META-INF/helloworld.composite @@ -0,0 +1,29 @@ + + + + + + + + + diff --git a/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/resources/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..9112e02cbe --- /dev/null +++ b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/resources/META-INF/sca-contribution.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/zip.xml b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/zip.xml new file mode 100644 index 0000000000..1d71d28a6f --- /dev/null +++ b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/assembly/zip.xml @@ -0,0 +1,41 @@ + + + + zip + false + + + zip + + + + + src/main/assembly/resources + . + + + + + + lib + + + + diff --git a/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/java/sample/Helloworld.java b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/java/sample/Helloworld.java new file mode 100644 index 0000000000..f4e8c50448 --- /dev/null +++ b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/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/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/java/sample/HelloworldImpl.java new file mode 100644 index 0000000000..1852632429 --- /dev/null +++ b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/main/java/sample/HelloworldImpl.java @@ -0,0 +1,29 @@ +/* + * 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.apache.commons.lang3.text.WordUtils; + +public class HelloworldImpl implements Helloworld { + + public String sayHello(String name) { + return "Hello " + WordUtils.capitalize(name); + } + +} diff --git a/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/test/java/sample/HelloworldTestCase.java new file mode 100644 index 0000000000..6770d288fd --- /dev/null +++ b/sca-java-2.x/branches/2.0/samples/getting-started/helloworld-withdeps/src/test/java/sample/HelloworldTestCase.java @@ -0,0 +1,49 @@ +/* + * 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.junit.Assert; +import org.junit.Test; +import org.oasisopen.sca.NoSuchServiceException; + +public class HelloworldTestCase { + + @Test + public void testSayHello() throws NoSuchServiceException { + +// // Run the SCA composite in a Tuscany runtime +// Node node = TuscanyRuntime.runComposite(null, "target/helloworld-withdeps-2.0-SNAPSHOT.zip"); +// try { +// +// // Get the Helloworld service proxy +// Helloworld helloworld = node.getService(Helloworld.class, "HelloworldComponent"); +// +// // test that it works as expected +// Assert.assertEquals("Hello Amelia", helloworld.sayHello("amelia")); +// +// } finally { +// // Stop the Tuscany runtime Node +// node.stop(); +// } + Helloworld helloworld = new HelloworldImpl(); + + // Test that a lower case name does get capitalized + Assert.assertEquals("Hello Amelia", helloworld.sayHello("amelia")); + } +} -- cgit v1.2.3