X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fpom.xml;h=3592ad4504de74964486af1728703f4ced164282;hb=02e323ce2bac40ffb9d067788c61a3e41300a9fb;hp=efaa2b5020bea9ea99ab05b8da605fa46045ffac;hpb=9b1896a43d37f6f58374a732fd23912fd26a6cf3;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index efaa2b502..3592ad450 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -3,14 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>argeo-slc</artifactId>
-		<version>0.11.3-SNAPSHOT</version>
-		<relativePath>../org.argeo.slc</relativePath>
+		<artifactId>server</artifactId>
+		<version>0.11.4-SNAPSHOT</version>
+		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.server</groupId>
 	<artifactId>org.argeo.slc.ria</artifactId>
 	<packaging>jar</packaging>
-	<name>Argeo SLC Web UI</name>
+	<name>Argeo SLC RIA</name>
 	<build>
 		<plugins>
 			<plugin>
@@ -18,28 +18,9 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<compress>false</compress>
-						<manifestFile>src/main/webapp/META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-					<classesDirectory>src/main/webapp</classesDirectory>
-					<includes>
-						<include>index.jsp</include>
-						<include>argeo-ria/**</include>
-					</includes>
-				</configuration>
-			</plugin>
-			<!--
-				<plugin> <artifactId>maven-war-plugin</artifactId> <configuration>
-				<warSourceExcludes>qooxdoo-0.8-sdk/**,source/**</warSourceExcludes>
-				</configuration> </plugin>
-			-->
-			<plugin>
-				<groupId>org.argeo.slc.maven</groupId>
+				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
-				<version>0.8.1.2</version>
+				<version>${version.maven-argeo-qooxdoo}</version>
 				<executions>
 					<execution>
 						<id>env</id>
@@ -48,9 +29,16 @@
 							<goal>env</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>env-site</id>
+						<phase>pre-site</phase>
+						<goals>
+							<goal>env</goal>
+						</goals>
+					</execution>
 					<execution>
 						<id>slc-source</id>
-						<phase>process-sources</phase>
+						<phase>test</phase>
 						<goals>
 							<goal>generate</goal>
 						</goals>
@@ -60,7 +48,7 @@
 					</execution>
 					<execution>
 						<id>slc-build</id>
-						<phase>compile</phase>
+						<phase>test</phase>
 						<goals>
 							<goal>generate</goal>
 						</goals>
@@ -68,11 +56,16 @@
 							<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-test</id>
+						<phase>site</phase>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<job>slc-test</job>
+						</configuration>
+					</execution>
 					<execution>
 						<id>slc-api</id>
 						<phase>site</phase>
@@ -85,22 +78,51 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<compress>false</compress>
+						<manifestFile>src/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+					<classesDirectory>src/</classesDirectory>
+					<includes>
+						<include>index.jsp</include>
+						<include>argeo-ria/**</include>
+						<include>WEB-INF/*</include>
+					</includes>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
+				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>assembly-ria</id>
-						<phase>package</phase>
+						<id>unpack-argeo-ria-sdk</id>
+						<phase>initialize</phase>
 						<goals>
-							<goal>single</goal>
+							<goal>unpack</goal>
 						</goals>
 						<configuration>
-							<descriptors>
-								<descriptor>src/assembly/ria.xml</descriptor>
-							</descriptors>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.argeo.ria</groupId>
+									<artifactId>org.argeo.ria.core</artifactId>
+									<classifier>ria</classifier>
+									<type>zip</type>
+									<outputDirectory>src/argeo-ria-src</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+							<overWriteReleases>false</overWriteReleases>
+							<overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
 					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
 					<execution>
 						<id>assembly-ria-slc</id>
 						<phase>package</phase>
@@ -109,7 +131,7 @@
 						</goals>
 						<configuration>
 							<descriptors>
-								<descriptor>src/assembly/ria-slc.xml</descriptor>
+								<descriptor>assembly/ria-slc.xml</descriptor>
 							</descriptors>
 						</configuration>
 					</execution>
@@ -117,43 +139,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<!--
-		<dependencies> <dependency> <groupId>org.argeo.slc.runtime</groupId>
-		<artifactId>org.argeo.slc.server</artifactId> </dependency>
-
-		<dependency> <groupId>org.springframework.osgi</groupId>
-		<artifactId>org.springframework.osgi.web.extender</artifactId>
-		</dependency> <dependency> <groupId>org.eclipse.osgi</groupId>
-		<artifactId>org.eclipse.osgi</artifactId> </dependency> <dependency>
-		<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> <dependency> <groupId>org.hsqldb</groupId>
-		<artifactId>com.springsource.org.hsqldb</artifactId> </dependency>
-
-		<dependency> <groupId>com.sun.xml</groupId> <artifactId>
-		com.springsource.com.sun.xml.messaging.saaj </artifactId>
-		</dependency> </dependencies>
-	-->
 </project>
\ No newline at end of file