From 561abc6e8fd5b3a5dc860dbe8f9a5d4f91b8c807 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 4 Jul 2009 14:48:46 +0000
Subject: Enable user deciding whether or not to include the Tuscany runtime in
 the webapp so it can be used with the Tuscany Tomcat integration

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@791134 13f79535-47bb-0310-9956-ffa450edef68
---
 java/sca/archetypes/quickstart/pom.xml                       |  4 ++--
 .../src/main/resources/META-INF/maven/archetype-metadata.xml |  5 +++++
 .../src/main/resources/archetype-resources/pom.xml           | 12 +++++++++---
 .../archetype-resources/src/main/webapp/WEB-INF/web.xml      |  2 ++
 4 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'java')

diff --git a/java/sca/archetypes/quickstart/pom.xml b/java/sca/archetypes/quickstart/pom.xml
index 5500fc947d..859fa5b0ae 100644
--- a/java/sca/archetypes/quickstart/pom.xml
+++ b/java/sca/archetypes/quickstart/pom.xml
@@ -35,13 +35,13 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
-        <version>2.0-alpha-3</version>
+        <version>2.0-alpha-4</version>
       </extension>
     </extensions>
     <plugins>
       <plugin>
         <artifactId>maven-archetype-plugin</artifactId>
-        <version>2.0-alpha-3</version>
+        <version>2.0-alpha-4</version>
         <extensions>true</extensions>
       </plugin>
     </plugins>
diff --git a/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
index 239e554f93..450e33afd5 100644
--- a/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -18,6 +18,11 @@
  * under the License.    
 -->
 <archetype-descriptor name="myproject">
+  <requiredProperties>
+    <requiredProperty key="includeTuscanyRuntime">
+       <defaultValue>Y</defaultValue>
+    </requiredProperty>
+  </requiredProperties>
   <fileSets>
     <fileSet filtered="true" packaged="true" encoding="UTF-8">
       <directory>src/main/java</directory>
diff --git a/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
index 73739d38ba..8345739dfa 100644
--- a/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
@@ -25,9 +25,7 @@
 	<artifactId>${artifactId}</artifactId>
 	<packaging>war</packaging>
 	<version>${version}</version>
-	#literal()<!-- TODO project name  -->
 	<name>quickstart</name>
-	<description></description>
 
 	<dependencies>
 		<!--  TUSCANY DEPENDENCIES -->
@@ -35,13 +33,22 @@
                <groupId>org.apache.tuscany.sca</groupId>
                <artifactId>tuscany-sca-api</artifactId>
                <version>${tuscany.version}</version>
+#if(${includeTuscanyRuntime} == "Y")
+               <scope>compile</scope>
+#else
+               <scope>provided</scope>
+#end
             </dependency>
 
             <dependency>
                <groupId>org.apache.tuscany.sca</groupId>
                <artifactId>tuscany-implementation-web-runtime</artifactId>
                <version>${tuscany.version}</version>
+#if( $includeTuscanyRuntime == "Y")
                <scope>runtime</scope>
+#else
+               <scope>provided</scope>
+#end
             </dependency>
 
 		<!--  JUNIT DEPENDENCY FOR TESTING -->
@@ -133,5 +140,4 @@
 		<tuscany.version>2.0-SNAPSHOT</tuscany.version>
 		<jetty.version>6.1.18</jetty.version>
 	</properties>
-	#end
 </project>
\ No newline at end of file
diff --git a/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index f2bdfe3362..25d8d8184d 100644
--- a/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -24,6 +24,7 @@
 
   <display-name>${artifactId}</display-name>
 
+#if($includeTuscanyRuntime == "Y")
   <filter>
     <filter-name>tuscany.${artifactId}</filter-name> 
     <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
@@ -34,6 +35,7 @@
     <url-pattern>/*</url-pattern> 
   </filter-mapping>
 
+#end
   <welcome-file-list id="WelcomeFileList">
     <welcome-file>hello.jsp</welcome-file>
   </welcome-file-list>
-- 
cgit v1.2.3