From 59fd3768e7925334805dca3825f6f87f082d9810 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 25 Nov 2014 12:02:44 +0000
Subject: [PATCH] Remove support JUnit Merge eclipse.ui.jcr in eclipse.ui Add
 eclipse.dep.rwt Transform some deps into POM dependencies

git-svn-id: https://svn.argeo.org/commons/trunk@7513 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../p2.inf                                    |   0
 dep/org.argeo.dep.cms/pom.xml                 |  41 +-----
 dep/org.argeo.eclipse.dep.rap/pom.xml         |  27 ++--
 dep/org.argeo.eclipse.dep.rcp/p2.inf          |   2 -
 dep/org.argeo.eclipse.dep.rcp/pom.xml         |  11 +-
 dep/org.argeo.eclipse.dep.rwt/pom.xml         |  45 ++++++
 .../p2.inf                                    |   2 -
 .../pom.xml                                   | 137 ------------------
 dep/org.argeo.security.dep.node.rcp/pom.xml   |  39 ++++-
 dep/org.argeo.security.dep.node/pom.xml       |  18 +--
 dep/pom.xml                                   |  30 +---
 org.argeo.eclipse.ui.rap/pom.xml              |  14 +-
 .../ui/specific/DownloadServiceHandler.java   |   1 +
 .../eclipse/ui/specific/FileHandler.java      |   1 +
 org.argeo.eclipse.ui.rcp/pom.xml              |   5 +-
 org.argeo.eclipse.ui/pom.xml                  |  12 +-
 .../org/argeo/eclipse/ui}/FileProvider.java   |   2 +-
 .../ui/jcr/AbstractNodeContentProvider.java   |   0
 .../eclipse/ui/jcr/AsyncUiEventListener.java  |   0
 .../ui/jcr/DefaultNodeLabelProvider.java      |   0
 .../org/argeo/eclipse/ui/jcr/JcrImages.java   |   0
 .../eclipse/ui/jcr/JcrPreferenceStore.java    |   0
 .../org/argeo/eclipse/ui/jcr/JcrUiPlugin.java |   0
 .../org/argeo/eclipse/ui/jcr/JcrUiUtils.java  |   0
 .../eclipse/ui/jcr/NodeElementComparer.java   |   0
 .../argeo/eclipse/ui/jcr/NodesWrapper.java    |   0
 .../ui/jcr/SimpleNodeContentProvider.java     |   0
 .../org/argeo/eclipse/ui/jcr/WrappedNode.java |   0
 .../ui/jcr/commands/AddFileFolder.java        |   0
 .../eclipse/ui/jcr/commands/DeleteNodes.java  |   0
 .../commands/OpenGenericJcrQueryEditor.java   |   0
 .../eclipse/ui/jcr/commands/Refresh.java      |   0
 .../jcr/editors/AbstractJcrQueryEditor.java   |   0
 .../ui/jcr/editors/JcrQueryEditorInput.java   |   0
 .../ui/jcr/editors/NodeEditorInput.java       |   0
 .../ui/jcr/lists/ColumnDefinition.java        |   0
 .../eclipse/ui/jcr/lists/IListProvider.java   |   0
 .../ui/jcr/lists/NodeViewerComparator.java    |   0
 .../ui/jcr/lists/RowViewerComparator.java     |   0
 .../jcr/lists/SimpleJcrNodeLabelProvider.java |   0
 .../jcr/lists/SimpleJcrRowLabelProvider.java  |   0
 .../eclipse/ui/jcr/utils/JcrFileProvider.java |   2 +-
 .../ui/jcr/utils/JcrItemsComparator.java      |   0
 .../ui/jcr/utils/NodeViewerComparer.java      |   0
 .../jcr/utils/SingleSessionFileProvider.java  |   2 +-
 .../ui/jcr/views/AbstractJcrBrowser.java      |   0
 org.argeo.jcr.ui.explorer/pom.xml             |   9 +-
 org.argeo.osgi.ui.explorer/pom.xml            |   5 +-
 org.argeo.security.equinox/pom.xml            |   5 +-
 org.argeo.security.ui.admin/pom.xml           |  35 ++---
 org.argeo.security.ui.rap/pom.xml             |   1 +
 org.argeo.security.ui.rcp/pom.xml             |   1 +
 org.argeo.security.ui/pom.xml                 |   5 +-
 org.argeo.server.jackrabbit/pom.xml           |   6 -
 org.argeo.server.jcr/pom.xml                  |   6 -
 org.argeo.support.junit/.classpath            |   7 -
 org.argeo.support.junit/.project              |  28 ----
 .../.settings/org.eclipse.jdt.core.prefs      |   5 -
 .../.settings/org.maven.ide.eclipse.prefs     |   9 --
 org.argeo.support.junit/pom.xml               |  64 --------
 .../support/junit/AbstractSpringTestCase.java | 108 --------------
 pom.xml                                       |  22 ++-
 62 files changed, 194 insertions(+), 513 deletions(-)
 rename dep/{org.argeo.eclipse.dep.rap => org.argeo.dep.cms}/p2.inf (100%)
 delete mode 100644 dep/org.argeo.eclipse.dep.rcp/p2.inf
 create mode 100644 dep/org.argeo.eclipse.dep.rwt/pom.xml
 delete mode 100644 dep/org.argeo.security.dep.node.eclipse/p2.inf
 delete mode 100644 dep/org.argeo.security.dep.node.eclipse/pom.xml
 rename {org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific => org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui}/FileProvider.java (96%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/JcrImages.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiPlugin.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiUtils.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/NodesWrapper.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/WrappedNode.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNodes.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/commands/OpenGenericJcrQueryEditor.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/commands/Refresh.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/lists/ColumnDefinition.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/lists/IListProvider.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java (99%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java (100%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java (98%)
 rename {org.argeo.eclipse.ui.jcr => org.argeo.eclipse.ui}/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java (100%)
 delete mode 100644 org.argeo.support.junit/.classpath
 delete mode 100644 org.argeo.support.junit/.project
 delete mode 100644 org.argeo.support.junit/.settings/org.eclipse.jdt.core.prefs
 delete mode 100644 org.argeo.support.junit/.settings/org.maven.ide.eclipse.prefs
 delete mode 100644 org.argeo.support.junit/pom.xml
 delete mode 100644 org.argeo.support.junit/src/main/java/org/argeo/support/junit/AbstractSpringTestCase.java

diff --git a/dep/org.argeo.eclipse.dep.rap/p2.inf b/dep/org.argeo.dep.cms/p2.inf
similarity index 100%
rename from dep/org.argeo.eclipse.dep.rap/p2.inf
rename to dep/org.argeo.dep.cms/p2.inf
diff --git a/dep/org.argeo.dep.cms/pom.xml b/dep/org.argeo.dep.cms/pom.xml
index 7f09115aa..564b00b53 100644
--- a/dep/org.argeo.dep.cms/pom.xml
+++ b/dep/org.argeo.dep.cms/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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.commons</groupId>
@@ -60,49 +61,15 @@
 					<groupId>org.argeo.tp</groupId>
 					<artifactId>org.eclipse.osgi</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp</groupId>
-					<artifactId>org.apache.jasper</artifactId>
-				</exclusion>
 			</exclusions>
 		</dependency>
 
 		<!-- Minimal web target platform -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<artifactId>org.argeo.eclipse.dep.rwt</artifactId>
 			<version>2.1.12-SNAPSHOT</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.junit</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.rap.junit</artifactId>
-				</exclusion>
-				<!-- Workbench -->
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.rap.ui.workbench</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.rap.ui</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.rap.ui.cheatsheets</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.rap.ui.forms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.argeo.tp.rap.platform</groupId>
-					<artifactId>org.eclipse.rap.ui.views</artifactId>
-				</exclusion>
-			</exclusions>
+			<type>pom</type>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/dep/org.argeo.eclipse.dep.rap/pom.xml b/dep/org.argeo.eclipse.dep.rap/pom.xml
index 99cd076f2..85e46d4e6 100644
--- a/dep/org.argeo.eclipse.dep.rap/pom.xml
+++ b/dep/org.argeo.eclipse.dep.rap/pom.xml
@@ -9,15 +9,8 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.eclipse.dep.rap</artifactId>
-	<name>Commons Eclipse RAP Dependencies</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+	<name>Eclipse RAP Dependencies</name>
+	<packaging>pom</packaging>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.tp.rap.addons</groupId>
@@ -68,6 +61,14 @@
 				</exclusion>
 
 				<!-- Troublesome bundles -->
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.junit</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.rap.junit</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>org.argeo.tp.rap.platform</groupId>
 					<artifactId>org.eclipse.jdt.junit.runtime</artifactId>
@@ -94,10 +95,10 @@
 		</dependency>
 
 		<!-- RAP Specific Dependencies -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>javax.servlet</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp</groupId> -->
+		<!-- <artifactId>javax.servlet</artifactId> -->
+		<!-- </dependency> -->
 
 		<!-- Security -->
 		<dependency>
diff --git a/dep/org.argeo.eclipse.dep.rcp/p2.inf b/dep/org.argeo.eclipse.dep.rcp/p2.inf
deleted file mode 100644
index 0423aa509..000000000
--- a/dep/org.argeo.eclipse.dep.rcp/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.eclipse.dep.rcp/pom.xml b/dep/org.argeo.eclipse.dep.rcp/pom.xml
index 5035a4f42..8437099e1 100644
--- a/dep/org.argeo.eclipse.dep.rcp/pom.xml
+++ b/dep/org.argeo.eclipse.dep.rcp/pom.xml
@@ -8,7 +8,8 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
-	<name>Commons Eclipse RCP Dependencies</name>
+	<name>Eclipse RCP Dependencies</name>
+	<packaging>pom</packaging>
 	<description><![CDATA[
 com.ibm.icu
 org.eclipse.core.commands
@@ -52,14 +53,6 @@ ex=org.eclipse.equinox.simpleconfigurator*.jar;\
 ex=*.source_*.jar,\
 
 	]]></description>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
diff --git a/dep/org.argeo.eclipse.dep.rwt/pom.xml b/dep/org.argeo.eclipse.dep.rwt/pom.xml
new file mode 100644
index 000000000..cc34c0e79
--- /dev/null
+++ b/dep/org.argeo.eclipse.dep.rwt/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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.commons</groupId>
+		<version>2.1.12-SNAPSHOT</version>
+		<artifactId>dep</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.eclipse.dep.rwt</artifactId>
+	<name>Eclipse RWT Dependencies</name>
+	<packaging>pom</packaging>
+	<dependencies>
+		<!-- Minimal web target platform -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<type>pom</type>
+			<version>2.1.12-SNAPSHOT</version>
+			<exclusions>
+				<!-- Workbench -->
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.rap.ui.workbench</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.rap.ui</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.rap.ui.cheatsheets</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.rap.ui.forms</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.argeo.tp.rap.platform</groupId>
+					<artifactId>org.eclipse.rap.ui.views</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/dep/org.argeo.security.dep.node.eclipse/p2.inf b/dep/org.argeo.security.dep.node.eclipse/p2.inf
deleted file mode 100644
index 0423aa509..000000000
--- a/dep/org.argeo.security.dep.node.eclipse/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file
diff --git a/dep/org.argeo.security.dep.node.eclipse/pom.xml b/dep/org.argeo.security.dep.node.eclipse/pom.xml
deleted file mode 100644
index 0ca4b1f93..000000000
--- a/dep/org.argeo.security.dep.node.eclipse/pom.xml
+++ /dev/null
@@ -1,137 +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.commons</groupId>
-		<version>2.1.12-SNAPSHOT</version>
-		<artifactId>dep</artifactId>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.argeo.security.dep.node.eclipse</artifactId>
-	<name>Node Eclipse Perspectives</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-descriptors</id>
-						<goals>
-							<goal>descriptors</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<!-- Applications -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.jcr.ui.explorer</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.osgi.ui.explorer</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui.admin</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Eclipse -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.jcr</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.equinox</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.ui</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-
-		<!-- Basis -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.dep.node</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-			<type>pom</type>
-		</dependency>
-	</dependencies>
-	<profiles>
-		<profile>
-			<id>rpmbuild</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>copy-direct</id>
-								<phase>package</phase>
-								<goals>
-									<goal>copy-dependencies</goal>
-								</goals>
-								<configuration>
-									<includeTypes>jar</includeTypes>
-									<excludeTransitive>true</excludeTransitive>
-									<outputDirectory>${project.build.directory}/argeo-node-eclipse</outputDirectory>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>rpm-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>rpm-node-eclipse</id>
-								<phase>package</phase>
-								<goals>
-									<goal>rpm</goal>
-								</goals>
-								<configuration>
-									<name>argeo-node-eclipse</name>
-									<classifier>rpm-eclipse</classifier>
-									<mappings>
-										<mapping>
-											<directory>/usr/share/osgi/eclipse</directory>
-											<username>root</username>
-											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>false</directoryIncluded>
-											<sources>
-												<source>
-													<location>${project.build.directory}/argeo-node-eclipse</location>
-												</source>
-											</sources>
-										</mapping>
-									</mappings>
-									<requires>
-										<require>argeo-node</require>
-									</requires>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/dep/org.argeo.security.dep.node.rcp/pom.xml b/dep/org.argeo.security.dep.node.rcp/pom.xml
index 53a712510..cb6685715 100644
--- a/dep/org.argeo.security.dep.node.rcp/pom.xml
+++ b/dep/org.argeo.security.dep.node.rcp/pom.xml
@@ -35,12 +35,49 @@
 		</plugins>
 	</build>
 	<dependencies>
+		<!-- Applications -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.security.dep.node.eclipse</artifactId>
+			<artifactId>org.argeo.jcr.ui.explorer</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.osgi.ui.explorer</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.security.ui.admin</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Eclipse -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.ui</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.security.equinox</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.security.ui</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
+		</dependency>
+
+		<!-- Basis -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.security.dep.node</artifactId>
 			<version>2.1.12-SNAPSHOT</version>
 			<type>pom</type>
 		</dependency>
+
+		<!-- RCP specific -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.security.ui.rcp</artifactId>
diff --git a/dep/org.argeo.security.dep.node/pom.xml b/dep/org.argeo.security.dep.node/pom.xml
index 797558a05..369c822c2 100644
--- a/dep/org.argeo.security.dep.node/pom.xml
+++ b/dep/org.argeo.security.dep.node/pom.xml
@@ -228,10 +228,10 @@
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.h2</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>com.mysql.jdbc</artifactId>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.tp</groupId> -->
+		<!-- <artifactId>com.mysql.jdbc</artifactId> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.postgresql.jdbc3</artifactId>
@@ -256,11 +256,11 @@
 		</dependency>
 
 		<!-- Software development -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.support.junit</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.commons</groupId> -->
+		<!-- <artifactId>org.argeo.support.junit</artifactId> -->
+		<!-- <version>2.1.12-SNAPSHOT</version> -->
+		<!-- </dependency> -->
 	</dependencies>
 	<profiles>
 		<profile>
diff --git a/dep/pom.xml b/dep/pom.xml
index 2c0fccf77..f247acdd2 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons</groupId>
@@ -14,40 +15,15 @@
 		<module>org.argeo.dep.log4j</module>
 		<module>org.argeo.dep.jackrabbit</module>
 		<module>org.argeo.eclipse.dep.rap</module>
+		<module>org.argeo.eclipse.dep.rwt</module>
 		<module>org.argeo.eclipse.dep.rcp</module>
 		<module>org.argeo.server.dep.ads</module>
 		<module>org.argeo.server.dep.jackrabbit.server</module>
 		<module>org.argeo.security.dep.node</module>
-		<module>org.argeo.security.dep.node.eclipse</module>
 		<module>org.argeo.security.dep.node.rap</module>
 		<module>org.argeo.security.dep.node.rcp</module>
 		<module>org.argeo.dep.cms</module>
 	</modules>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.argeo.maven.plugins</groupId>
-					<artifactId>maven-argeo-osgi-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>generate-descriptors</id>
-							<goals>
-								<goal>descriptors</goal>
-							</goals>
-							<phase>generate-resources</phase>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
 	<profiles>
 		<profile>
 			<id>check-osgi</id>
diff --git a/org.argeo.eclipse.ui.rap/pom.xml b/org.argeo.eclipse.ui.rap/pom.xml
index 3f47275f0..0a8cb97a4 100644
--- a/org.argeo.eclipse.ui.rap/pom.xml
+++ b/org.argeo.eclipse.ui.rap/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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.commons</groupId>
@@ -56,16 +58,22 @@
 	<!-- deleted from import package : javax.servlet, javax.servlet.http,org.argeo.eclipse.ui.dialogs, 
 		org.eclipse.jface.dialogs, -->
 	<dependencies>
-			<dependency>
+		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.util</artifactId>
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
-	
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.ui</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
+		</dependency>
+
 		<!-- Argeo common distribution for RAP projects -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<type>pom</type>
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java
index b28229695..4173b966b 100644
--- a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java
+++ b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/DownloadServiceHandler.java
@@ -22,6 +22,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.ArgeoException;
+import org.argeo.eclipse.ui.FileProvider;
 import org.eclipse.rap.rwt.service.ServiceHandler;
 
 @Deprecated
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
index 927747e62..6a28c0ae4 100644
--- a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
+++ b/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
@@ -18,6 +18,7 @@ package org.argeo.eclipse.ui.specific;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
+import org.argeo.eclipse.ui.FileProvider;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.client.service.UrlLauncher;
 import org.eclipse.rap.rwt.service.ServiceHandler;
diff --git a/org.argeo.eclipse.ui.rcp/pom.xml b/org.argeo.eclipse.ui.rcp/pom.xml
index c86cb6a19..8282250c6 100644
--- a/org.argeo.eclipse.ui.rcp/pom.xml
+++ b/org.argeo.eclipse.ui.rcp/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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.commons</groupId>
@@ -59,6 +61,7 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<type>pom</type>
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 
diff --git a/org.argeo.eclipse.ui/pom.xml b/org.argeo.eclipse.ui/pom.xml
index 899e271a8..29e94fc0b 100644
--- a/org.argeo.eclipse.ui/pom.xml
+++ b/org.argeo.eclipse.ui/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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.commons</groupId>
@@ -49,14 +51,16 @@
 	<dependencies>
 		<!-- JCR -->
 		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>javax.jcr</artifactId>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.server.jcr</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 
 		<!-- RCP only dependency, needed at compile time -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<type>pom</type>
 			<version>2.1.12-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/FileProvider.java
similarity index 96%
rename from org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/FileProvider.java
index ae959fb6d..91ca71969 100644
--- a/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java
+++ b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/FileProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.specific;
+package org.argeo.eclipse.ui;
 
 import java.io.InputStream;
 
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/AbstractNodeContentProvider.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrImages.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/JcrImages.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrImages.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/JcrImages.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/JcrPreferenceStore.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiPlugin.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiPlugin.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiPlugin.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiPlugin.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiUtils.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiUtils.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiUtils.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/JcrUiUtils.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodesWrapper.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/NodesWrapper.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodesWrapper.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/NodesWrapper.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/SimpleNodeContentProvider.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/WrappedNode.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/WrappedNode.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/WrappedNode.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/WrappedNode.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNodes.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNodes.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNodes.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNodes.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/OpenGenericJcrQueryEditor.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/commands/OpenGenericJcrQueryEditor.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/OpenGenericJcrQueryEditor.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/commands/OpenGenericJcrQueryEditor.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/Refresh.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/commands/Refresh.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/Refresh.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/commands/Refresh.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/editors/JcrQueryEditorInput.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/editors/NodeEditorInput.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/ColumnDefinition.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/ColumnDefinition.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/ColumnDefinition.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/ColumnDefinition.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/IListProvider.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/IListProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/IListProvider.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/IListProvider.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/NodeViewerComparator.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/RowViewerComparator.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrNodeLabelProvider.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/lists/SimpleJcrRowLabelProvider.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java
similarity index 99%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java
index 47cab6d6a..b2e6455c8 100644
--- a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java
+++ b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java
@@ -24,7 +24,7 @@ import javax.jcr.nodetype.NodeType;
 
 import org.apache.commons.io.IOUtils;
 import org.argeo.ArgeoException;
-import org.argeo.eclipse.ui.specific.FileProvider;
+import org.argeo.eclipse.ui.FileProvider;
 
 /**
  * Implements a FileProvider for UI purposes. Note that it might not be very
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrItemsComparator.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/utils/NodeViewerComparer.java
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java
similarity index 98%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java
index f0c378024..40631cdde 100644
--- a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java
+++ b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/utils/SingleSessionFileProvider.java
@@ -25,7 +25,7 @@ import javax.jcr.nodetype.NodeType;
 
 import org.apache.commons.io.IOUtils;
 import org.argeo.ArgeoException;
-import org.argeo.eclipse.ui.specific.FileProvider;
+import org.argeo.eclipse.ui.FileProvider;
 
 /**
  * Implements a FileProvider for UI purposes. Unlike the
diff --git a/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java b/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java
similarity index 100%
rename from org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java
rename to org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java
diff --git a/org.argeo.jcr.ui.explorer/pom.xml b/org.argeo.jcr.ui.explorer/pom.xml
index d84d699a6..3c9866f6c 100644
--- a/org.argeo.jcr.ui.explorer/pom.xml
+++ b/org.argeo.jcr.ui.explorer/pom.xml
@@ -42,20 +42,21 @@
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.jcr</artifactId>
+			<artifactId>org.argeo.eclipse.ui</artifactId>
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 
-		<!-- RCP only dependency, needed at compile time -->
+		<!-- RAP only dependency, needed at compile time -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<type>pom</type>
 			<version>2.1.12-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
+			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
 			<version>2.1.12-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/org.argeo.osgi.ui.explorer/pom.xml b/org.argeo.osgi.ui.explorer/pom.xml
index fcdc73c78..a7c6add94 100644
--- a/org.argeo.osgi.ui.explorer/pom.xml
+++ b/org.argeo.osgi.ui.explorer/pom.xml
@@ -40,10 +40,11 @@
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 
-		<!-- RCP only dependency, needed at compile time -->
+		<!-- RAP only dependency, needed at compile time -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<type>pom</type>
 			<version>2.1.12-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/org.argeo.security.equinox/pom.xml b/org.argeo.security.equinox/pom.xml
index 834e1c4ef..184035a25 100644
--- a/org.argeo.security.equinox/pom.xml
+++ b/org.argeo.security.equinox/pom.xml
@@ -48,10 +48,11 @@
 			<artifactId>org.eclipse.osgi</artifactId>
 		</dependency>
 
-		<!-- RCP only dependency, needed at compile time -->
+		<!-- RAP only dependency, needed at compile time -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<type>pom</type>
 			<version>2.1.12-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/org.argeo.security.ui.admin/pom.xml b/org.argeo.security.ui.admin/pom.xml
index 9aeb51efd..48ce91017 100644
--- a/org.argeo.security.ui.admin/pom.xml
+++ b/org.argeo.security.ui.admin/pom.xml
@@ -64,32 +64,12 @@
 		</dependency>
 
 		<!-- Argeo Eclipse -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.jcr</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.ui</artifactId>
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 
-		<!-- RCP only dependency, needed at compile time -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.ui.rcp</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-
 		<!-- Commons -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
@@ -109,5 +89,20 @@
 			<artifactId>slf4j.org.apache.commons.logging
 			</artifactId>
 		</dependency>
+
+		<!-- RAP only dependency, needed at compile time -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<type>pom</type>
+			<version>2.1.12-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.eclipse.ui.rap</artifactId>
+			<version>2.1.12-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/org.argeo.security.ui.rap/pom.xml b/org.argeo.security.ui.rap/pom.xml
index 6dd6dceb1..517d05f26 100644
--- a/org.argeo.security.ui.rap/pom.xml
+++ b/org.argeo.security.ui.rap/pom.xml
@@ -75,6 +75,7 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<type>pom</type>
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 		<dependency>
diff --git a/org.argeo.security.ui.rcp/pom.xml b/org.argeo.security.ui.rcp/pom.xml
index 22cc11400..06ce71447 100644
--- a/org.argeo.security.ui.rcp/pom.xml
+++ b/org.argeo.security.ui.rcp/pom.xml
@@ -79,6 +79,7 @@
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<type>pom</type>
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
diff --git a/org.argeo.security.ui/pom.xml b/org.argeo.security.ui/pom.xml
index bd909d84b..11feae9d9 100644
--- a/org.argeo.security.ui/pom.xml
+++ b/org.argeo.security.ui/pom.xml
@@ -63,10 +63,11 @@
 			<version>2.1.12-SNAPSHOT</version>
 		</dependency>
 
-		<!-- RCP only dependency, needed at compile time -->
+		<!-- RAP only dependency, needed at compile time -->
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+			<artifactId>org.argeo.eclipse.dep.rap</artifactId>
+			<type>pom</type>
 			<version>2.1.12-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/org.argeo.server.jackrabbit/pom.xml b/org.argeo.server.jackrabbit/pom.xml
index 41f2a4b82..3de65ea2f 100644
--- a/org.argeo.server.jackrabbit/pom.xml
+++ b/org.argeo.server.jackrabbit/pom.xml
@@ -89,12 +89,6 @@
 		</dependency>
 
 		<!-- TEST -->
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.support.junit</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.log4j</artifactId>
diff --git a/org.argeo.server.jcr/pom.xml b/org.argeo.server.jcr/pom.xml
index 4d8c2ea38..84d8d6aae 100644
--- a/org.argeo.server.jcr/pom.xml
+++ b/org.argeo.server.jcr/pom.xml
@@ -113,12 +113,6 @@
 			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.argeo.commons</groupId>
-			<artifactId>org.argeo.support.junit</artifactId>
-			<version>2.1.12-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.log4j</artifactId>
diff --git a/org.argeo.support.junit/.classpath b/org.argeo.support.junit/.classpath
deleted file mode 100644
index 3bf3adef5..000000000
--- a/org.argeo.support.junit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.argeo.support.junit/.project b/org.argeo.support.junit/.project
deleted file mode 100644
index cc37598f2..000000000
--- a/org.argeo.support.junit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.argeo.support.junit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.argeo.support.junit/.settings/org.eclipse.jdt.core.prefs b/org.argeo.support.junit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 383a4ec69..000000000
--- a/org.argeo.support.junit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,5 +0,0 @@
-#Tue Oct 13 10:02:09 CEST 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.argeo.support.junit/.settings/org.maven.ide.eclipse.prefs b/org.argeo.support.junit/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index 721e27ec2..000000000
--- a/org.argeo.support.junit/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Oct 13 10:01:59 CEST 2009
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/org.argeo.support.junit/pom.xml b/org.argeo.support.junit/pom.xml
deleted file mode 100644
index e836ca52c..000000000
--- a/org.argeo.support.junit/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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.commons</groupId>
-		<artifactId>argeo-commons</artifactId>
-		<version>2.1.12-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>org.argeo.support.junit</artifactId>
-	<name>Commons Support JUnit</name>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-
-				<configuration>
-					<instructions>
-						<Export-Package>
-							org.argeo.support.junit.*
-						</Export-Package>
-						<Import-Package>org.springframework.core.io,*</Import-Package>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.springframework.core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.springframework.context</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>org.springframework.beans</artifactId>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.argeo.tp</groupId>
-			<artifactId>slf4j.org.apache.commons.logging</artifactId>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/org.argeo.support.junit/src/main/java/org/argeo/support/junit/AbstractSpringTestCase.java b/org.argeo.support.junit/src/main/java/org/argeo/support/junit/AbstractSpringTestCase.java
deleted file mode 100644
index 11a93e9cd..000000000
--- a/org.argeo.support.junit/src/main/java/org/argeo/support/junit/AbstractSpringTestCase.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.support.junit;
-
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.BeanFactoryUtils;
-import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-
-/** Helper for tests using a Spring application context. */
-public abstract class AbstractSpringTestCase extends TestCase {
-	protected final Log log = LogFactory.getLog(getClass());
-	private ConfigurableApplicationContext context;
-
-	/**
-	 * Gets (and creates if necessary) the application context to use. Default
-	 * implementation uses a class path xml application context and calls
-	 * {@link #getApplicationContextLocation()}.
-	 */
-	protected ConfigurableApplicationContext getContext() {
-		if (context == null) {
-			context = new ClassPathXmlApplicationContext(
-					getApplicationContextLocation());
-			if (getIsStartContext())
-				context.start();
-		}
-		return context;
-	}
-
-	/** Whether the context should be started after being created. */
-	protected Boolean getIsStartContext() {
-		return false;
-	}
-
-	/** Returns a bean from the underlying context */
-	@SuppressWarnings(value = { "unchecked" })
-	protected <T> T getBean(String beanId) {
-		return (T) getContext().getBean(beanId);
-	}
-
-	protected <T> T getBean(Class<? extends T> clss) {
-		T bean = loadSingleFromContext(getContext(), clss);
-		if (bean == null) {
-			throw new RuntimeException("Cannot retrieve a unique bean of type "
-					+ clss);
-		} else {
-			return bean;
-		}
-	}
-
-	/**
-	 * The location of the application to load. The default implementation
-	 * returns <i>applicationContext.xml</i> found in the same package as the
-	 * test.
-	 */
-	protected String getApplicationContextLocation() {
-		return inPackage("applicationContext.xml");
-	}
-
-	/**
-	 * Prefixes the package of the class after converting the '.' to '/' in
-	 * order to have a resource path.
-	 */
-	protected String inPackage(String suffix) {
-		String prefix = getClass().getPackage().getName().replace('.', '/');
-		return prefix + '/' + suffix;
-	}
-
-	@SuppressWarnings(value = { "unchecked" })
-	protected <T> T loadSingleFromContext(ListableBeanFactory context,
-			Class<T> clss) {
-		Map<String, T> beans = BeanFactoryUtils.beansOfTypeIncludingAncestors(
-				context, clss, false, false);
-		if (beans.size() == 1) {
-			return beans.values().iterator().next();
-		} else if (beans.size() > 1) {
-			if (log.isDebugEnabled()) {
-				log
-						.debug(("Found more that one bean for type " + clss
-								+ ": " + beans.keySet()));
-			}
-			return null;
-		} else {
-			return null;
-		}
-	}
-
-}
diff --git a/pom.xml b/pom.xml
index 753e89643..536dd3e10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,6 @@
 		<module>org.argeo.server.jcr</module>
 		<!-- Eclipse -->
 		<module>org.argeo.eclipse.ui</module>
-		<module>org.argeo.eclipse.ui.jcr</module>
 		<module>org.argeo.eclipse.ui.rap</module>
 		<module>org.argeo.eclipse.ui.rcp</module>
 		<!-- Security -->
@@ -61,7 +60,6 @@
 		<module>org.argeo.security.ui.rap</module>
 		<module>org.argeo.security.ui.rcp</module>
 		<!-- Legacy -->
-		<module>org.argeo.support.junit</module>
 		<module>org.argeo.server.core</module>
 		<module>org.argeo.ext.jdbm</module>
 		<!-- Dependencies and Distributions -->
@@ -138,7 +136,18 @@ limitations under the License.
 					<configuration>
 						<source>1.6</source>
 						<target>1.6</target>
+						<compilerId>eclipse</compilerId>
+						<!-- Hack to work around issues with generated annotations : -->
+						<generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
+						<generatedTestSourcesDirectory>target/classes</generatedTestSourcesDirectory>
 					</configuration>
+					<dependencies>
+						<dependency>
+							<groupId>org.codehaus.plexus</groupId>
+							<artifactId>plexus-compiler-eclipse</artifactId>
+							<version>2.3</version>
+						</dependency>
+					</dependencies>
 				</plugin>
 				<plugin>
 					<artifactId>maven-source-plugin</artifactId>
@@ -384,6 +393,15 @@ limitations under the License.
 			</plugin>
 		</plugins>
 	</build>
+	<!-- <dependencies> -->
+	<!-- <dependency> -->
+	<!-- <groupId>org.argeo.tp</groupId> -->
+	<!-- <artifactId>binaries</artifactId> -->
+	<!-- <type>pom</type> -->
+	<!-- <version>${version.argeo-distribution}</version> -->
+	<!-- <scope>compile</scope> -->
+	<!-- </dependency> -->
+	<!-- </dependencies> -->
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-- 
2.30.2