From f4c0777ffb92d540c4e19f370381ddaefa2179c3 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 19 Jan 2012 21:48:59 +0000
Subject: [PATCH] Extends jdbm to support Apache Directory Server

git-svn-id: https://svn.argeo.org/commons/trunk@4989 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.ext.jackrabbit.sybase/.project  |  2 +-
 server/modules/org.argeo.ext.jdbm/.project    | 22 +++++++++++++
 .../org.argeo.ext.jdbm/build.properties       |  1 +
 server/modules/org.argeo.ext.jdbm/pom.xml     | 33 +++++++++++++++++++
 .../WEB-INF/applicationContext.xml            |  2 ++
 .../WEB-INF/osgi.xml                          |  6 +++-
 .../META-INF/spring/ads.xml                   |  2 +-
 server/modules/pom.xml                        |  1 +
 8 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 server/modules/org.argeo.ext.jdbm/.project
 create mode 100644 server/modules/org.argeo.ext.jdbm/build.properties
 create mode 100644 server/modules/org.argeo.ext.jdbm/pom.xml

diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/.project b/server/modules/org.argeo.ext.jackrabbit.sybase/.project
index e9939b5e9..6511be8e5 100644
--- a/server/modules/org.argeo.ext.jackrabbit.sybase/.project
+++ b/server/modules/org.argeo.ext.jackrabbit.sybase/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.server.ext.jackrabbit</name>
+	<name>org.argeo.ext.jackrabbit.sybase</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/server/modules/org.argeo.ext.jdbm/.project b/server/modules/org.argeo.ext.jdbm/.project
new file mode 100644
index 000000000..b1d7029b9
--- /dev/null
+++ b/server/modules/org.argeo.ext.jdbm/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.argeo.ext.jdbm</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<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>
+	</natures>
+</projectDescription>
diff --git a/server/modules/org.argeo.ext.jdbm/build.properties b/server/modules/org.argeo.ext.jdbm/build.properties
new file mode 100644
index 000000000..5f22cdd44
--- /dev/null
+++ b/server/modules/org.argeo.ext.jdbm/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/
diff --git a/server/modules/org.argeo.ext.jdbm/pom.xml b/server/modules/org.argeo.ext.jdbm/pom.xml
new file mode 100644
index 000000000..070887d40
--- /dev/null
+++ b/server/modules/org.argeo.ext.jdbm/pom.xml
@@ -0,0 +1,33 @@
+<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.server</groupId>
+		<version>0.3.4-SNAPSHOT</version>
+		<artifactId>modules</artifactId>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>org.argeo.ext.jdbm</artifactId>
+	<name>Commons Server JDBM Extension</name>
+	<description>Add Apache Directory Server support to JDBM</description>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<Fragment-Host>com.springsource.jdbm</Fragment-Host>
+						<Import-Package>
+							org.apache.directory.server.core.partition.impl.btree.jdbm;resolution:=optional,
+							org.apache.directory.server.core.schema;resolution:=optional,
+							org.apache.directory.server.core.partition.impl;resolution:=optional,
+							org.apache.directory.server.core.partition.impl.btree;resolution:=optional,
+							org.apache.directory.shared.ldap.message;resolution:=optional,
+						</Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
index a037553ca..d8b5a33dc 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/applicationContext.xml
@@ -26,4 +26,6 @@
 	<!-- <property name="session" ref="jcrSession" /> -->
 	<!-- </bean> -->
 
+	<bean id="repositoryRegister" class="org.argeo.jcr.DefaultRepositoryRegister" />
+
 </beans>
\ No newline at end of file
diff --git a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml
index 99eb2e4c8..007ea4e3e 100644
--- a/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml
+++ b/server/modules/org.argeo.jackrabbit.webapp/WEB-INF/osgi.xml
@@ -13,7 +13,11 @@
 	<!-- <listener ref="repositoryRegister" bind-method="register" -->
 	<!-- unbind-method="unregister" /> -->
 	<!-- </set> -->
-	<reference id="repositoryRegister" interface="org.argeo.jcr.RepositoryRegister" />
+	<list id="repositories" interface="javax.jcr.Repository"
+		cardinality="0..N">
+		<listener ref="repositoryRegister" bind-method="register"
+			unbind-method="unregister" />
+	</list>
 
 	<reference id="authenticationManager"
 		interface="org.springframework.security.AuthenticationManager" />
diff --git a/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml b/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml
index 6762fd33f..6fdf476cc 100644
--- a/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml
+++ b/server/modules/org.argeo.server.ads.server/META-INF/spring/ads.xml
@@ -12,7 +12,7 @@
 
 	<bean class="org.argeo.server.ads.AdsContainer">
 		<property name="workingDirectory" value="${osgi.instance.area}/apacheds" />
-		<property name="deleteWorkingDirOnExit" value="true" />
+<!-- 		<property name="deleteWorkingDirOnExit" value="true" /> -->
 		<property name="configuration" ref="configuration" />
 		<property name="environment" ref="environment" />
 		<property name="ldifs">
diff --git a/server/modules/pom.xml b/server/modules/pom.xml
index 41da085b3..5144698e4 100644
--- a/server/modules/pom.xml
+++ b/server/modules/pom.xml
@@ -13,6 +13,7 @@
 	<name>Commons Server Modules</name>
 	<modules>
 		<module>org.argeo.ext.jackrabbit.sybase</module>
+		<module>org.argeo.ext.jdbm</module>
 		<module>org.argeo.jackrabbit.webapp</module>
 		<module>org.argeo.node.repo.jackrabbit</module>
 		<module>org.argeo.node.repofactory.jackrabbit</module>
-- 
2.30.2