From 2c953044d0af4a5085e0ab68f17271800a430d49 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 16 Dec 2015 17:38:37 +0000
Subject: [PATCH] RPM build

git-svn-id: https://svn.argeo.org/slc/trunk@8718 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/slc_demo_rap.properties                  |   1 +
 dep/org.argeo.slc.dep.backend/pom.xml         | 228 +++++++++++++-----
 dep/org.argeo.slc.dep.minimal/pom.xml         |  79 +++++-
 dep/org.argeo.slc.dep.rap/pom.xml             |   7 -
 dep/pom.xml                                   |  64 ++---
 dist/pom.xml                                  |  62 ++---
 dist/slc/pom.xml                              |  86 +++----
 dist/slc/src/main/rpm/etc/slc/config.ini      |  74 +++---
 .../main/scripts/{preinstall-6 => preinstall} |   0
 dist/slc/src/main/scripts/preinstall-5        |  21 --
 .../main/scripts/{preremove-6 => preremove}   |   0
 dist/slc/src/main/scripts/preremove-5         |  10 -
 lib/pom.xml                                   |  12 +-
 pom.xml                                       |  15 +-
 14 files changed, 396 insertions(+), 263 deletions(-)
 rename dist/slc/src/main/scripts/{preinstall-6 => preinstall} (100%)
 delete mode 100644 dist/slc/src/main/scripts/preinstall-5
 rename dist/slc/src/main/scripts/{preremove-6 => preremove} (100%)
 delete mode 100644 dist/slc/src/main/scripts/preremove-5

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 4bd4985bc..53683eb06 100644
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -43,6 +43,7 @@ argeo.server.port.http=7070
 eclipse.ignoreApp=true
 osgi.noShutdown=true
 org.eclipse.equinox.http.jetty.autostart=false
+org.eclipse.rap.workbenchAutostart=false
 
 # Avoid errors logs (see https://issues.apache.org/jira/browse/JCR-2226)
 org.apache.jackrabbit.core.statementcache=false
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index f369a2c86..942f94539 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -35,25 +36,59 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- Base -->
+		<!-- Absolutely minimal SLC Agent -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
-			<artifactId>org.argeo.slc.dep.minimal</artifactId>
+			<artifactId>org.argeo.slc.core</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.agent</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+
+		<!-- CLI Agent -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.launcher</artifactId> -->
+		<!-- <version>1.1.12-SNAPSHOT</version> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.agent.cli</artifactId> -->
+		<!-- <version>2.1.1-SNAPSHOT</version> -->
+		<!-- </dependency> -->
+
+		<!-- JCR Agent -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.agent.jcr</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.node.jackrabbit</artifactId>
 			<version>2.1.1-SNAPSHOT</version>
-			<type>pom</type>
 		</dependency>
 
+
 		<!-- SLC Libs -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.slc</groupId> -->
-<!-- 			<artifactId>org.argeo.slc.lib.repo</artifactId> -->
-<!-- 			<version>1.1.14-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.slc</groupId> -->
-<!-- 			<artifactId>org.argeo.slc.lib.jcr</artifactId> -->
-<!-- 			<version>1.1.14-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.lib.repo</artifactId> -->
+		<!-- <version>1.1.14-SNAPSHOT</version> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.lib.jcr</artifactId> -->
+		<!-- <version>1.1.14-SNAPSHOT</version> -->
+		<!-- </dependency> -->
 
 		<!-- Extensions -->
 		<dependency>
@@ -78,26 +113,92 @@
 			<artifactId>org.argeo.slc.server.repo</artifactId>
 			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.slc</groupId> -->
-<!-- 			<artifactId>org.argeo.slc.server.repo.webapp</artifactId> -->
-<!-- 			<version>2.1.1-SNAPSHOT</version> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.slc</groupId> -->
+		<!-- <artifactId>org.argeo.slc.server.repo.webapp</artifactId> -->
+		<!-- <version>2.1.1-SNAPSHOT</version> -->
+		<!-- </dependency> -->
 
 		<!-- Node -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.dep.node</artifactId>
+			<artifactId>org.argeo.dep.cms.sdk</artifactId>
 			<version>${version.argeo-commons}</version>
