X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fpom.xml;h=232244babea8d1dd7aad5a4bbca425c08ee9fd98;hb=1973d521367cdfe1d467da2bb8a539284996bcf6;hp=b535b3fcb05022a0f9385de1e943cf4d96a48ff0;hpb=716a362437e0d79f82f0d94985f5c878964f57c2;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index b535b3fcb..232244bab 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -4,25 +4,30 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>server</artifactId>
-		<version>0.11.4-SNAPSHOT</version>
+		<version>0.13.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.server</groupId>
 	<artifactId>org.argeo.slc.ria</artifactId>
 	<packaging>jar</packaging>
-	<name>Argeo SLC RIA</name>
+	<name>SLC RIA</name>
 	<build>
+		<resources>
+			<resource>
+				<directory>src</directory>
+				<includes>
+					<include>index.jsp</include>
+					<include>WEB-INF/*</include>
+				</includes>
+			</resource>
+		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
 				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
 				<version>${version.maven-argeo-qooxdoo}</version>
 				<configuration>
-					<sdkVersion>0.8.2.argeo.1</sdkVersion>
+					<sdkVersion>1.1.0</sdkVersion>
 				</configuration>
 				<executions>
 					<execution>
@@ -59,42 +64,38 @@
 							<job>slc-build</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>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<job>slc-api</job>
-						</configuration>
-					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-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>
+					<instructions>
+						<Import-Package>
+							javax.servlet,
+							javax.servlet.http,
+							javax.servlet.jsp,
+							javax.servlet.jsp.jstl.core,
+							javax.servlet.jsp.jstl.fmt,
+							javax.servlet.jsp.jstl.tlv,
+							javax.servlet.resources
+						</Import-Package>
+						<Web-ContextPath>org.argeo.slc.ria</Web-ContextPath>
+					</instructions>
 				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -111,12 +112,13 @@
 								<artifactItem>
 									<groupId>org.argeo.ria</groupId>
 									<artifactId>org.argeo.ria.core</artifactId>
+									<version>${version.argeo-ria}</version>
 									<classifier>ria</classifier>
 									<type>zip</type>
 									<outputDirectory>src/argeo-ria-src</outputDirectory>
 								</artifactItem>
 							</artifactItems>
-							<overWriteReleases>false</overWriteReleases>
+							<overWriteReleases>true</overWriteReleases>
 							<overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
 					</execution>
@@ -138,8 +140,41 @@
 							</descriptors>
 						</configuration>
 					</execution>
+					<execution>
+						<id>assembly-ria-slc-web</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>assembly/ria-slc-web.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+					<execution>
+						<id>assembly-ria-jcr</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>assembly/ria-jcr.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>
 	</build>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.ria</groupId>
+				<artifactId>org.argeo.ria.core</artifactId>
+				<version>${version.argeo-ria}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 </project>
\ No newline at end of file