svn commit: r1086589 - in /tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp: ./ README pom.xml

[an...@apache.org]

Author: antelder
Date: Tue Mar 29 14:11:52 2011
New Revision: 1086589

URL: http://svn.apache.org/viewvc?rev=1086589&view=rev
Log:
Copy the getting started webapp sample to trunk samples

Added:
    tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/   (props changed)
      - copied from r1086584, tuscany/sca-java-2.x/trunk/unreleased/samples/helloworld-webapp/
Modified:
    tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/README
    tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml

Propchange: tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 29 14:11:52 2011
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders

Propchange: tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Mar 29 14:11:52 2011
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/unreleased/samples/helloworld-webapp:671193

Modified: tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/README
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/README?rev=1086589&r1=1086584&r2=1086589&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/README (original)
+++ tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/README Tue Mar 29 14:11:52 2011
@@ -1,7 +1,28 @@
-The README in the <distribution-unpack-dir>/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). 
+Tuscany - Getting Started - Helloworld WebApp Sample
+----------------------------------------------------
 
-TODO - finish
\ No newline at end of file
+This sample demonstrates how to use SCA contributions with Web Applications
+
+See the README in the top-level samples folder for general information on the Tuscany samples.
+
+This sample project creates a .war web application which includes Tuscany. The SCA contribution
+from the helloworld sample is included within the war and its SCA composite started by the webapp,
+and there is a JSP page which shows how to invoke SCA services by using the SCA taglib.
+
+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:
+
+   mvn tomcat:run
+
+Once the web app is running use your browser to visit the following URL;
+
+http://localhost:8080/helloworld-webapp
+
+(The port and hostname will of course vary depending on your local installation) 
+
+You should then see web page return the following:
+
+   Calling HelloworldService sayHello("world") returns:
+
+   Hello world 
\ No newline at end of file

Modified: tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml?rev=1086589&r1=1086584&r2=1086589&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/getting-started/helloworld-webapp/pom.xml Tue Mar 29 14:11:52 2011
@@ -21,15 +21,17 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.tuscany.sca.samples</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
+   <parent>
+      <groupId>org.apache.tuscany.sca.samples</groupId>
+      <artifactId>tuscany-samples</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <relativePath/> 
+   </parent>
 
    <artifactId>helloworld-webapp</artifactId>
-   <name>Tuscany Sample Helloworld WebApp</name>
+   <version>2.0-SNAPSHOT</version>
+
+   <name>Apache Tuscany SCA Samples Helloworld WebApp</name>
    <packaging>war</packaging>
 
    <properties>
@@ -54,8 +56,6 @@
    </dependencies>
 
     <build>
-       <finalName>helloworld</finalName>
-
        <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -73,7 +73,7 @@
                        <groupId>org.apache.tuscany.sca.samples</groupId>
                        <artifactId>helloworld-contribution</artifactId>
                        <version>${project.version}</version>
-                       <!-- should really go in the target folder but i can't get jetty:run to work using that -->
+                       <!-- 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>
                      </artifactItem>
                    </artifactItems>