-			<type>pom</type>
-			<exclusions>
-				<exclusion>
-					<!-- Workaround for bug where catalina start add non slf4j logging to 
-						dependencies -->
-					<groupId>org.argeo.tp</groupId>
-					<artifactId>org.apache.commons.logging</artifactId>
-				</exclusion>
-			</exclusions>
+		</dependency>
+
+		<!-- UI -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.client.ui</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.client.ui.dist</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.client.rap</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+		</dependency>
+
+		<!-- For target platform generation -->
+		<dependency>
+			<groupId>org.argeo.slc</groupId>
+			<artifactId>org.argeo.slc.unit</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- Thrid parties (extras) -->
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>net.sf.jxl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>org.postgresql.postgresql</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>org.dbunit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.spi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.util</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.impl</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.connector.basic</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.transport.classpath</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras.eclipse</groupId>
+			<artifactId>org.eclipse.aether.transport.file</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>org.redline-rpm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.extras</groupId>
+			<artifactId>org.tmatesoft.svnkit</artifactId>
 		</dependency>
 	</dependencies>
 	<profiles>
@@ -133,15 +234,33 @@
 						<artifactId>maven-dependency-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>copy-dependencies</id>
-								<phase>process-resources</phase>
+								<id>copy-argeo</id>
+								<phase>package</phase>
 								<goals>
 									<goal>copy-dependencies</goal>
 								</goals>
 								<configuration>
 									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
 									<includeGroupIds>org.argeo.slc</includeGroupIds>
-									<outputDirectory>${project.build.directory}/slc</outputDirectory>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+								</configuration>
+							</execution>
+							<execution>
+								<id>copy-tp</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-tp</outputDirectory>
+									<excludeGroupIds>org.argeo.slc</excludeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
 								</configuration>
 							</execution>
 						</executions>
@@ -151,13 +270,13 @@
 						<artifactId>rpm-maven-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>rpm-slc</id>
+								<id>rpm-argeo</id>
 								<phase>package</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-libs</name>
+									<name>slc-platform</name>
 									<mappings>
 										<mapping>
 											<directory>/usr/share/osgi</directory>
@@ -167,14 +286,17 @@
 											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
-													<location>${project.build.directory}/slc</location>
+													<location>${project.build.directory}/lib-argeo</location>
+													<includes>
+														<include>*.jar</include>
+													</includes>
 												</source>
 											</sources>
 										</mapping>
 									</mappings>
 									<requires>
-										<require>slc-tp</require>
-										<require>argeo-node</require>
+										<require>slc-agent</require>
+										<require>slc-platform-tp</require>
 									</requires>
 								</configuration>
 							</execution>
@@ -198,7 +320,7 @@
 									<goal>rpm</goal>
 								</goals>
 								<configuration>
-									<name>slc-tp</name>
+									<name>slc-platform-tp</name>
 									<projversion>${version.argeo-distribution}</projversion>
 									<mappings>
 										<mapping>
@@ -207,30 +329,18 @@
 											<groupname>root</groupname>
 											<filemode>644</filemode>
 											<directoryIncluded>false</directoryIncluded>
-											<dependency>
-												<includes>
-													<!-- Core -->
-													<include>org.argeo.tp:org.aspectj.runtime</include>
-													<include>org.argeo.tp:org.aspectj.weaver</include>
-													<include>org.argeo.tp:net.sf.cglib</include>
-													<!-- Simple -->
-													<include>org.argeo.tp:org.tmatesoft.svn</include>
-													<include>org.argeo.tp:org.redline_rpm</include>
-													<!-- Ant -->
-													<include>org.argeo.tp:org.apache.tools.ant</include>
-													<include>org.argeo.tp:org.apache.tools.ant.launch</include>
-													<include>org.argeo.tp:org.apache.oro</include>
-													<include>org.argeo.tp:org.apache.bsf</include>
-													<!-- Maven -->
-													<include>org.argeo.tp:org.sonatype.aether</include>
-													<!-- Misc -->
-													<include>org.argeo.tp:biz.aQute.bndlib</include>
-												</includes>
-											</dependency>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib-tp</location>
+													<includes>
+														<include>*.jar</include>
+													</includes>
+												</source>
+											</sources>
 										</mapping>
 									</mappings>
 									<requires>
-										<require>argeo-node-tp</require>
+										<require>argeo-cms-sdk-tp</require>
 									</requires>
 								</configuration>
 							</execution>
diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 8794d4302..637a12851 100644
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -8,7 +8,7 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.dep.minimal</artifactId>
-	<name>SLC Minimal</name>
+	<name>SLC Agent</name>
 	<build>
 		<plugins>
 			<plugin>
@@ -81,21 +81,12 @@
 			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Node subset -->
