From b53ffefb04e4c70f4e7ef3666041ff8f161f4411 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 12 Oct 2011 21:37:28 +0000
Subject: [PATCH 1/1] Node with repo deployable as RPM

git-svn-id: https://svn.argeo.org/slc/trunk@4816 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.backend/pom.xml         |  24 +-
 .../src/main/rpm/etc/init.d/slc-agent         |  58 ----
 .../src/main/rpm/etc/slc-agent/config.ini     |  14 -
 .../main/rpm/etc/slc-agent/log4j.properties   |  16 -
 .../src/main/rpm/etc/slc-server/config.ini    |  16 -
 .../src/main/scripts/postinstall              |  23 --
 .../src/main/scripts/preremove                |  15 -
 dist/pom.xml                                  |   5 +-
 .../.project                                  |   0
 .../{org.argeo.slc.sdk => slc-server}/pom.xml | 322 +++++++++---------
 .../src/assembly/devel.xml                    |   0
 .../src/assembly/dist.xml                     |   0
 .../src/main/base/work/server/conf/config.ini |   0
 .../src/main/rpm/etc/init.d/slc-server        |  22 +-
 .../src/main/rpm/etc/slc-server/config.ini    |  48 +++
 .../main/rpm/etc/slc-server/log4j.properties  |   0
 .../src/main/rpm/usr/bin/slc                  |   0
 dist/slc-server/src/main/scripts/postinstall  |   5 +
 dist/slc-server/src/main/scripts/preremove    |   3 +
 .../META-INF/spring/maven.xml                 |  10 +-
 .../META-INF/spring/repo-osgi.xml             |   8 +-
 21 files changed, 246 insertions(+), 343 deletions(-)
 delete mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-agent
 delete mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini
 delete mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/log4j.properties
 delete mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini
 delete mode 100644 dist/org.argeo.slc.sdk/src/main/scripts/postinstall
 delete mode 100644 dist/org.argeo.slc.sdk/src/main/scripts/preremove
 rename dist/{org.argeo.slc.sdk => slc-server}/.project (100%)
 rename dist/{org.argeo.slc.sdk => slc-server}/pom.xml (59%)
 rename dist/{org.argeo.slc.sdk => slc-server}/src/assembly/devel.xml (100%)
 rename dist/{org.argeo.slc.sdk => slc-server}/src/assembly/dist.xml (100%)
 rename dist/{org.argeo.slc.sdk => slc-server}/src/main/base/work/server/conf/config.ini (100%)
 rename dist/{org.argeo.slc.sdk => slc-server}/src/main/rpm/etc/init.d/slc-server (59%)
 create mode 100644 dist/slc-server/src/main/rpm/etc/slc-server/config.ini
 rename dist/{org.argeo.slc.sdk => slc-server}/src/main/rpm/etc/slc-server/log4j.properties (100%)
 rename dist/{org.argeo.slc.sdk => slc-server}/src/main/rpm/usr/bin/slc (100%)
 create mode 100644 dist/slc-server/src/main/scripts/postinstall
 create mode 100644 dist/slc-server/src/main/scripts/preremove

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 2891b599a..671f1d2b5 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -23,11 +23,11 @@
 	<dependencies>
 		<!-- HACK because of dependencies pb with Maven: version 2.4.0 is required 
 			by Spring-LDAP while Apache Directory takes 2.1.0 -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.apache.commons</groupId> -->
-<!-- 			<artifactId>com.springsource.org.apache.commons.lang</artifactId> -->
-<!-- 			<version>2.4.0</version> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.apache.commons</groupId> -->
+		<!-- <artifactId>com.springsource.org.apache.commons.lang</artifactId> -->
+		<!-- <version>2.4.0</version> -->
+		<!-- </dependency> -->
 
 		<!-- SLC Agent -->
 		<dependency>
@@ -73,7 +73,7 @@
 			<version>${version.slc}</version>
 		</dependency>
 
