Extends jdbm to support Apache Directory Server

git-svn-id: https://svn.argeo.org/commons/trunk@4989 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/server/modules/org.argeo.ext.jackrabbit.sybase/.project b/server/modules/org.argeo.ext.jackrabbit.sybase/.project
index e9939b5e9d93392df9a1450a14635c8e17423964..6511be8e5461eba5a69ce0a43c8ec781f820f6fd 100644 (file)
--- 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 (file)
index 0000000..b1d7029
--- /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 (file)
index 0000000..5f22cdd
--- /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 (file)
index 0000000..070887d
--- /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 a037553ca1b1dc189cf1e832f46fa2187546d848..d8b5a33dc9a375e56b784e7fdc1a44e09b470bbe 100644 (file)
--- 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 99eb2e4c83d0038591c3e270e28e302c28d3e04e..007ea4e3edc35200bd8658b3efd4966cec42360f 100644 (file)
--- 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" -->\r
        <!-- unbind-method="unregister" /> -->\r
        <!-- </set> -->\r
-       <reference id="repositoryRegister" interface="org.argeo.jcr.RepositoryRegister" />\r
+       <list id="repositories" interface="javax.jcr.Repository"\r
+               cardinality="0..N">\r
+               <listener ref="repositoryRegister" bind-method="register"\r
+                       unbind-method="unregister" />\r
+       </list>\r
 \r
        <reference id="authenticationManager"\r
                interface="org.springframework.security.AuthenticationManager" />\r

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 6762fd33fcf39b1e5326484feb3b1a3c5ae579d1..6fdf476cc41a5ba8ff82739ee1e0b2dcdcc335b1 100644 (file)
--- 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 41da085b370b44e13407683b11b7fca2fc9672f4..5144698e4b8d728b94f18eaa26fc9b5ff8b7bd40 100644 (file)
--- 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>