X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.webapp%2Fpom.xml;h=89f1e01cc865b30dfa2d87508b41238dbf1696de;hb=96b8d036bd02a98c26c41740d0d44f89039602a1;hp=6baf5e5d3127b37a5f0b818b95b69c176695d938;hpb=78bd2e8f957d3198f2d6c0482be298f83481328e;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index 6baf5e5d3..89f1e01cc 100644
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
@@ -18,11 +17,89 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<configuration>
+					<warSourceExcludes>qooxdoo-0.8-sdk/**,source/**</warSourceExcludes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.argeo.slc.maven</groupId>
+				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
+				<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>
+						</goals>
+						<configuration>
+							<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>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<skip>true</skip>
+					<skipTests>true</skipTests>
 				</configuration>
 				<executions>
 					<execution>
@@ -32,7 +109,7 @@
 							<goal>test</goal>
 						</goals>
 						<configuration>
-							<skip>false</skip>
+							<skipTests>false</skipTests>
 						</configuration>
 					</execution>
 				</executions>
@@ -45,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>
@@ -64,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>
@@ -91,10 +169,20 @@
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>javax.activation</groupId>
 			<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