From 454e36e3d9a73fce1fa26eb1823de39569c73d44 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 1 Apr 2011 12:34:41 +0000
Subject: Update the webapp sample to use the tuscany plugin to run the webapp

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1087684 13f79535-47bb-0310-9956-ffa450edef68
---
 .../unreleased/samples/getting-started/helloworld-webapp/README  | 8 +++-----
 .../unreleased/samples/getting-started/helloworld-webapp/pom.xml | 9 ++++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

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

diff --git a/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/README b/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/README
index bcf11d9886..29b67787b7 100644
--- a/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/README
+++ b/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/README
@@ -11,13 +11,11 @@ and there is a JSP page which shows how to invoke SCA services by using the SCA
 
 As this sample creates a web application .war archive there is a manual step to deploy the WAR file
 to your web application server. The archive is the helloworld-webapp-<version>.war in the target folder.
-Alternatively, you can run it by using the Maven Tomcat plugin by using the following command:
+Alternatively, you can run it by using the Tuscany Maven plugin by using the following command:
 
-   mvn tomcat:run
+   mvn tuscany:run
 
-or if you prefer Jetty then:
-
-   mvn jetty:run
+(or if you prefer using Jetty then mvn jetty:run, or with the Tomcat plugin mvn tomcat:run)
 
 Once the web app is running use your browser to visit the following URL;
 
diff --git a/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/pom.xml
index af6f446ce5..a804b3f0a3 100644
--- a/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/getting-started/helloworld-webapp/pom.xml
@@ -80,7 +80,7 @@
                    <artifactItems>
                      <artifactItem>
                        <groupId>org.apache.tuscany.sca.samples</groupId>
-                       <artifactId>helloworld-contribution</artifactId>
+                       <artifactId>helloworld</artifactId>
                        <version>${project.version}</version>
                        <!-- should really go in the target folder but i can't get jetty:run or tomcat:run to work using that -->
                        <outputDirectory>src/main/webapp/WEB-INF/sca-contributions</outputDirectory>
@@ -91,6 +91,13 @@
             </executions>
           </plugin>
 
+          <!-- to support running thw webapp with mvn tuscany:run -->
+         <plugin>
+            <groupId>org.apache.tuscany.maven.plugins</groupId>
+            <artifactId>maven-tuscany-plugin</artifactId>
+            <version>${tuscany.version}</version>
+         </plugin>
+
           <!-- to support using mvn jetty:run and also to run the webapp for the integration test -->
           <plugin>
              <groupId>org.mortbay.jetty</groupId>
-- 
cgit v1.2.3