-		<!-- Default JCR repositories configurations -->
+		<!-- Node -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.cms</artifactId>
+			<artifactId>org.argeo.dep.cms.node</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
-
-		<!-- Argeo Security -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.core</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-
 	</dependencies>
 	<profiles>
 		<profile>
@@ -121,5 +112,69 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>rpmbuild</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-argeo</id>
+								<phase>package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<includeTypes>jar</includeTypes>
+									<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory>
+									<includeGroupIds>org.argeo.slc</includeGroupIds>
+									<excludeTransitive>true</excludeTransitive>
+									<includeTypes>jar</includeTypes>
+									<includeScope>runtime</includeScope>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>rpm-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>rpm-argeo</id>
+								<phase>package</phase>
+								<goals>
+									<goal>rpm</goal>
+								</goals>
+								<configuration>
+									<name>slc-agent</name>
+									<mappings>
+										<mapping>
+											<directory>/usr/share/osgi</directory>
+											<username>root</username>
+											<groupname>root</groupname>
+											<filemode>644</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>${project.build.directory}/lib-argeo</location>
+													<includes>
+														<include>*.jar</include>
+													</includes>
+												</source>
+											</sources>
+										</mapping>
+									</mappings>
+									<requires>
+										<require>argeo-cms-node</require>
+									</requires>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.rap/pom.xml b/dep/org.argeo.slc.dep.rap/pom.xml
index 797f1bb5f..a532ea6a4 100644
--- a/dep/org.argeo.slc.dep.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.rap/pom.xml
@@ -47,13 +47,6 @@
 			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Secure Application -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.dep.node.rap</artifactId>
-			<version>${version.argeo-commons}</version>
-		</dependency>
-
 		<!-- For target platform generation -->
 		<dependency>
 			<groupId>org.argeo.slc</groupId>
diff --git a/dep/pom.xml b/dep/pom.xml
index e6c33b168..be1aa597a 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -13,8 +13,8 @@
 	<modules>
 		<module>org.argeo.slc.dep.minimal</module>
 		<module>org.argeo.slc.dep.backend</module>
-		<module>org.argeo.slc.dep.eclipse</module>
-		<module>org.argeo.slc.dep.rap</module>
+<!-- 		<module>org.argeo.slc.dep.eclipse</module> -->
+<!-- 		<module>org.argeo.slc.dep.rap</module> -->
 		<!-- <module>org.argeo.slc.dep.rcp</module> -->
 	</modules>
 	<build>
@@ -25,34 +25,34 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>rpmbuild</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true"
-											failonerror="false">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+<!-- 	<profiles> -->
+<!-- 		<profile> -->
+<!-- 			<id>rpmbuild</id> -->
+<!-- 			<build> -->
+<!-- 				<plugins> -->
+<!-- 					<plugin> -->
+<!-- 						<artifactId>maven-antrun-plugin</artifactId> -->
+<!-- 						<executions> -->
+<!-- 							<execution> -->
+<!-- 								<phase>install</phase> -->
+<!-- 								<goals> -->
+<!-- 									<goal>run</goal> -->
+<!-- 								</goals> -->
+<!-- 								<configuration> -->
+<!-- 									<target> -->
+<!-- 										<copy todir="${rpm.stagingRepository}" verbose="true" -->
+<!-- 											failonerror="false"> -->
+<!-- 											<fileset dir="${project.build.directory}/rpm" -->
+<!-- 												includes="*/RPMS/**/*.rpm" /> -->
+<!-- 											<flattenmapper /> -->
+<!-- 										</copy> -->
+<!-- 									</target> -->
+<!-- 								</configuration> -->
+<!-- 							</execution> -->
+<!-- 						</executions> -->
+<!-- 					</plugin> -->
+<!-- 				</plugins> -->
+<!-- 			</build> -->
+<!-- 		</profile> -->
+<!-- 	</profiles> -->
 </project>
\ No newline at end of file
diff --git a/dist/pom.xml b/dist/pom.xml
index dcaae1c32..09be12edc 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -12,34 +13,35 @@
 	<name>SLC Distribution</name>
 	<modules>
 		<module>slc</module>
-		<module>slc-maven</module>
+		<!-- <module>slc-maven</module> -->
 	</modules>
