Return-Path: 
 <tuscany-commits-return-14212-apmail-ws-tuscany-commits-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org
Received: (qmail 83357 invoked from network); 4 Feb 2008 20:05:07 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Feb 2008 20:05:07 -0000
Received: (qmail 74118 invoked by uid 500); 4 Feb 2008 20:04:58 -0000
Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org
Received: (qmail 74097 invoked by uid 500); 4 Feb 2008 20:04:58 -0000
Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:tuscany-commits-help@ws.apache.org>
List-Unsubscribe: <mailto:tuscany-commits-unsubscribe@ws.apache.org>
List-Post: <mailto:tuscany-commits@ws.apache.org>
List-Id: <tuscany-commits.ws.apache.org>
Reply-To: tuscany-dev@ws.apache.org
Delivered-To: mailing list tuscany-commits@ws.apache.org
Received: (qmail 74088 invoked by uid 99); 4 Feb 2008 20:04:58 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2008 12:04:58 -0800
X-ASF-Spam-Status: No, hits=-98.5 required=10.0
	tests=ALL_TRUSTED,WEIRD_PORT
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Feb 2008 20:04:51 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2E21A1A9832; Mon,  4 Feb 2008 12:04:43 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r618410 - in /incubator/tuscany/java/sca/itest/services:
 pom.xml
 src/main/webapp/WEB-INF/ src/main/webapp/WEB-INF/geronimo-web.xml
 src/main/webapp/WEB-INF/web.xml
Date: Mon, 04 Feb 2008 20:04:42 -0000
To: tuscany-commits@ws.apache.org
From: rfeng@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080204200443.2E21A1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rfeng
Date: Mon Feb  4 12:04:42 2008
New Revision: 618410

URL: http://svn.apache.org/viewvc?rev=618410&view=rev
Log:
Generate the web.xml and geronimo-web.xml automatically from the build

Removed:
    incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/geronimo-web.xml
    incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/web.xml
Modified:
    incubator/tuscany/java/sca/itest/services/pom.xml
    incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/   (props changed)

Modified: incubator/tuscany/java/sca/itest/services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/services/pom.xml?rev=618410&r1=618409&r2=618410&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/services/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/services/pom.xml Mon Feb  4 12:04:42 2008
@@ -115,13 +115,32 @@
                             </execution>
                         </executions>
                     </plugin>
+                </plugins>
+            </build>
+        </profile>
 
+
+        <profile>
+            <id>jetty</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
                     <plugin>
                         <groupId>org.apache.tuscany.sca</groupId>
                         <artifactId>tuscany-maven-web-junit</artifactId>
                         <version>1.2-incubating-SNAPSHOT</version>
                         <executions>
                             <execution>
+                                <id>generate-web-xml</id>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>web-junit-test</id>
                                 <configuration>
                                     <url>http://localhost:8085/${project.build.finalName}/junit</url>
                                 </configuration>
@@ -132,18 +151,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-
-        <profile>
-            <id>jetty</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
                     <plugin>
                         <groupId>org.codehaus.cargo</groupId>
                         <artifactId>cargo-maven2-plugin</artifactId>
@@ -205,6 +212,33 @@
 
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.tuscany.sca</groupId>
+                        <artifactId>tuscany-maven-web-junit</artifactId>
+                        <version>1.2-incubating-SNAPSHOT</version>
+                        <executions>
+                            <execution>
+                                <id>generate-web-xml</id>
+                                <configuration>
+                                    <geronimo>true</geronimo>
+                                </configuration>
+                                <phase>process-resources</phase>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>web-junit-test</id>
+                                <configuration>
+                                    <url>http://localhost:8080/${project.build.finalName}/junit</url>
+                                </configuration>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.geronimo.plugins</groupId>
                         <artifactId>geronimo-maven-plugin</artifactId>

Propchange: incubator/tuscany/java/sca/itest/services/src/main/webapp/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb  4 12:04:42 2008
@@ -0,0 +1,2 @@
+web.xml
+geronim-web.xml



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org