Author: antelder
Date: Sat Jul 4 14:48:46 2009
New Revision: 791134
URL: http://svn.apache.org/viewvc?rev=791134&view=rev
Log:
Enable user deciding whether or not to include the Tuscany runtime in the
webapp so it can be used with the Tuscany Tomcat integration
Modified:
tuscany/java/sca/archetypes/quickstart/pom.xml
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Modified: tuscany/java/sca/archetypes/quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/pom.xml?rev=791134&r1=791133&r2=791134&view=diff
==============================================================================
--- tuscany/java/sca/archetypes/quickstart/pom.xml (original)
+++ tuscany/java/sca/archetypes/quickstart/pom.xml Sat Jul 4 14:48:46 2009
@@ -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>
Modified:
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=791134&r1=791133&r2=791134&view=diff
==============================================================================
---
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
(original)
+++
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
Sat Jul 4 14:48:46 2009
@@ -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>
Modified:
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml?rev=791134&r1=791133&r2=791134&view=diff
==============================================================================
---
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
(original)
+++
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
Sat Jul 4 14:48:46 2009
@@ -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
Modified:
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?rev=791134&r1=791133&r2=791134&view=diff
==============================================================================
---
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
(original)
+++
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
Sat Jul 4 14:48:46 2009
@@ -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>
