X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fslc%2Fpom.xml;h=a1bc4f1264ab5f737ceced33d0c0d41ce3d81209;hb=refs%2Ftags%2Fsvn%2Ftags%2Fargeo-slc-2.1.1;hp=3e79303d251aa460a07c2cb1c3eef696c4fccbb9;hpb=725f4e6f317abd989a2bad63403745a5c47d6067;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 3e79303d2..a1bc4f126 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -1,45 +1,118 @@
-<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>dist</artifactId>
-		<version>0.13.1-SNAPSHOT</version>
+		<version>2.1.1</version>
 	</parent>
-	<groupId>org.argeo.slc.dist</groupId>
 	<artifactId>slc</artifactId>
 	<packaging>pom</packaging>
-	<name>SLC Node (RPM)</name>
-<!-- 	<build> -->
-<!-- 		<plugins> -->
-<!-- 			<plugin> -->
-<!-- 				<artifactId>maven-resources-plugin</artifactId> -->
-<!-- 				<executions> -->
-<!-- 					<execution> -->
-<!-- 						<id>filter-base</id> -->
-<!-- 						<phase>process-resources</phase> -->
-<!-- 						<goals> -->
-<!-- 							<goal>copy-resources</goal> -->
-<!-- 						</goals> -->
-<!-- 						<configuration> -->
-<!-- 							<outputDirectory>${basedir}/target/base</outputDirectory> -->
-<!-- 							<resources> -->
-<!-- 								<resource> -->
-<!-- 									<directory>src/main/base</directory> -->
-<!-- 									<filtering>true</filtering> -->
-<!-- 								</resource> -->
-<!-- 							</resources> -->
-<!-- 						</configuration> -->
-<!-- 					</execution> -->
-<!-- 				</executions> -->
-<!-- 			</plugin> -->
-<!-- 		</plugins> -->
-<!-- 	</build> -->
+	<name>SLC Distribution</name>
 	<profiles>
+		<profile>
+			<id>dist</id>
+			<build>
+				<plugins>
+					<!-- <plugin> -->
+					<!-- <groupId>org.apache.maven.plugins</groupId> -->
+					<!-- <artifactId>maven-dependency-plugin</artifactId> -->
+					<!-- <executions> -->
+					<!-- <execution> -->
+					<!-- <id>copy-dependencies-dist</id> -->
+					<!-- <phase>package</phase> -->
+					<!-- <goals> -->
+					<!-- <goal>copy-dependencies</goal> -->
+					<!-- </goals> -->
+					<!-- <configuration> -->
+					<!-- <includeTypes>jar</includeTypes> -->
+					<!-- <useRepositoryLayout>true</useRepositoryLayout> -->
+					<!-- <outputDirectory>${project.build.directory}/modulest</outputDirectory> -->
+					<!-- </configuration> -->
+					<!-- </execution> -->
+					<!-- </executions> -->
+					<!-- </plugin> -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<configuration>
+							<finalName>argeo-slc-${project.version}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>src/assembly/dist.xml</descriptor>
+							</descriptors>
+						</configuration>
+						<executions>
+							<execution>
+								<id>assembly-base</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+			<dependencies>
+				<!-- Backend -->
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.dep.backend</artifactId>
+					<version>2.1.1</version>
+					<type>pom</type>
+				</dependency>
+
+				<!-- SLC Libs -->
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.lib.jcr</artifactId>
+					<version>2.1.1-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.lib.repo</artifactId>
+					<version>2.1.1-SNAPSHOT</version>
+				</dependency>
+
+				<!-- Launcher -->
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.launcher</artifactId>
+					<version>2.1.1-SNAPSHOT</version>
+					<!-- <type>tar.gz</type> -->
+					<!-- <classifier>base</classifier> -->
+				</dependency>
+			</dependencies>
+		</profile>
 		<profile>
 			<id>rpmbuild</id>
 			<build>
 				<plugins>
+<!-- 					<plugin> -->
+<!-- 						<groupId>org.apache.maven.plugins</groupId> -->
+<!-- 						<artifactId>maven-dependency-plugin</artifactId> -->
+<!-- 						<executions> -->
+<!-- 							<execution> -->
+<!-- 								<id>copy-dependencies-rpm</id> -->
+<!-- 								<phase>package</phase> -->
+<!-- 								<goals> -->
+<!-- 									<goal>copy</goal> -->
+<!-- 								</goals> -->
+<!-- 								<configuration> -->
+<!-- 									<includeTypes>jar</includeTypes> -->
+<!-- 									<stripVersion>true</stripVersion> -->
+<!-- 									<outputDirectory>${project.build.directory}/boot</outputDirectory> -->
+<!-- 									<artifactItems> -->
+<!-- 										<artifactItem> -->
+<!-- 											<groupId>org.argeo.slc</groupId> -->
+<!-- 											<artifactId>org.argeo.slc.launcher</artifactId> -->
+<!-- 											<version>${project.version}</version> -->
+<!-- 										</artifactItem> -->
+<!-- 									</artifactItems> -->
+<!-- 								</configuration> -->
+<!-- 							</execution> -->
+<!-- 						</executions> -->
+<!-- 					</plugin> -->
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>rpm-maven-plugin</artifactId>
@@ -52,7 +125,6 @@
 								</goals>
 								<configuration>
 									<name>slc</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/bin</directory>
@@ -103,6 +175,21 @@
 												</source>
 											</sources>
 										</mapping>
+<!-- 										<mapping> -->
+<!-- 											<directory>/usr/share/osgi/boot</directory> -->
+<!-- 											<username>root</username> -->
+<!-- 											<groupname>root</groupname> -->
+<!-- 											<filemode>644</filemode> -->
+<!-- 											<directoryIncluded>false</directoryIncluded> -->
+<!-- 											<sources> -->
+<!-- 												<source> -->
+<!-- 													<location>${project.build.directory}/boot</location> -->
+<!-- 													<includes> -->
+<!-- 														<include>org.argeo.slc.launcher.jar</include> -->
+<!-- 													</includes> -->
+<!-- 												</source> -->
+<!-- 											</sources> -->
+<!-- 										</mapping> -->
 										<!-- Maven (even if not installed) -->
 										<mapping>
 											<directory>/var/lib/slc/.m2</directory>
@@ -118,18 +205,19 @@
 										</mapping>
 									</mappings>
 									<preinstallScriptlet>
-										<scriptFile>src/main/scripts/preinstall-${rpm.release}</scriptFile>
+										<scriptFile>src/main/scripts/preinstall</scriptFile>
 									</preinstallScriptlet>
 									<postinstallScriptlet>
 										<scriptFile>src/main/scripts/postinstall</scriptFile>
 									</postinstallScriptlet>
 									<preremoveScriptlet>
-										<scriptFile>src/main/scripts/preremove-${rpm.release}</scriptFile>
+										<scriptFile>src/main/scripts/preremove</scriptFile>
 									</preremoveScriptlet>
 									<requires>
-										<require>slc-libs</require>
+										<require>slc-platform</require>
 										<require>osgi-boot</require>
-										<require>java-1.6.0-openjdk</require>
+										<!-- do not require java so that it can be installed on Ubuntu -->
+										<!-- <require>java-1.6.0-openjdk</require> -->
 									</requires>
 								</configuration>
 							</execution>