X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.webapp%2Fpom.xml;h=ad5d0ec6d0c0dd0fd67f727aa8d964b789fbd0b3;hb=a3191216525d94baf9c5f1fa437e89f659683607;hp=70971f53e88bef951a56f1a8a4b8fc8099748549;hpb=7db56a4968ba80db1990c44a5041461f0662e9a7;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 70971f53e..ad5d0ec6d 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.3-SNAPSHOT</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,23 +55,57 @@
 							<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>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/sdk.xml</descriptor>
-					</descriptors>
-				</configuration>
 				<executions>
 					<execution>
-						<id>assembly-base</id>
+						<id>assembly-ria</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assembly/ria.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+					<execution>
+						<id>assembly-ria-slc</id>
 						<phase>package</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assembly/ria-slc.xml</descriptor>
+							</descriptors>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -61,7 +113,7 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<skip>true</skip>
+					<skipTests>true</skipTests>
 				</configuration>
 				<executions>
 					<execution>
@@ -71,7 +123,7 @@
 							<goal>test</goal>
 						</goals>
 						<configuration>
-							<skip>false</skip>
+							<skipTests>false</skipTests>
 						</configuration>
 					</execution>
 				</executions>
@@ -84,15 +136,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 +150,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>
@@ -136,5 +189,14 @@
 			<artifactId>com.springsource.javax.activation</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<!-- Required in JDK 1.5 -->
+		<dependency>
+			<groupId>com.sun.xml</groupId>
+			<artifactId>
+				com.springsource.com.sun.xml.messaging.saaj
+				</artifactId>
+		</dependency>
+
 	</dependencies>
 </project>
\ No newline at end of file