-		<!-- SLC Server -->
+		<!-- Node -->
 		<dependency>
 			<groupId>org.argeo.commons.security</groupId>
 			<artifactId>org.argeo.security.dep.node</artifactId>
@@ -97,9 +97,21 @@
 			<artifactId>org.argeo.slc.support.jcr</artifactId>
 			<version>0.13.1-SNAPSHOT</version>
 		</dependency>
+
+		<!-- SLC Repo -->
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.repo</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.modules</groupId>
+			<artifactId>org.argeo.slc.server.repo</artifactId>
+			<version>${version.slc}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.slc.modules</groupId>
+			<artifactId>org.argeo.slc.server.repo.webapp</artifactId>
 			<version>${version.slc}</version>
 		</dependency>
 
diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-agent b/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-agent
deleted file mode 100644
index a50105f19..000000000
--- a/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-agent
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-#
-# slc-agent	SLC Agent
-#
-# chkconfig: 3 92 92
-# description: SLC Agent
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-RETVAL=0
-
-start() {
-	EXECDIR=/var/lib/slc-agent
-	cd $EXECDIR
-	export JAVA_OPTS=-Xmx128m
-	/usr/bin/slc -console 3030 &
-	action $"Start SLC agent" /bin/true
-	return $RETVAL
-}
-
-stop() {
-	/usr/bin/expect  << EOF
-spawn telnet localhost 3030
-expect "osgi>"
-send "close\r"
-EOF
-	action $"Stop SLC agent" /bin/true
-	return $RETVAL
-}
-
-# See how we were called.
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  restart|reload)
-        stop
-        start
-        RETVAL=$?
-        ;;
-  condrestart)
-  		echo Not implemented
-  		exit 1
-        ;;
-  status)
-  		echo Not implemented
-  		exit 1
-        ;;
-  *)
-        echo $"Usage: $0 {start|stop|restart}"
-        exit 1
-esac
-
-exit $RETVAL
diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini
deleted file mode 100644
index 6e389c88e..000000000
--- a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-argeo.osgi.start=\
-org.springframework.osgi.extender,\
-org.argeo.slc.agent,\
-org.argeo.slc.agent.jms,\
-org.argeo.slc.support.equinox
-
-log4j.configuration=file:/etc/slc-agent/log4j.properties
-
-# ADVANCED PROPERTIES
-# should not be changed in general
-osgi.bundles=org.argeo.osgi.boot.jar@start
-argeo.osgi.bundles=\
-/var/lib/slc-agent/lib;in=*,\
-/var/lib/slc-agent/modules;in=*
diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/log4j.properties b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/log4j.properties
deleted file mode 100644
index 5e2db1e5e..000000000
--- a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/log4j.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-log4j.rootLogger=WARN, file
-#log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=INFO
-#log4j.logger.org.springframework=DEBUG
-
-## Appenders
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
-
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=/var/log/slc-agent.log
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini
deleted file mode 100644
index a63f849ab..000000000
--- a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-argeo.osgi.start=\
-org.springframework.osgi.extender,\
-org.argeo.server.ads.server,\
-org.argeo.slc.server.hsqldb,\
-org.argeo.slc.server.main,\
-org.argeo.slc.ria
-
-log4j.configuration=file:/etc/slc-server/log4j.properties
-
-org.osgi.framework.bootdelegation=com.sun.jndi.ldap
-
-# ADVANCED PROPERTIES
-# should not be changed in general
-osgi.bundles=org.argeo.osgi.boot.jar@start
-argeo.osgi.bundles=/var/lib/slc-server/lib;in=*
-	
\ No newline at end of file
diff --git a/dist/org.argeo.slc.sdk/src/main/scripts/postinstall b/dist/org.argeo.slc.sdk/src/main/scripts/postinstall
deleted file mode 100644
index 9d9f30628..000000000
--- a/dist/org.argeo.slc.sdk/src/main/scripts/postinstall
+++ /dev/null
@@ -1,23 +0,0 @@
-if [ ! -L /usr/share/osgi/org.eclipse.osgi.jar ];then
-	ln -s /usr/share/osgi/org.eclipse.osgi-*.jar /usr/share/osgi/org.eclipse.osgi.jar
-fi
-
-if [ ! -L /usr/share/osgi/org.argeo.osgi.boot.jar ];then
-	ln -s /usr/share/osgi/org.argeo.osgi.boot-*.jar /usr/share/osgi/org.argeo.osgi.boot.jar
-fi
-
-if [ $1 = "1" ];then
-	APP=slc-agent
-	mkdir -p /var/lib/$APP/{conf,data}
-	ln -s /etc/$APP/config.ini /var/lib/$APP/conf
-	mkdir -p /var/lib/$APP/lib
-	ln -s /usr/share/osgi/* /var/lib/$APP/lib
-	/sbin/chkconfig --add $APP
-
-	APP=slc-server
-	mkdir -p /var/lib/$APP/{conf,data}
-	ln -s /etc/$APP/config.ini /var/lib/$APP/conf
-	mkdir -p /var/lib/$APP/lib
-	ln -s /usr/share/osgi/* /var/lib/$APP/lib
-	/sbin/chkconfig --add $APP
-fi
\ No newline at end of file
diff --git a/dist/org.argeo.slc.sdk/src/main/scripts/preremove b/dist/org.argeo.slc.sdk/src/main/scripts/preremove
deleted file mode 100644
index 7973170eb..000000000
--- a/dist/org.argeo.slc.sdk/src/main/scripts/preremove
+++ /dev/null
@@ -1,15 +0,0 @@
-if [ $1 = "0" ];then
-	rm -f /usr/share/osgi/org.argeo.osgi.boot.jar
-	rm -f /usr/share/osgi/org.eclipse.osgi.jar
-
-	APP=slc-agent
-	/sbin/chkconfig --del $APP
-	rm -f /var/lib/$APP/conf/config.ini
-	rm -rf /var/lib/$APP/lib
-
-	APP=slc-server
-	/sbin/chkconfig --del $APP
-	rm -f /var/lib/$APP/conf/config.ini
-	rm -rf /var/lib/$APP/lib
-
-fi
diff --git a/dist/pom.xml b/dist/pom.xml
index 212fe016f..cb6a39a58 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>
@@ -11,6 +12,6 @@
 	<packaging>pom</packaging>
 	<name>SLC Distribution</name>
 	<modules>
-<!-- 		<module>org.argeo.slc.sdk</module> -->
+		<module>slc-server</module>
 	</modules>
 </project>
\ No newline at end of file
diff --git a/dist/org.argeo.slc.sdk/.project b/dist/slc-server/.project
similarity index 100%
rename from dist/org.argeo.slc.sdk/.project
rename to dist/slc-server/.project
diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/slc-server/pom.xml
similarity index 59%
rename from dist/org.argeo.slc.sdk/pom.xml
rename to dist/slc-server/pom.xml
index 2e33e26fb..efe903442 100644
--- a/dist/org.argeo.slc.sdk/pom.xml
+++ b/dist/slc-server/pom.xml
@@ -7,9 +7,9 @@
 		<version>0.13.1-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc.dist</groupId>
-	<artifactId>org.argeo.slc.sdk</artifactId>
+	<artifactId>slc-server</artifactId>
 	<packaging>pom</packaging>
-	<name>SLC SDK</name>
+	<name>SLC Server</name>
 	<properties>
 		<argeo.p2.cmd>/opt/equinox-p2-agent/eclipse</argeo.p2.cmd>
 		<argeo.p2.repository>/var/argeo/projects/SLC/www/sdk-dev</argeo.p2.repository>
@@ -33,44 +33,43 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<version>${version.maven-argeo-osgi}</version>
-				<executions>
-					<execution>
-						<id>pde-source</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>pde-sources</goal>
-						</goals>
-						<configuration>
-							<copyArtifacts>true</copyArtifacts>
-						</configuration>
-					</execution>
-					<execution>
-						<id>check-osgi</id>
-						<phase>test</phase>
-						<goals>
-							<goal>equinox</goal>
-						</goals>
-						<configuration>
-							<useDependencies>false</useDependencies>
-							<onlyCheck>true</onlyCheck>
-							<argsToAppend>
-								<arg>-clean</arg>
-							</argsToAppend>
-							<systemProperties>
-								<!-- Make sure that no bundle will be started -->
-								<argeo.osgi.start>XXX</argeo.osgi.start>
-								<argeo.osgi.bundles>
-									${project.build.directory}/lib;in=*.jar,
-								</argeo.osgi.bundles>
-							</systemProperties>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+<!-- 			<plugin> -->
+<!-- 				<groupId>org.argeo.maven.plugins</groupId> -->
+<!-- 				<artifactId>maven-argeo-osgi-plugin</artifactId> -->
+<!-- 				<version>${version.maven-argeo-osgi}</version> -->
+<!-- 				<executions> -->
+<!-- 					<execution> -->
+<!-- 					<id>pde-source</id> -->
+<!-- 					<phase>process-resources</phase> -->
+<!-- 					<goals> -->
+<!-- 					<goal>pde-sources</goal> -->
+<!-- 					</goals> -->
+<!-- 					<configuration> -->
+<!-- 					<copyArtifacts>true</copyArtifacts> -->
+<!-- 					</configuration> -->
+<!-- 					</execution> -->
+<!-- 					<execution> -->
+<!-- 						<id>check-osgi</id> -->
+<!-- 						<phase>test</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>equinox</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<useDependencies>false</useDependencies> -->
+<!-- 							<onlyCheck>true</onlyCheck> -->
+<!-- 							<argsToAppend> -->
+<!-- 								<arg>-clean</arg> -->
+<!-- 							</argsToAppend> -->
+<!-- 							<systemProperties> -->
+<!-- 								<argeo.osgi.start>XXX</argeo.osgi.start> -->
+<!-- 								<argeo.osgi.bundles> -->
+<!-- 									${project.build.directory}/lib;in=*.jar, -->
+<!-- 								</argeo.osgi.bundles> -->
+<!-- 							</systemProperties> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
+<!-- 				</executions> -->
+<!-- 			</plugin> -->
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
 				<executions>
@@ -92,25 +91,25 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/dist.xml</descriptor>
-						<descriptor>src/assembly/devel.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>attach-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+			<!-- <plugin> -->
+			<!-- <groupId>org.apache.maven.plugins</groupId> -->
+			<!-- <artifactId>maven-assembly-plugin</artifactId> -->
+			<!-- <configuration> -->
+			<!-- <descriptors> -->
+			<!-- <descriptor>src/assembly/dist.xml</descriptor> -->
+			<!-- <descriptor>src/assembly/devel.xml</descriptor> -->
+			<!-- </descriptors> -->
+			<!-- </configuration> -->
+			<!-- <executions> -->
+			<!-- <execution> -->
+			<!-- <id>attach-assembly</id> -->
+			<!-- <phase>deploy</phase> -->
+			<!-- <goals> -->
+			<!-- <goal>single</goal> -->
+			<!-- </goals> -->
+			<!-- </execution> -->
+			<!-- </executions> -->
+			<!-- </plugin> -->
 			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> 
 				<version>1.1</version> <executions> <execution> <id>create-repository</id> 
 				<phase>deploy</phase> <goals> <goal>exec</goal> </goals> </execution> </executions> 
@@ -141,28 +140,34 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.slc.dep</groupId>
-			<artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
-			<version>${version.slc}</version>
+			<artifactId>org.argeo.slc.dep.sdk.rap</artifactId>
+			<version>0.13.1-SNAPSHOT</version>
+			<exclusions>
+				<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>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.tomcat</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.dep.ads</artifactId>
+			<type>pom</type>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
 			<id>rpmbuild</id>
-
-			<activation>
-				<os>
-					<name>Linux</name>
-				</os>
-				<file>
-					<exists>/usr/bin/rpmbuild</exists>
-				</file>
-			</activation>
-
-			<properties>
-				<package.version>${version.slc}</package.version>
-				<distribution.label>argeo</distribution.label>
-				<distribution.root>/var/argeo/linux/argeo-el/5/argeo-testing</distribution.root>
-			</properties>
 			<build>
 				<plugins>
 					<plugin>
@@ -171,10 +176,10 @@
 						<version>2.1-alpha-1</version>
 						<extensions>true</extensions>
 						<configuration>
-							<version>${package.version}</version>
-							<release>r${buildNumber}.${distribution.label}</release>
-							<copyright>2010 Argeo</copyright>
-							<distribution>${distribution.label}</distribution>
+							<version>${project.version}</version>
+							<release>r${buildNumber}.argeo</release>
+							<copyright>2011 Argeo</copyright>
+							<distribution>argeo</distribution>
 							<packager>mbaudier@argeo.org</packager>
 							<group>Applications/System</group>
 							<prefix>/usr</prefix>
@@ -182,7 +187,7 @@
 						<executions>
 							<execution>
 								<id>rpm-sdk</id>
-								<phase>deploy</phase>
+								<phase>package</phase>
 								<goals>
 									<goal>rpm</goal>
 								</goals>
@@ -218,21 +223,6 @@
 												</source>
 											</sources>
 										</mapping>
-										<mapping>
-											<directory>/etc/slc-agent</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<configuration>true</configuration>
-											<sources>
-												<source>
-													<location>src/main/rpm/etc/slc-agent</location>
-													<includes>
-														<include>*</include>
-													</includes>
-												</source>
-											</sources>
-										</mapping>
 										<mapping>
 											<directory>/etc/slc-server</directory>
 											<username>root</username>
@@ -249,7 +239,7 @@
 											</sources>
 										</mapping>
 										<mapping>
-											<directory>/usr/share/osgi</directory>
+											<directory>/usr/share/slc-server/lib</directory>
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
@@ -271,79 +261,77 @@
 										<scriptFile>src/main/scripts/preremove</scriptFile>
 									</preremoveScriptlet>
 									<requires>
-										<require>java</require>
-										<!-- For the start/stop scripts -->
-										<require>expect</require>
-									</requires>
-								</configuration>
-							</execution>
-							<execution>
-								<id>rpm-devel</id>
-								<phase>deploy</phase>
-								<goals>
-									<goal>rpm</goal>
-								</goals>
-								<configuration>
-									<name>${project.artifactId}-pdesources</name>
-									<mappings>
-										<mapping>
-											<directory>/usr/src/osgi/pde</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>target/libsrc</location>
-													<includes>
-														<include>*.jar</include>
-													</includes>
-												</source>
-											</sources>
-										</mapping>
-									</mappings>
-									<requires>
-										<require>org.argeo.slc.sdk</require>
-									</requires>
-								</configuration>
-							</execution>
-							<execution>
-								<id>rpm-demo</id>
-								<phase>deploy</phase>
-								<goals>
-									<goal>rpm</goal>
-								</goals>
-								<configuration>
-									<name>${project.artifactId}-demo</name>
-									<mappings>
-										<mapping>
-											<directory>/var/lib/slc-agent/modules</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>../../demo/site</location>
-													<includes>
-														<include>org.argeo.*/**</include>
-													</includes>
-													<excludes>
-														<exclude>pom.xml</exclude>
-														<exclude>target</exclude>
-														<exclude>.svn</exclude>
-														<exclude>**/.svn/**</exclude>
-													</excludes>
-												</source>
-											</sources>
-										</mapping>
-									</mappings>
-									<requires>
-										<require>org.argeo.slc.sdk</require>
-										<!-- <require> org.argeo.slc.dep.sdk.rcp</require> -->
+										<require>osgi-boot</require>
 									</requires>
 								</configuration>
 							</execution>
+							<!-- <execution> -->
+							<!-- <id>rpm-devel</id> -->
+							<!-- <phase>deploy</phase> -->
+							<!-- <goals> -->
+							<!-- <goal>rpm</goal> -->
+							<!-- </goals> -->
+							<!-- <configuration> -->
+							<!-- <name>${project.artifactId}-pdesources</name> -->
+							<!-- <mappings> -->
+							<!-- <mapping> -->
+							<!-- <directory>/usr/src/osgi/pde</directory> -->
+							<!-- <username>root</username> -->
+							<!-- <groupname>root</groupname> -->
+							<!-- <filemode>644</filemode> -->
+							<!-- <directoryIncluded>false</directoryIncluded> -->
+							<!-- <sources> -->
+							<!-- <source> -->
+							<!-- <location>target/libsrc</location> -->
+							<!-- <includes> -->
+							<!-- <include>*.jar</include> -->
+							<!-- </includes> -->
+							<!-- </source> -->
+							<!-- </sources> -->
+							<!-- </mapping> -->
+							<!-- </mappings> -->
+							<!-- <requires> -->
+							<!-- <require>org.argeo.slc.sdk</require> -->
+							<!-- </requires> -->
+							<!-- </configuration> -->
+							<!-- </execution> -->
+							<!-- <execution> -->
+							<!-- <id>rpm-demo</id> -->
+							<!-- <phase>deploy</phase> -->
+							<!-- <goals> -->
+							<!-- <goal>rpm</goal> -->
+							<!-- </goals> -->
+							<!-- <configuration> -->
+							<!-- <name>${project.artifactId}-demo</name> -->
+							<!-- <mappings> -->
+							<!-- <mapping> -->
+							<!-- <directory>/var/lib/slc-agent/modules</directory> -->
+							<!-- <username>root</username> -->
+							<!-- <groupname>root</groupname> -->
+							<!-- <filemode>644</filemode> -->
+							<!-- <directoryIncluded>false</directoryIncluded> -->
+							<!-- <sources> -->
+							<!-- <source> -->
+							<!-- <location>../../demo/site</location> -->
+							<!-- <includes> -->
+							<!-- <include>org.argeo.*/**</include> -->
+							<!-- </includes> -->
+							<!-- <excludes> -->
+							<!-- <exclude>pom.xml</exclude> -->
+							<!-- <exclude>target</exclude> -->
+							<!-- <exclude>.svn</exclude> -->
+							<!-- <exclude>**/.svn/**</exclude> -->
+							<!-- </excludes> -->
+							<!-- </source> -->
+							<!-- </sources> -->
+							<!-- </mapping> -->
+							<!-- </mappings> -->
+							<!-- <requires> -->
+							<!-- <require>org.argeo.slc.sdk</require> -->
+							<!-- <require> org.argeo.slc.dep.sdk.rcp</require> -->
+							<!-- </requires> -->
+							<!-- </configuration> -->
+							<!-- </execution> -->
 						</executions>
 					</plugin>
 					<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> 
diff --git a/dist/org.argeo.slc.sdk/src/assembly/devel.xml b/dist/slc-server/src/assembly/devel.xml
similarity index 100%
rename from dist/org.argeo.slc.sdk/src/assembly/devel.xml
rename to dist/slc-server/src/assembly/devel.xml
diff --git a/dist/org.argeo.slc.sdk/src/assembly/dist.xml b/dist/slc-server/src/assembly/dist.xml
similarity index 100%
rename from dist/org.argeo.slc.sdk/src/assembly/dist.xml
rename to dist/slc-server/src/assembly/dist.xml
diff --git a/dist/org.argeo.slc.sdk/src/main/base/work/server/conf/config.ini b/dist/slc-server/src/main/base/work/server/conf/config.ini
similarity index 100%
rename from dist/org.argeo.slc.sdk/src/main/base/work/server/conf/config.ini
rename to dist/slc-server/src/main/base/work/server/conf/config.ini
diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-server b/dist/slc-server/src/main/rpm/etc/init.d/slc-server
similarity index 59%
rename from dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-server
rename to dist/slc-server/src/main/rpm/etc/init.d/slc-server
index cc98549dd..3f3257a8e 100644
--- a/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-server
+++ b/dist/slc-server/src/main/rpm/etc/init.d/slc-server
@@ -11,20 +11,13 @@
 RETVAL=0
 
 start() {
-	EXECDIR=/var/lib/slc-server
-	cd $EXECDIR
-	export JAVA_OPTS=-Xmx256m
-	/usr/bin/slc -console 3040 &
+	/usr/sbin/osgi-service slc-server start
 	action $"Start SLC server" /bin/true
 	return $RETVAL
 }
 
 stop() {
-	/usr/bin/expect  << EOF
-spawn telnet localhost 3040
-expect "osgi>"
-send "close\r"
-EOF
+	/usr/sbin/osgi-service slc-server stop
 	action $"Stop SLC server" /bin/true
 	return $RETVAL
 }
@@ -37,21 +30,16 @@ case "$1" in
   stop)
         stop
         ;;
-  restart|reload)
+  restart)
         stop
         start
         RETVAL=$?
         ;;
-  condrestart)
-  		echo Not implemented
-  		exit 1
-        ;;
   status)
-  		echo Not implemented
-  		exit 1
+  		/usr/sbin/osgi-service slc-server status
         ;;
   *)
-        echo $"Usage: $0 {start|stop|restart}"
+        echo $"Usage: $0 {start|stop|restart|status}"
         exit 1
 esac
 
diff --git a/dist/slc-server/src/main/rpm/etc/slc-server/config.ini b/dist/slc-server/src/main/rpm/etc/slc-server/config.ini
new file mode 100644
index 000000000..e2a968ac9
--- /dev/null
+++ b/dist/slc-server/src/main/rpm/etc/slc-server/config.ini
@@ -0,0 +1,48 @@
+argeo.osgi.start=\
+org.springframework.osgi.extender,\
+com.springsource.javax.servlet,\
+org.argeo.eclipse.ui,\
+org.eclipse.core.runtime,\
+org.eclipse.equinox.common,\
+org.eclipse.equinox.http.registry,\
+org.eclipse.equinox.launcher,\
+org.argeo.dep.osgi.catalina.start,\
+org.argeo.server.rap.webapp,\
+org.argeo.jackrabbit.webapp,\
+org.argeo.security.dao.ldap,\
+org.argeo.security.equinox,\
+org.argeo.security.services,\
+org.argeo.security.ui,\
+org.argeo.security.ui.rap,\
+org.argeo.server.ads.server,\
+org.argeo.node.repofactory.jackrabbit,\
+org.argeo.node.repo.jackrabbit,\
+org.argeo.slc.node.jackrabbit,\
+org.argeo.slc.server.repo,\
+org.argeo.slc.server.repo.webapp,\
+org.argeo.slc.client.ui,\
+org.argeo.slc.client.rap,\
+org.argeo.slc.agent,\
+org.argeo.slc.agent.jcr,\
+org.springframework.osgi.web.extender,\
+
+#slc.executionModules=org.argeo.infra.slc.rpmfactory,\
+#org.argeo.elgis.rpmfactory,\
+
+org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective
+
+# JCR
+argeo.node.repo.home=data/noderepo
+argeo.node.repo.dburl=jdbc:h2:data/h2/noderepo_db
+
+# LDAP (Apache DS)
+#argeo.ads.init.ldif=osgibundle:init-argeo.ldif
+
+# OSGi MANAGEMENT
+osgi.console=3030
+
+eclipse.ignoreApp=true
+osgi.noShutdown=true
+
+org.osgi.framework.bootdelegation=com.sun.jndi.ldap
+	
\ No newline at end of file
diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/log4j.properties b/dist/slc-server/src/main/rpm/etc/slc-server/log4j.properties
similarity index 100%
rename from dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/log4j.properties
rename to dist/slc-server/src/main/rpm/etc/slc-server/log4j.properties
diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/usr/bin/slc b/dist/slc-server/src/main/rpm/usr/bin/slc
similarity index 100%
rename from dist/org.argeo.slc.sdk/src/main/rpm/usr/bin/slc
rename to dist/slc-server/src/main/rpm/usr/bin/slc
diff --git a/dist/slc-server/src/main/scripts/postinstall b/dist/slc-server/src/main/scripts/postinstall
new file mode 100644
index 000000000..543d6f9b4
--- /dev/null
+++ b/dist/slc-server/src/main/scripts/postinstall
@@ -0,0 +1,5 @@
+if [ $1 = "1" ];then
+	APP=%{name}
+	mkdir -p /var/lib/$APP/{conf,data}
+	/sbin/chkconfig --add $APP
+fi
\ No newline at end of file
diff --git a/dist/slc-server/src/main/scripts/preremove b/dist/slc-server/src/main/scripts/preremove
new file mode 100644
index 000000000..7b3932e31
--- /dev/null
+++ b/dist/slc-server/src/main/scripts/preremove
@@ -0,0 +1,3 @@
+if [ $1 = "0" ];then
+	/sbin/chkconfig --del slc-server
+fi
diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
index 7f6b1d4f1..a3708ba39 100644
--- a/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
@@ -26,11 +26,11 @@
 	</bean>
  -->
  
-	<bean id="mavenAetherTemplate" class="org.argeo.slc.aether.AetherTemplate">
-		<property name="repositorySystem" ref="mavenRepositorySystem" />
-		<property name="repositorySystemSession" ref="mavenRepositorySystemSession" />
-		<property name="remoteRepositories" ref="defaultMavenRepositories" />
-	</bean>
+<!-- 	<bean id="mavenAetherTemplate" class="org.argeo.slc.aether.AetherTemplate"> -->
+<!-- 		<property name="repositorySystem" ref="mavenRepositorySystem" /> -->
+<!-- 		<property name="repositorySystemSession" ref="mavenRepositorySystemSession" /> -->
+<!-- 		<property name="remoteRepositories" ref="defaultMavenRepositories" /> -->
+<!-- 	</bean> -->
 
 	<!-- Remote repositories -->
 	<util:list id="defaultMavenRepositories">
diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index 1bf904e19..bd143cfde 100644
--- a/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -16,10 +16,10 @@
 		filter="(argeo.jcr.repository.alias=slc)" />
 
 	<!-- Maven -->
-	<reference id="mavenRepositorySystem" interface="org.sonatype.aether.RepositorySystem"
-		filter="(aether.repositorySystemType=maven)" />
-	<reference id="mavenRepositorySystemSession" interface="org.sonatype.aether.RepositorySystemSession"
-		filter="(aether.repositorySystemType=maven)" />
+<!-- 	<reference id="mavenRepositorySystem" interface="org.sonatype.aether.RepositorySystem" -->
+<!-- 		filter="(aether.repositorySystemType=maven)" /> -->
+<!-- 	<reference id="mavenRepositorySystemSession" interface="org.sonatype.aether.RepositorySystemSession" -->
+<!-- 		filter="(aether.repositorySystemType=maven)" /> -->
 
 	<!-- SERVICES -->
 	<service ref="mavenProxyService" interface="org.argeo.slc.repo.maven.proxy.MavenProxyService" />
-- 
2.39.2