X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dist%2Fslc%2Fpom.xml;h=aeed0b24ce1467d7ae74a0e4223ecc12df732d9c;hb=de32ea41c5ebe2b35a2d1cea00166a9dd349e7de;hp=afd9dadfa46f89b1ea4edc868f049d59d0700f0c;hpb=f16651ea6963b74ceb8628c8bf38936c58352021;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index afd9dadfa..aeed0b24c 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -4,65 +4,116 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dist</artifactId>
-		<version>0.13.1-SNAPSHOT</version>
+		<version>1.1.12-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>
+	<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>
-							<outputDirectory>${basedir}/target/base</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/base</directory>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
+							<finalName>argeo-slc-${project.version}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>src/assembly/dist.xml</descriptor>
+							</descriptors>
 						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.sdk.rap</artifactId>
-			<version>0.13.1-SNAPSHOT</version>
-			<exclusions>
-				<!-- Included in osgi-boot -->
-				<exclusion>
-					<groupId>org.eclipse.osgi</groupId>
-					<artifactId>org.eclipse.osgi</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.commons.osgi</groupId>
-					<artifactId>org.argeo.osgi.boot</artifactId>
-				</exclusion>
-				<!-- Node -->
-				<exclusion>
-					<groupId>org.argeo.commons.security</groupId>
-					<artifactId>org.argeo.security.dep.node.rap</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-	</dependencies>
-	<profiles>
+						<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.12-SNAPSHOT</version>
+					<type>pom</type>
+				</dependency>
+
+				<!-- SLC Libs -->
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.lib.jcr</artifactId>
+					<version>1.1.12-SNAPSHOT</version>
+				</dependency>
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.lib.repo</artifactId>
+					<version>1.1.12-SNAPSHOT</version>
+				</dependency>
+
+				<!-- Launcher -->
+				<dependency>
+					<groupId>org.argeo.slc</groupId>
+					<artifactId>org.argeo.slc.launcher</artifactId>
+					<version>1.1.12-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>
@@ -75,7 +126,6 @@
 								</goals>
 								<configuration>
 									<name>slc</name>
-									<copyright>2011 Argeo</copyright>
 									<mappings>
 										<mapping>
 											<directory>/usr/bin</directory>
@@ -114,45 +164,66 @@
 												</source>
 											</sources>
 										</mapping>
+										<mapping>
+											<directory>/etc/slc-cl</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/etc/slc-cl</location>
+												</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>
+											<username>slc</username>
+											<groupname>slc</groupname>
+											<filemode>600</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/var/lib/slc/.m2</location>
+												</source>
+											</sources>
+										</mapping>
 									</mappings>
 									<preinstallScriptlet>
-										<scriptFile>src/main/scripts/preinstall</scriptFile>
+										<scriptFile>src/main/scripts/preinstall-${rpm.release}</scriptFile>
 									</preinstallScriptlet>
 									<postinstallScriptlet>
 										<scriptFile>src/main/scripts/postinstall</scriptFile>
 									</postinstallScriptlet>
 									<preremoveScriptlet>
-										<scriptFile>src/main/scripts/preremove</scriptFile>
+										<scriptFile>src/main/scripts/preremove-${rpm.release}</scriptFile>
 									</preremoveScriptlet>
 									<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>
 						</executions>
 					</plugin>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>