X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fpom.xml;h=7bc940f106fd530d9d2a2a8bbb0fb6a184469abf;hb=6373b2f2612b8b0a25f752b576f35003760f7be6;hp=cfc02f69b04e509bfd8c803e5def7f785d5f1803;hpb=1a60050bf89c737279c0d9e8cac09bf31003a033;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/pom.xml b/org.argeo.slc.webapp/pom.xml
index cfc02f69b..7bc940f10 100644
--- a/org.argeo.slc.webapp/pom.xml
+++ b/org.argeo.slc.webapp/pom.xml
@@ -1,11 +1,10 @@
-<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>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.11.2-SNAPSHOT</version>
+		<version>0.11.3-SNAPSHOT</version>
 		<relativePath>../org.argeo.slc</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.webapp</artifactId>
@@ -19,77 +18,89 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
+				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
-					<skip>true</skip>
+					<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.1.2</version>
 				<executions>
 					<execution>
-						<id>surefire-it</id>
-						<phase>integration-test</phase>
+						<id>env</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>env</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>slc-source</id>
+						<phase>process-sources</phase>
 						<goals>
-							<goal>test</goal>
+							<goal>generate</goal>
 						</goals>
 						<configuration>
-							<skip>false</skip>
+							<job>slc-source</job>
 						</configuration>
 					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<executions>
 					<execution>
-						<id>start-jetty</id>
-						<phase>pre-integration-test</phase>
+						<id>slc-build</id>
+						<phase>compile</phase>
 						<goals>
-							<goal>run</goal>
+							<goal>generate</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>
+							<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>stop-jetty</id>
-						<phase>post-integration-test</phase>
+						<id>slc-api</id>
+						<phase>site</phase>
 						<goals>
-							<goal>stop</goal>
+							<goal>generate</goal>
 						</goals>
+						<configuration>
+							<job>slc-api</job>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
+				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>unpack</id>
-						<phase>process-resources</phase>
+						<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>unpack</goal>
+							<goal>single</goal>
 						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assembly/ria-slc.xml</descriptor>
+							</descriptors>
+						</configuration>
 					</execution>
 				</executions>
-				<configuration>
-					<artifactItems>
-						<artifactItem>
-							<groupId>org.argeo.dep.dist</groupId>
-							<artifactId>qooxdoo-sdk</artifactId>
-							<classifier>dist</classifier>
-							<type>zip</type>
-							<outputDirectory>src/main/webapp</outputDirectory>
-						</artifactItem>
-					</artifactItems>
-					<overWriteReleases>false</overWriteReleases>
-					<overWriteSnapshots>true</overWriteSnapshots>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
@@ -97,40 +108,77 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.server</artifactId>
-			<version>${project.version}</version>
 		</dependency>
+
+		<!-- OSGi integration -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.launcher</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web.extender</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ant</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
+			<groupId>org.eclipse.osgi</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.support.ws.client</artifactId>
-			<version>${project.version}</version>
-			<scope>test</scope>
+			<groupId>org.apache.catalina</groupId>
+			<artifactId>com.springsource.org.apache.catalina</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>com.springsource.javax.annotation</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>com.springsource.javax.persistence</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.ws</groupId>
+			<artifactId>com.springsource.javax.xml.ws</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>com.springsource.javax.xml.bind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.osgi</groupId>
+			<artifactId>org.springframework.osgi.extender</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet.jsp</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>com.springsource.javax.el</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.taglibs</groupId>
+			<artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
 		</dependency>
-		
-		<!-- Qooxdoo -->
 		<dependency>
-			<groupId>org.argeo.dep.dist</groupId>
-			<artifactId>qooxdoo-sdk</artifactId>
-			<version>0.8</version>
-			<classifier>dist</classifier>
-			<type>zip</type>			
+			<groupId>org.hsqldb</groupId>
+			<artifactId>com.springsource.org.hsqldb</artifactId>
 		</dependency>
-		
+
+		<!-- Required in JDK 1.5 -->
 		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>com.springsource.javax.activation</artifactId>
-			<scope>test</scope>
+			<groupId>com.sun.xml</groupId>
+			<artifactId>
+				com.springsource.com.sun.xml.messaging.saaj
+				</artifactId>
 		</dependency>
+
 	</dependencies>
 </project>
\ No newline at end of file