From 68ab6878ea155cc84926e84d20615dadfe14603c Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 1 May 2012 08:18:46 +0000
Subject: Update sample to use a node xml file so that it now works the same
 way as the other samples with a simple mvn tuscany:run

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1332568 13f79535-47bb-0310-9956-ffa450edef68
---
 .../getting-started/helloworld-withdeps/README     | 21 ++++-------------
 .../getting-started/helloworld-withdeps/node.xml   | 27 ++++++++++++++++++++++
 .../getting-started/helloworld-withdeps/pom.xml    |  3 +++
 3 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/node.xml

(limited to 'sca-java-2.x/trunk/samples')

diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/README b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/README
index a5d5272d8f..5bb69df953 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/README
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/README
@@ -6,26 +6,13 @@ This sample extends the helloworld sample to show how to use ZIP format contribu
 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
 
-Presently the Tuscany Shell does not work "as is" to run this sample with "mvn tuscany:run". Instead you need to do the following in the helloworld-withdeps directory:
+As with all the getting-started samples you can run this sample with:
 
-- build the ZIP contribution
-    
-   mvn clean install
+   mvn tuscany:run 
 
-- start the Tuscany Shell
-
-   mvn tuscany:shell
-
-- install the sample contribution
-
-  install target\helloworld-withdeps-2.0-SNAPSHOT.zip
-
-- start the SCA composite
-
-  start helloworld-withdeps META-INF/helloworld.composite
-
-And then as with the original helloworld sample you may test the service by using the Shell "invoke" command:
+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
 
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/node.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/node.xml
new file mode 100644
index 0000000000..2af170d609
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/node.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.
+-->
+<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+    xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+    domain="uri:default">
+
+    <contribution location="target/helloworld-withdeps-2.0-SNAPSHOT.zip" startDeployables="true" />
+
+</node>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/pom.xml
index 306e75ba62..d347535dc3 100644
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/pom.xml
+++ b/sca-java-2.x/trunk/samples/getting-started/helloworld-withdeps/pom.xml
@@ -111,6 +111,9 @@
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-maven-plugin</artifactId>
             <version>${tuscany.version}</version>
+            <configuration>
+                <nodeXML>node.xml</nodeXML>
+            </configuration>
          </plugin>
 
       </plugins>
-- 
cgit v1.2.3