-	<profiles>
-		<profile>
-			<id>rpmbuild</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+	<!-- <profiles> -->
+	<!-- <profile> -->
+	<!-- <id>rpmbuild</id> -->
+	<!-- <build> -->
+	<!-- <plugins> -->
+	<!-- <plugin> -->
+	<!-- <artifactId>maven-antrun-plugin</artifactId> -->
+	<!-- <executions> -->
+	<!-- <execution> -->
+	<!-- <phase>install</phase> -->
+	<!-- <goals> -->
+	<!-- <goal>run</goal> -->
+	<!-- </goals> -->
+	<!-- <configuration> -->
+	<!-- <target> -->
+	<!-- <copy todir="${rpm.stagingRepository}" verbose="true" failonerror="false"> -->
+	<!-- <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" 
+		/> -->
+	<!-- <flattenmapper /> -->
+	<!-- </copy> -->
+	<!-- </target> -->
+	<!-- </configuration> -->
+	<!-- </execution> -->
+	<!-- </executions> -->
+	<!-- </plugin> -->
+	<!-- </plugins> -->
+	<!-- </build> -->
+	<!-- </profile> -->
+	<!-- </profiles> -->
 </project>
\ No newline at end of file
diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index 8f5770261..6789b9eb1 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -88,31 +88,31 @@
 			<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.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>
@@ -175,21 +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>
+<!-- 										<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>
@@ -205,16 +205,16 @@
 										</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>
 										<!-- do not require java so that it can be installed on Ubuntu -->
 										<!-- <require>java-1.6.0-openjdk</require> -->
diff --git a/dist/slc/src/main/rpm/etc/slc/config.ini b/dist/slc/src/main/rpm/etc/slc/config.ini
index 3a2b8188e..36113e653 100644
--- a/dist/slc/src/main/rpm/etc/slc/config.ini
+++ b/dist/slc/src/main/rpm/etc/slc/config.ini
@@ -1,60 +1,52 @@
-# SLC SERVICES
-argeo.osgi.start.1.slc=\
-org.argeo.server.ads.server,\
+argeo.osgi.start.2.http=\
+org.eclipse.equinox.http.servlet,\
+org.eclipse.equinox.http.jetty,\
+org.eclipse.rap.rwt.osgi
 
-argeo.osgi.start.2.slc=\
+argeo.osgi.start.3.node=\
+org.argeo.cms
+
+argeo.osgi.start.4.apps=\
+org.eclipse.gemini.blueprint.extender
+
+argeo.osgi.start.4.workbench=\
+org.eclipse.equinox.http.registry,\
+
+argeo.osgi.start.5.slc=\
 org.argeo.slc.node.jackrabbit,\
-org.argeo.slc.support.maven,\
-org.argeo.slc.server.repo,\
 org.argeo.slc.agent,\
 org.argeo.slc.agent.jcr,\
+org.argeo.slc.server.repo,\
 
-argeo.osgi.start.3.slc=\
-org.argeo.slc.server.repo.webapp,\
-
-# NODE SERVICES
-argeo.osgi.start.1.node=\
-org.springframework.osgi.extender,\
-
-argeo.osgi.start.2.node=\
-org.argeo.node.repo.jackrabbit,\
-org.argeo.security.dao.ldap,\
+org.osgi.framework.security=osgi
+java.security.policy=file:../../all.policy
+ 
+org.osgi.service.http.port=7070
+org.eclipse.equinox.http.jetty.log.stderr.threshold=info
 
-argeo.osgi.start.3.node=\
-org.argeo.jackrabbit.webapp,\
-org.argeo.server.rap.webapp,\
-org.argeo.server.catalina.start,\
-org.eclipse.equinox.http.registry,\
-org.springframework.osgi.web.extender,\
+log4j.configuration=file:../../log4j.properties
+org.eclipse.rap.workbenchAutostart=false
 
-# CONFIGURATION
-org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.anonymousDistributionPerspective
+slc.executionModules=org.argeo.slc.demo.ant,\
+org.argeo.slc.demo.basic,\
+org.argeo.slc.demo.minimal,\
 
-# Note default URL to access the webapp
-# http://localhost:7080/ui/node
+org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective
 
-# TOMCAT PORTS
+# override ports to run the demo as a server
 argeo.server.port.http=7080
-argeo.server.port.https=7083
-argeo.server.port.ajp=7089
-
-# LDAP (Apache DS, not started by default)
-argeo.ldap.port=7081
-#argeo.ads.init.ldif=osgibundle:init-argeo.ldif
-org.osgi.framework.bootdelegation=com.sun.jndi.ldap
+#argeo.server.port.https=9073
 
 # OSGi MANAGEMENT
 osgi.console=7082
 
-# RAP SPECIFIC
-eclipse.ignoreApp=true
-osgi.noShutdown=true
-
 # DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING
 osgi.bundles=org.argeo.osgi.boot.jar@start
 argeo.osgi.bundles=\
 /etc/slc/modules;in=*,\
 /usr/share/osgi;in=*.jar,\
