From e5bd7ffb2faa202baf07cc3b947d647a7153ca67 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 24 Mar 2011 00:19:58 +0000
Subject: [PATCH] Fix SAX import in JCR session

git-svn-id: https://svn.argeo.org/commons/trunk@4356 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 pom.xml                                                   | 2 +-
 security/features/org.argeo.security.dep.node.rap/pom.xml | 5 +++++
 security/features/org.argeo.security.dep.node.rcp/pom.xml | 5 +++++
 security/runtime/org.argeo.security.core/pom.xml          | 1 +
 server/runtime/org.argeo.server.jcr/pom.xml               | 5 ++++-
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6cd3dd046..d0c75d76b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 		<version.argeo-distribution>1.1.3</version.argeo-distribution>
 		<version.argeo-commons>0.2.3-SNAPSHOT</version.argeo-commons>
 		<version.argeo-ria>0.12.5</version.argeo-ria>
-		<version.equinox>3.6.1</version.equinox>
+		<version.equinox>3.6.2</version.equinox>
 		<version.maven-argeo-osgi>0.1.31</version.maven-argeo-osgi>
 		<version.maven-bundle-plugin>2.2.0</version.maven-bundle-plugin>
 		<version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>
diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index 32201f7dc..6df87986e 100644
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -43,6 +43,11 @@
 			<artifactId>org.argeo.jcr.ui.explorer</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.ui.admin</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 
 		<!-- Basis -->
 		<dependency>
diff --git a/security/features/org.argeo.security.dep.node.rcp/pom.xml b/security/features/org.argeo.security.dep.node.rcp/pom.xml
index e93a6c450..74e30e554 100644
--- a/security/features/org.argeo.security.dep.node.rcp/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rcp/pom.xml
@@ -45,6 +45,11 @@
 			<artifactId>org.argeo.jcr.ui.explorer</artifactId>
 			<version>${version.argeo-commons}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.security</groupId>
+			<artifactId>org.argeo.security.ui.admin</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 
 		<!-- Basis -->
 		<dependency>
diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index d9e943cc2..91e884e8c 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -38,6 +38,7 @@
 							org.springframework.context,
 							org.springframework.beans.factory,
 							org.argeo.jcr,
+							org.xml.sax;version="0.0.0",
 							*
 						</Import-Package>
 					</instructions>
diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index 0177d1d55..7248b6ed9 100644
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/pom.xml
@@ -30,7 +30,10 @@
 				<configuration>
 					<instructions>
 						<Export-Package>org.argeo.jcr.*</Export-Package>
-						<Import-Package>junit.framework;resolution:=optional,*</Import-Package>
+						<Import-Package>
+							junit.framework;resolution:=optional,
+							org.xml.sax;version="0.0.0",
+							*</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
-- 
2.30.2