X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fpom.xml;h=51313d077e70f1af0dd201b9586582f2ca77fcbe;hb=9089b25384758c01359acad6ceaf75a24c4d4853;hp=136a47fc627e15c90ee5c12f4cee014eacf0bf2c;hpb=852675ffc952f796a3a397ddc64665fdc3a59897;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 136a47fc6..51313d077 100644
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -1,41 +1,33 @@
-<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">
+<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.3-SNAPSHOT</version>
-		<relativePath>../org.argeo.slc</relativePath>
+		<artifactId>server</artifactId>
+		<version>0.12.1-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>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>
-				<artifactId>maven-jar-plugin</artifactId>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
+				<version>${version.maven-argeo-qooxdoo}</version>
 				<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>
+					<sdkVersion>0.8.2.argeo.1</sdkVersion>
 				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.argeo.slc.maven</groupId>
-				<artifactId>maven-argeo-qooxdoo-plugin</artifactId>
-				<version>0.8.1.3</version>
 				<executions>
 					<execution>
 						<id>env</id>
@@ -44,9 +36,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>
@@ -56,7 +55,7 @@
 					</execution>
 					<execution>
 						<id>slc-build</id>
-						<phase>compile</phase>
+						<phase>test</phase>
 						<goals>
 							<goal>generate</goal>
 						</goals>
@@ -64,11 +63,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>
@@ -81,22 +85,83 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>${version.maven-bundle-plugin}</version>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+						<Export-Package />
+						<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,
+							org.springframework.security.ui.webapp,
+							org.springframework.security.userdetails.memory,
+							org.springframework.web.context,
+							org.springframework.osgi.web.context.support,
+							org.springframework.web.filter,
+							org.springframework.security.context
+						</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>
-				<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>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>