You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2009/12/05 00:15:25 UTC
svn commit: r887442 - in /tuscany/sca-java-2.x/trunk:
itest/distribution/webapp-helloworld-bpel/
itest/distribution/webapp-helloworld-jms/
itest/distribution/webapp-helloworld-js-client/
itest/distribution/webapp-helloworld-jsf/ itest/distribution/weba...
Author: lresende
Date: Fri Dec 4 23:15:24 2009
New Revision: 887442
URL: http://svn.apache.org/viewvc?rev=887442&view=rev
Log:
Small updates to webapp sample artifactId to group them together when imported in eclipse, but continue to use the simple names to produce war avoiding having users to type long names which was a concern of the tuscany community
Modified:
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml
tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-bpel/pom.xml Fri Dec 4 23:15:24 2009
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-bpel</artifactId>
+ <artifactId>sample-helloworld-bpel-webapp</artifactId>
<type>war</type>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -115,7 +115,7 @@
<deployables>
<deployable>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-bpel</artifactId>
+ <artifactId>sample-helloworld-bpel-webapp</artifactId>
<type>war</type>
<properties>
<context>helloworld-bpel</context>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jms/pom.xml Fri Dec 4 23:15:24 2009
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-jms</artifactId>
+ <artifactId>sample-helloworld-jms-webapp</artifactId>
<type>war</type>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -207,7 +207,7 @@
<deployables>
<deployable>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-jms</artifactId>
+ <artifactId>sample-helloworld-jms-webapp</artifactId>
<type>war</type>
<properties>
<context>helloworld-jms</context>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-js-client/pom.xml Fri Dec 4 23:15:24 2009
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-js-client</artifactId>
+ <artifactId>sample-helloworld-js-client-webapp</artifactId>
<type>war</type>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -179,7 +179,7 @@
<deployables>
<deployable>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-js-client</artifactId>
+ <artifactId>sample-helloworld-js-client-webapp</artifactId>
<type>war</type>
<properties>
<context>helloworld-js-client</context>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsf/pom.xml Fri Dec 4 23:15:24 2009
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-jsf</artifactId>
+ <artifactId>sample-helloworld-jsf-webapp</artifactId>
<type>war</type>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -121,7 +121,7 @@
<deployables>
<deployable>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-jsf</artifactId>
+ <artifactId>sample-helloworld-jsf-webapp</artifactId>
<type>war</type>
<properties>
<context>helloworld-jsf</context>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-jsp/pom.xml Fri Dec 4 23:15:24 2009
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-jsp</artifactId>
+ <artifactId>sample-helloworld-jsp-webapp</artifactId>
<type>war</type>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -179,7 +179,7 @@
<deployables>
<deployable>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-jsp</artifactId>
+ <artifactId>sample-helloworld-jsp-webapp</artifactId>
<type>war</type>
<properties>
<context>helloworld-jsp</context>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-servlet/pom.xml Fri Dec 4 23:15:24 2009
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-servlet</artifactId>
+ <artifactId>sample-helloworld-servlet-webapp</artifactId>
<type>war</type>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -179,7 +179,7 @@
<deployables>
<deployable>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-servlet</artifactId>
+ <artifactId>sample-helloworld-servlet-webapp</artifactId>
<type>war</type>
<properties>
<context>helloworld-servlet</context>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld-stripes/pom.xml Fri Dec 4 23:15:24 2009
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-stripes</artifactId>
+ <artifactId>sample-helloworld-stripes-webapp</artifactId>
<type>war</type>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -115,7 +115,7 @@
<deployables>
<deployable>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld-stripes</artifactId>
+ <artifactId>sample-helloworld-stripes-webapp</artifactId>
<type>war</type>
<properties>
<context>helloworld-stripes</context>
Modified: tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/itest/distribution/webapp-helloworld/pom.xml Fri Dec 4 23:15:24 2009
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld</artifactId>
+ <artifactId>sample-helloworld-webapp</artifactId>
<type>war</type>
<version>2.0-SNAPSHOT</version>
</dependency>
@@ -114,7 +114,7 @@
<deployables>
<deployable>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>helloworld</artifactId>
+ <artifactId>sample-helloworld-webapp</artifactId>
<type>war</type>
<pingURL>http://localhost:8085/helloworld</pingURL>
</deployable>
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml Fri Dec 4 23:15:24 2009
@@ -28,7 +28,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>helloworld-bpel</artifactId>
+ <artifactId>sample-helloworld-bpel-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Sample Helloworld BPEL</name>
@@ -89,7 +89,7 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>helloworld-bpel</finalName>
<plugins>
<plugin>
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml Fri Dec 4 23:15:24 2009
@@ -26,7 +26,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>helloworld-jms</artifactId>
+ <artifactId>sample-helloworld-jms-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Sample JMS HelloWorld in a WebApp</name>
@@ -58,6 +58,7 @@
<version>5.1.0</version>
<scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
@@ -67,7 +68,7 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>helloworld-jms</finalName>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml Fri Dec 4 23:15:24 2009
@@ -26,7 +26,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>helloworld-js-client</artifactId>
+ <artifactId>sample-helloworld-js-client-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Sample Helloworld Javascript Client</name>
@@ -49,7 +49,7 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>helloworld-js-client</finalName>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml Fri Dec 4 23:15:24 2009
@@ -26,7 +26,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>helloworld-jsf</artifactId>
+ <artifactId>sample-helloworld-jsf-webapp</artifactId>
<name>Apache Tuscany SCA Sample Helloworld JSF</name>
<packaging>war</packaging>
@@ -56,7 +56,7 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>helloworld-jsf</finalName>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml Fri Dec 4 23:15:24 2009
@@ -26,7 +26,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>helloworld-jsp</artifactId>
+ <artifactId>sample-helloworld-jsp-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Sample Helloworld JSP</name>
@@ -49,7 +49,7 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>helloworld-jsp</finalName>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-rest/pom.xml Fri Dec 4 23:15:24 2009
@@ -25,7 +25,7 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>helloworld-rest</artifactId>
+ <artifactId>sample-helloworld-rest-webapp</artifactId>
<packaging>war</packaging>
<name>HelloWorld RESTFul Web Application</name>
@@ -105,7 +105,7 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>helloworld-rest</finalName>
</build>
</project>
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml Fri Dec 4 23:15:24 2009
@@ -26,7 +26,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>helloworld-servlet</artifactId>
+ <artifactId>sample-helloworld-servlet-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Sample Helloworld Servlet</name>
@@ -48,7 +48,7 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>helloworld-servlet</finalName>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml Fri Dec 4 23:15:24 2009
@@ -26,7 +26,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>helloworld-stripes</artifactId>
+ <artifactId>sample-helloworld-stripes-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Sample Helloworld using Stripes</name>
@@ -59,7 +59,7 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>helloworld-stripes</finalName>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml Fri Dec 4 23:15:24 2009
@@ -26,7 +26,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>helloworld-wicket</artifactId>
+ <artifactId>sample-helloworld-wicket-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Sample Helloworld using Wicket</name>
@@ -70,7 +70,7 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>helloworld-wicket</finalName>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml?rev=887442&r1=887441&r2=887442&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml Fri Dec 4 23:15:24 2009
@@ -26,7 +26,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>helloworld</artifactId>
+ <artifactId>sample-helloworld-webapp</artifactId>
<name>Apache Tuscany SCA Sample Helloworld</name>
<packaging>war</packaging>
@@ -49,7 +49,7 @@
</dependencies>
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>helloworld</finalName>
<plugins>
<plugin>
<groupId>org.mortbay.jetty</groupId>