-/usr/share/eclipse-rap;in=*.jar,\
-/usr/share/osgi/eclipse;in=*.jar,\
-/usr/share/osgi/rap;in=*.jar,\
\ No newline at end of file
+
+org.eclipse.equinox.http.jetty.autostart=false
+eclipse.ignoreApp=true
+osgi.noShutdown=true
+org.eclipse.rap.workbenchAutostart=false
diff --git a/dist/slc/src/main/scripts/preinstall-6 b/dist/slc/src/main/scripts/preinstall
similarity index 100%
rename from dist/slc/src/main/scripts/preinstall-6
rename to dist/slc/src/main/scripts/preinstall
diff --git a/dist/slc/src/main/scripts/preinstall-5 b/dist/slc/src/main/scripts/preinstall-5
deleted file mode 100644
index 661785734..000000000
--- a/dist/slc/src/main/scripts/preinstall-5
+++ /dev/null
@@ -1,21 +0,0 @@
-if [ $1 = "1" ];then
-	APP=%{name}
-	
-	# check if user exists
-	/bin/id $APP 2>/dev/null
-	if [ $? -ne 0 ];then
-		# create application user (EL5)
-		useradd -r --home-dir /var/lib/$APP --shell /sbin/nologin --create-home $APP
-	fi
-	
-	# give read access to group on home
-	chmod g+r /var/lib/$APP
-	mkdir -p /var/lib/$APP/{conf,data}
-	chown $APP.$APP /var/lib/$APP/{conf,data}
-fi
-
-# mkdir -p /etc/$APP
-# chown root.$APP /etc/$APP
-# chmod 640 /etc/$APP
-
-# chmod u+x /etc/init.d/$APP
\ No newline at end of file
diff --git a/dist/slc/src/main/scripts/preremove-6 b/dist/slc/src/main/scripts/preremove
similarity index 100%
rename from dist/slc/src/main/scripts/preremove-6
rename to dist/slc/src/main/scripts/preremove
diff --git a/dist/slc/src/main/scripts/preremove-5 b/dist/slc/src/main/scripts/preremove-5
deleted file mode 100644
index b842b9cb9..000000000
--- a/dist/slc/src/main/scripts/preremove-5
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ $1 = "0" ];then
-	#APP=%{name} => doesn't work
-	APP=slc
-	/sbin/chkconfig --del $APP
-	
-	# Maven
-	rm -rf /var/lib/$APP/.m2/repository
-	
-	#userdel $APP
-fi
diff --git a/lib/pom.xml b/lib/pom.xml
index 63378d895..b29fbc32d 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -11,12 +11,12 @@
 	<packaging>pom</packaging>
 	<name>SLC Standard Libs</name>
 	<description>SLC execution modules for generic tasks, to be used as parent pom</description>
-	<!-- <modules> -->
-	<!-- <module>org.argeo.slc.lib.build</module> -->
-	<!-- <module>org.argeo.slc.lib.jcr</module> -->
-	<!-- <module>org.argeo.slc.lib.repo</module> -->
-	<!-- <module>org.argeo.slc.lib.rpmfactory</module> -->
-	<!-- </modules> -->
+	<modules>
+		<!-- <module>org.argeo.slc.lib.build</module> -->
+		<!-- <module>org.argeo.slc.lib.jcr</module> -->
+		<!-- <module>org.argeo.slc.lib.repo</module> -->
+		<!-- <module>org.argeo.slc.lib.rpmfactory</module> -->
+	</modules>
 	<properties>
 		<additionalImports.slc-lib>
 			com.jcraft.jsch;resolution:=optional,
diff --git a/pom.xml b/pom.xml
index 972130b70..f924cfbf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.31-SNAPSHOT</version>
+		<version>2.1.32-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
@@ -40,7 +40,7 @@
 
 		<module>lib</module>
 		<module>dep</module>
-		<!-- <module>dist</module> -->
+		<module>dist</module>
 		<module>demo</module>
 	</modules>
 	<url>http://projects.argeo.org/slc/</url>
@@ -148,6 +148,17 @@ limitations under the License.
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.argeo.tp.extras</groupId>
+				<artifactId>argeo-tp-extras</artifactId>
+				<version>${version.argeo-tp-extras}</version>
+				<scope>import</scope>
+				<type>pom</type>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<distributionManagement>
 		<repository>
 			<id>staging</id>
-- 
2.39.2