From 48b6f7647f12f4b96d1914bcafc95efd7f43cc43 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 17 Feb 2015 07:20:39 +0000
Subject: [PATCH] Migrate SLC modules

git-svn-id: https://svn.argeo.org/slc/trunk@7905 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 dep/org.argeo.slc.dep.backend/pom.xml         | 10 ++--
 dep/org.argeo.slc.dep.minimal/pom.xml         | 53 ++++++++++---------
 modules/org.argeo.slc.server.repo/pom.xml     | 32 -----------
 .../.project                                  |  0
 .../META-INF/spring/jcr-osgi.xml              |  4 +-
 .../META-INF/spring/jcr.xml                   |  2 +-
 org.argeo.slc.agent.jcr/bnd.bnd               |  2 +
 .../build.properties                          |  0
 .../pom.xml                                   | 18 +------
 .../.project                                  |  0
 .../META-INF/spring/agent.xml                 |  0
 .../META-INF/spring/osgi.xml                  |  0
 .../agent.properties                          |  0
 org.argeo.slc.agent/bnd.bnd                   |  0
 .../build.properties                          |  0
 .../pom.xml                                   | 17 +-----
 .../.project                                  |  0
 .../META-INF/spring/jackrabbit-osgi.xml       |  2 +-
 .../META-INF/spring/jackrabbit.xml            |  0
 org.argeo.slc.node.jackrabbit/bnd.bnd         |  2 +
 .../build.properties                          |  0
 .../pom.xml                                   | 18 +------
 .../.project                                  |  0
 .../.settings/org.eclipse.pde.core.prefs      |  0
 .../META-INF/spring/jcr.xml                   |  0
 .../META-INF/spring/maven.xml                 |  0
 .../META-INF/spring/repo-osgi.xml             |  2 +-
 .../META-INF/spring/services.xml              |  0
 org.argeo.slc.server.repo/bnd.bnd             |  6 +++
 .../build.properties                          |  0
 org.argeo.slc.server.repo/pom.xml             | 11 ++++
 .../repo.properties                           |  0
 .../repository-h2-v1.1.11.xml                 |  0
 .../repository-h2.xml                         |  0
 .../repository-pg-dist.xml                    |  0
 .../repository-pg-docs.xml                    |  0
 .../repository-pg-java.xml                    |  0
 .../repository-pg-rpm.xml                     |  0
 pom.xml                                       |  9 +++-
 39 files changed, 69 insertions(+), 119 deletions(-)
 delete mode 100644 modules/org.argeo.slc.server.repo/pom.xml
 rename {modules/org.argeo.slc.agent.jcr => org.argeo.slc.agent.jcr}/.project (100%)
 rename {modules/org.argeo.slc.agent.jcr => org.argeo.slc.agent.jcr}/META-INF/spring/jcr-osgi.xml (89%)
 rename {modules/org.argeo.slc.agent.jcr => org.argeo.slc.agent.jcr}/META-INF/spring/jcr.xml (92%)
 create mode 100644 org.argeo.slc.agent.jcr/bnd.bnd
 rename {modules/org.argeo.slc.agent.jcr => org.argeo.slc.agent.jcr}/build.properties (100%)
 rename {modules/org.argeo.slc.agent.jcr => org.argeo.slc.agent.jcr}/pom.xml (54%)
 rename {modules/org.argeo.slc.agent => org.argeo.slc.agent}/.project (100%)
 rename {modules/org.argeo.slc.agent => org.argeo.slc.agent}/META-INF/spring/agent.xml (100%)
 rename {modules/org.argeo.slc.agent => org.argeo.slc.agent}/META-INF/spring/osgi.xml (100%)
 rename {modules/org.argeo.slc.agent => org.argeo.slc.agent}/agent.properties (100%)
 create mode 100644 org.argeo.slc.agent/bnd.bnd
 rename {modules/org.argeo.slc.agent => org.argeo.slc.agent}/build.properties (100%)
 rename {modules/org.argeo.slc.agent => org.argeo.slc.agent}/pom.xml (55%)
 rename {modules/org.argeo.slc.node.jackrabbit => org.argeo.slc.node.jackrabbit}/.project (100%)
 rename {modules/org.argeo.slc.node.jackrabbit => org.argeo.slc.node.jackrabbit}/META-INF/spring/jackrabbit-osgi.xml (89%)
 rename {modules/org.argeo.slc.node.jackrabbit => org.argeo.slc.node.jackrabbit}/META-INF/spring/jackrabbit.xml (100%)
 create mode 100644 org.argeo.slc.node.jackrabbit/bnd.bnd
 rename {modules/org.argeo.slc.node.jackrabbit => org.argeo.slc.node.jackrabbit}/build.properties (100%)
 rename {modules/org.argeo.slc.node.jackrabbit => org.argeo.slc.node.jackrabbit}/pom.xml (55%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/.project (100%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/.settings/org.eclipse.pde.core.prefs (100%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/META-INF/spring/jcr.xml (100%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/META-INF/spring/maven.xml (100%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/META-INF/spring/repo-osgi.xml (95%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/META-INF/spring/services.xml (100%)
 create mode 100644 org.argeo.slc.server.repo/bnd.bnd
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/build.properties (100%)
 create mode 100644 org.argeo.slc.server.repo/pom.xml
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/repo.properties (100%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/repository-h2-v1.1.11.xml (100%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/repository-h2.xml (100%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/repository-pg-dist.xml (100%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/repository-pg-docs.xml (100%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/repository-pg-java.xml (100%)
 rename {modules/org.argeo.slc.server.repo => org.argeo.slc.server.repo}/repository-pg-rpm.xml (100%)

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index dc950424f..b128cd7f4 100644
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -74,11 +74,11 @@
 			<artifactId>org.argeo.slc.factory</artifactId>
 			<version>2.1.1-SNAPSHOT</version>
 		</dependency>
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.argeo.slc</groupId> -->
-<!-- 			<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</artifactId>
+			<version>2.1.1-SNAPSHOT</version>
+		</dependency>
 <!-- 		<dependency> -->
 <!-- 			<groupId>org.argeo.slc</groupId> -->
 <!-- 			<artifactId>org.argeo.slc.server.repo.webapp</artifactId> -->
diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 513a62649..0b2a6a544 100644
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/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>
@@ -46,11 +47,11 @@
 			<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.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>
@@ -58,28 +59,28 @@
 		</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> -->
+		<!-- <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> -->
-<!-- 		</dependency> -->
+		<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>
+		</dependency>
 
 		<!-- Node subset -->
 		<!-- Default JCR repositories configurations -->
diff --git a/modules/org.argeo.slc.server.repo/pom.xml b/modules/org.argeo.slc.server.repo/pom.xml
deleted file mode 100644
index db3f63c4b..000000000
--- a/modules/org.argeo.slc.server.repo/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<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>modules</artifactId>
-		<version>2.1.1-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.argeo.slc.server.repo</artifactId>
-	<name>SLC Repo</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Import-Package>
-							*,
-							org.argeo.jcr,
-							org.argeo.slc.jcr,
-							org.argeo.slc.repo,
-							org.h2;resolution:=optional,
-							org.postgresql;resolution:=optional,
-							com.mysql.jdbc;resolution:=optional,
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
\ No newline at end of file
diff --git a/modules/org.argeo.slc.agent.jcr/.project b/org.argeo.slc.agent.jcr/.project
similarity index 100%
rename from modules/org.argeo.slc.agent.jcr/.project
rename to org.argeo.slc.agent.jcr/.project
diff --git a/modules/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml b/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
similarity index 89%
rename from modules/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
rename to org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
index 5432dad00..ef95f7c02 100644
--- a/modules/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
+++ b/org.argeo.slc.agent.jcr/META-INF/spring/jcr-osgi.xml
@@ -14,7 +14,7 @@
 		filter="(argeo.jcr.repository.alias=slc)" />
 
 	<reference id="authenticationManager"
-		interface="org.springframework.security.AuthenticationManager" />
+		interface="org.springframework.security.authentication.AuthenticationManager" />
 
 	<reference id="modulesManager"
 		interface="org.argeo.slc.execution.ExecutionModulesManager" />
@@ -28,5 +28,5 @@
 	<service ref="agent" interface="org.argeo.slc.execution.SlcAgent" />
 	<service ref="agentCli" interface="org.argeo.slc.execution.SlcAgentCli" />
 
-	<service ref="fileSystemManager" interface="org.apache.commons.vfs.FileSystemManager" />
+	<service ref="fileSystemManager" interface="org.apache.commons.vfs2.FileSystemManager" />
 </beans:beans>
\ No newline at end of file
diff --git a/modules/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml b/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
similarity index 92%
rename from modules/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
rename to org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
index 5750fc957..5fe028e1f 100644
--- a/modules/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
+++ b/org.argeo.slc.agent.jcr/META-INF/spring/jcr.xml
@@ -39,7 +39,7 @@
 	</bean>
 
 
-	<bean name="fileSystemManager" class="org.apache.commons.vfs.impl.StandardFileSystemManager"
+	<bean name="fileSystemManager" class="org.apache.commons.vfs2.impl.StandardFileSystemManager"
 		init-method="init" destroy-method="close" />
 
 </beans>
\ No newline at end of file
diff --git a/org.argeo.slc.agent.jcr/bnd.bnd b/org.argeo.slc.agent.jcr/bnd.bnd
new file mode 100644
index 000000000..0030580c4
--- /dev/null
+++ b/org.argeo.slc.agent.jcr/bnd.bnd
@@ -0,0 +1,2 @@
+Import-Package: org.argeo.slc.jcr,\
+*
diff --git a/modules/org.argeo.slc.agent.jcr/build.properties b/org.argeo.slc.agent.jcr/build.properties
similarity index 100%
rename from modules/org.argeo.slc.agent.jcr/build.properties
rename to org.argeo.slc.agent.jcr/build.properties
diff --git a/modules/org.argeo.slc.agent.jcr/pom.xml b/org.argeo.slc.agent.jcr/pom.xml
similarity index 54%
rename from modules/org.argeo.slc.agent.jcr/pom.xml
rename to org.argeo.slc.agent.jcr/pom.xml
index b23399f33..cb6c1a5be 100644
--- a/modules/org.argeo.slc.agent.jcr/pom.xml
+++ b/org.argeo.slc.agent.jcr/pom.xml
@@ -2,26 +2,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>modules</artifactId>
+		<artifactId>argeo-slc</artifactId>
 		<version>2.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.agent.jcr</artifactId>
 	<name>SLC Agent JCR</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Import-Package>
-							*,
-							org.argeo.slc.jcr
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/modules/org.argeo.slc.agent/.project b/org.argeo.slc.agent/.project
similarity index 100%
rename from modules/org.argeo.slc.agent/.project
rename to org.argeo.slc.agent/.project
diff --git a/modules/org.argeo.slc.agent/META-INF/spring/agent.xml b/org.argeo.slc.agent/META-INF/spring/agent.xml
similarity index 100%
rename from modules/org.argeo.slc.agent/META-INF/spring/agent.xml
rename to org.argeo.slc.agent/META-INF/spring/agent.xml
diff --git a/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml b/org.argeo.slc.agent/META-INF/spring/osgi.xml
similarity index 100%
rename from modules/org.argeo.slc.agent/META-INF/spring/osgi.xml
rename to org.argeo.slc.agent/META-INF/spring/osgi.xml
diff --git a/modules/org.argeo.slc.agent/agent.properties b/org.argeo.slc.agent/agent.properties
similarity index 100%
rename from modules/org.argeo.slc.agent/agent.properties
rename to org.argeo.slc.agent/agent.properties
diff --git a/org.argeo.slc.agent/bnd.bnd b/org.argeo.slc.agent/bnd.bnd
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/org.argeo.slc.agent/build.properties b/org.argeo.slc.agent/build.properties
similarity index 100%
rename from modules/org.argeo.slc.agent/build.properties
rename to org.argeo.slc.agent/build.properties
diff --git a/modules/org.argeo.slc.agent/pom.xml b/org.argeo.slc.agent/pom.xml
similarity index 55%
rename from modules/org.argeo.slc.agent/pom.xml
rename to org.argeo.slc.agent/pom.xml
index 01b5e8d7d..656a76418 100644
--- a/modules/org.argeo.slc.agent/pom.xml
+++ b/org.argeo.slc.agent/pom.xml
@@ -2,25 +2,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>modules</artifactId>
+		<artifactId>argeo-slc</artifactId>
 		<version>2.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.agent</artifactId>
 	<name>SLC Agent</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Import-Package>
-							*,
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/modules/org.argeo.slc.node.jackrabbit/.project b/org.argeo.slc.node.jackrabbit/.project
similarity index 100%
rename from modules/org.argeo.slc.node.jackrabbit/.project
rename to org.argeo.slc.node.jackrabbit/.project
diff --git a/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml b/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
similarity index 89%
rename from modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
rename to org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
index 890031154..734721a72 100644
--- a/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
+++ b/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit-osgi.xml
@@ -14,7 +14,7 @@
 		filter="(argeo.jcr.repository.alias=node)" />
 
 	<reference id="authenticationManager"
-		interface="org.springframework.security.AuthenticationManager" />
+		interface="org.springframework.security.authentication.AuthenticationManager" />
 
 	<!-- SERVICES -->
 	<service ref="jcrRepository" interface="javax.jcr.Repository">
diff --git a/modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml b/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
similarity index 100%
rename from modules/org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
rename to org.argeo.slc.node.jackrabbit/META-INF/spring/jackrabbit.xml
diff --git a/org.argeo.slc.node.jackrabbit/bnd.bnd b/org.argeo.slc.node.jackrabbit/bnd.bnd
new file mode 100644
index 000000000..05886444c
--- /dev/null
+++ b/org.argeo.slc.node.jackrabbit/bnd.bnd
@@ -0,0 +1,2 @@
+Import-Package: org.argeo.slc.jcr,\
+*
\ No newline at end of file
diff --git a/modules/org.argeo.slc.node.jackrabbit/build.properties b/org.argeo.slc.node.jackrabbit/build.properties
similarity index 100%
rename from modules/org.argeo.slc.node.jackrabbit/build.properties
rename to org.argeo.slc.node.jackrabbit/build.properties
diff --git a/modules/org.argeo.slc.node.jackrabbit/pom.xml b/org.argeo.slc.node.jackrabbit/pom.xml
similarity index 55%
rename from modules/org.argeo.slc.node.jackrabbit/pom.xml
rename to org.argeo.slc.node.jackrabbit/pom.xml
index 3a65010b7..937dc32eb 100644
--- a/modules/org.argeo.slc.node.jackrabbit/pom.xml
+++ b/org.argeo.slc.node.jackrabbit/pom.xml
@@ -2,26 +2,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
-		<artifactId>modules</artifactId>
+		<artifactId>argeo-slc</artifactId>
 		<version>2.1.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.slc.node.jackrabbit</artifactId>
 	<name>SLC Node Jackrabbit</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<configuration>
-					<instructions>
-						<Import-Package>
-							*,
-							org.argeo.slc.jcr
-						</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>
\ No newline at end of file
diff --git a/modules/org.argeo.slc.server.repo/.project b/org.argeo.slc.server.repo/.project
similarity index 100%
rename from modules/org.argeo.slc.server.repo/.project
rename to org.argeo.slc.server.repo/.project
diff --git a/modules/org.argeo.slc.server.repo/.settings/org.eclipse.pde.core.prefs b/org.argeo.slc.server.repo/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from modules/org.argeo.slc.server.repo/.settings/org.eclipse.pde.core.prefs
rename to org.argeo.slc.server.repo/.settings/org.eclipse.pde.core.prefs
diff --git a/modules/org.argeo.slc.server.repo/META-INF/spring/jcr.xml b/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
similarity index 100%
rename from modules/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
rename to org.argeo.slc.server.repo/META-INF/spring/jcr.xml
diff --git a/modules/org.argeo.slc.server.repo/META-INF/spring/maven.xml b/org.argeo.slc.server.repo/META-INF/spring/maven.xml
similarity index 100%
rename from modules/org.argeo.slc.server.repo/META-INF/spring/maven.xml
rename to org.argeo.slc.server.repo/META-INF/spring/maven.xml
diff --git a/modules/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
similarity index 95%
rename from modules/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
rename to org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index ced7e2840..aaaa924f0 100644
--- a/modules/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -10,7 +10,7 @@
 
 	<!-- REFERENCES -->
 	<reference id="authenticationManager"
-		interface="org.springframework.security.AuthenticationManager" />
+		interface="org.springframework.security.authentication.AuthenticationManager" />
 
 	<set id="defaultRpmRepositories" cardinality="0..N"
 		interface="org.argeo.slc.rpmfactory.RpmRepository" />
diff --git a/modules/org.argeo.slc.server.repo/META-INF/spring/services.xml b/org.argeo.slc.server.repo/META-INF/spring/services.xml
similarity index 100%
rename from modules/org.argeo.slc.server.repo/META-INF/spring/services.xml
rename to org.argeo.slc.server.repo/META-INF/spring/services.xml
diff --git a/org.argeo.slc.server.repo/bnd.bnd b/org.argeo.slc.server.repo/bnd.bnd
new file mode 100644
index 000000000..5ee499b61
--- /dev/null
+++ b/org.argeo.slc.server.repo/bnd.bnd
@@ -0,0 +1,6 @@
+Import-Package: org.argeo.jcr,\
+org.argeo.slc.jcr,\
+org.argeo.slc.repo,\
+org.h2;resolution:=optional,\
+org.postgresql;resolution:=optional,\
+*
diff --git a/modules/org.argeo.slc.server.repo/build.properties b/org.argeo.slc.server.repo/build.properties
similarity index 100%
rename from modules/org.argeo.slc.server.repo/build.properties
rename to org.argeo.slc.server.repo/build.properties
diff --git a/org.argeo.slc.server.repo/pom.xml b/org.argeo.slc.server.repo/pom.xml
new file mode 100644
index 000000000..6b1093e61
--- /dev/null
+++ b/org.argeo.slc.server.repo/pom.xml
@@ -0,0 +1,11 @@
+<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>argeo-slc</artifactId>
+		<version>2.1.1-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.slc.server.repo</artifactId>
+	<name>SLC Repo</name>
+</project>
\ No newline at end of file
diff --git a/modules/org.argeo.slc.server.repo/repo.properties b/org.argeo.slc.server.repo/repo.properties
similarity index 100%
rename from modules/org.argeo.slc.server.repo/repo.properties
rename to org.argeo.slc.server.repo/repo.properties
diff --git a/modules/org.argeo.slc.server.repo/repository-h2-v1.1.11.xml b/org.argeo.slc.server.repo/repository-h2-v1.1.11.xml
similarity index 100%
rename from modules/org.argeo.slc.server.repo/repository-h2-v1.1.11.xml
rename to org.argeo.slc.server.repo/repository-h2-v1.1.11.xml
diff --git a/modules/org.argeo.slc.server.repo/repository-h2.xml b/org.argeo.slc.server.repo/repository-h2.xml
similarity index 100%
rename from modules/org.argeo.slc.server.repo/repository-h2.xml
rename to org.argeo.slc.server.repo/repository-h2.xml
diff --git a/modules/org.argeo.slc.server.repo/repository-pg-dist.xml b/org.argeo.slc.server.repo/repository-pg-dist.xml
similarity index 100%
rename from modules/org.argeo.slc.server.repo/repository-pg-dist.xml
rename to org.argeo.slc.server.repo/repository-pg-dist.xml
diff --git a/modules/org.argeo.slc.server.repo/repository-pg-docs.xml b/org.argeo.slc.server.repo/repository-pg-docs.xml
similarity index 100%
rename from modules/org.argeo.slc.server.repo/repository-pg-docs.xml
rename to org.argeo.slc.server.repo/repository-pg-docs.xml
diff --git a/modules/org.argeo.slc.server.repo/repository-pg-java.xml b/org.argeo.slc.server.repo/repository-pg-java.xml
similarity index 100%
rename from modules/org.argeo.slc.server.repo/repository-pg-java.xml
rename to org.argeo.slc.server.repo/repository-pg-java.xml
diff --git a/modules/org.argeo.slc.server.repo/repository-pg-rpm.xml b/org.argeo.slc.server.repo/repository-pg-rpm.xml
similarity index 100%
rename from modules/org.argeo.slc.server.repo/repository-pg-rpm.xml
rename to org.argeo.slc.server.repo/repository-pg-rpm.xml
diff --git a/pom.xml b/pom.xml
index 9a417fe71..a92d9f18e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.17-SNAPSHOT</version>
+		<version>2.1.18-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
 	<artifactId>argeo-slc</artifactId>
@@ -19,12 +19,19 @@
 		<version.argeo-tp-extras>2.1.5</version.argeo-tp-extras>
 	</properties>
 	<modules>
+		<!-- Runtime -->
 		<module>org.argeo.slc.api</module>
 		<module>org.argeo.slc.core</module>
 		<module>org.argeo.slc.unit</module>
 		<module>org.argeo.slc.support</module>
 		<module>org.argeo.slc.repo</module>
 		<module>org.argeo.slc.factory</module>
+		
+		<!-- Modules -->
+		<module>org.argeo.slc.agent</module>
+		<module>org.argeo.slc.node.jackrabbit</module>
+		<module>org.argeo.slc.agent.jcr</module>
+		<module>org.argeo.slc.server.repo</module>
 
 		<!-- <module>runtime</module> -->
 		<!-- <module>modules</module> -->
-- 
2.39.2