From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 8 Dec 2008 08:46:42 +0000 (+0000)
Subject: Use qooxdoo plugin v0.8.0.6
X-Git-Tag: argeo-slc-2.1.7~2320
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=9d019246ac7e7a6bde0840c5b72d8f55e346951d;p=gpl%2Fargeo-slc.git

Use qooxdoo plugin v0.8.0.6

git-svn-id: https://svn.argeo.org/slc/trunk@1942 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 67bc6c3bb..628f7f57e 100644
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -26,9 +26,27 @@
 			<plugin>
 				<groupId>org.argeo.slc.maven</groupId>
 				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
-				<version>0.8.0.4</version>
+				<version>0.8.0.6</version>
 				<executions>
 					<execution>
+						<id>env</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>env</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>slc-source</id>
+						<phase>process-sources</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<job>slc-source</job>
+						</configuration>
+					</execution>
+					<execution>
+						<id>slc-build</id>
 						<phase>compile</phase>
 						<goals>
 							<goal>generate</goal>
@@ -37,6 +55,26 @@
 							<job>slc-build</job>
 						</configuration>
 					</execution>
+					<execution>
+						<id>slc-test</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<job>slc-test</job>
+						</configuration>
+					</execution>
+					<execution>
+						<id>slc-api</id>
+						<phase>site</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<job>slc-api</job>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 			<plugin>
@@ -61,7 +99,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<skip>true</skip>
+					<skipTests>true</skipTests>
 				</configuration>
 				<executions>
 					<execution>
@@ -71,7 +109,7 @@
 							<goal>test</goal>
 						</goals>
 						<configuration>
-							<skip>false</skip>
+							<skipTests>false</skipTests>
 						</configuration>
 					</execution>
 				</executions>
@@ -84,15 +122,10 @@
 						<id>start-jetty</id>
 						<phase>pre-integration-test</phase>
 						<goals>
-							<goal>run</goal>
+							<goal>run-war</goal>
 						</goals>
 						<configuration>
-							<webDefaultXml>src/main/config/jetty/webdefault.xml</webDefaultXml>
-							<scanIntervalSeconds>0</scanIntervalSeconds>
 							<daemon>true</daemon>
-							<jettyConfig>
-								src/main/config/jetty/jetty-test.xml
-							</jettyConfig>
 						</configuration>
 					</execution>
 					<execution>
@@ -103,6 +136,12 @@
 						</goals>
 					</execution>
 				</executions>
+				<configuration>
+					<webApp>${project.build.directory}/${artifactId}.war</webApp>
+					<scanIntervalSeconds>0</scanIntervalSeconds>
+					<webDefaultXml>src/main/config/jetty/webdefault.xml</webDefaultXml>
+					<jettyConfig>src/main/config/jetty/jetty-test.xml</jettyConfig>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>