X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fslc%2Fpom.xml;h=a7b8011be72a1f184b4c1375b6fbc6376dc4edb5;hb=32337de479444ceb5050207fdd2e7e5e6340c42a;hp=1d8584af21cd78d59180375e33048dcb4a914dfb;hpb=ad42a84b78e26be716e2bf42ef1b7208bc021a7d;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 1d8584af2..a7b8011be 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -3,42 +3,116 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dist</artifactId>
-		<version>1.1.1-SNAPSHOT</version>
+		<version>1.1.19-SNAPSHOT</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>1.1.19-SNAPSHOT</version>
+					<type>pom</type>
+				</dependency>
+
+				<!-- SLC Libs -->
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.lib.jcr</artifactId>
+					<version>1.1.19-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.lib.repo</artifactId>
+					<version>1.1.19-SNAPSHOT</version>
+				</dependency>
+
+				<!-- Launcher -->
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.launcher</artifactId>
+					<version>1.1.19-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>
@@ -51,7 +125,6 @@
 								</goals>
 								<configuration>
 									<name>slc</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/bin</directory>
@@ -102,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>
@@ -128,7 +216,8 @@
 									<requires>
 										<require>slc-libs</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>