You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/12/13 22:39:33 UTC
svn commit: r486847 - in /directory/branches/trunks/schema2/apacheds: ./
btree-base/ btree-base/src/ btree-base/src/main/ btree-base/src/main/java/
btree-base/src/main/java/org/ btree-base/src/main/java/org/apache/
btree-base/src/main/java/org/apache/d...
Author: akarasulu
Date: Wed Dec 13 13:39:31 2006
New Revision: 486847
URL: http://svn.apache.org/viewvc?view=rev&rev=486847
Log:
changes ...
o creating a few new modules:
- constants: keeps Oid for now but will store constants
- jdbm-store: keeps jdbm store without deps on partition
- btree-base: may change to btree-index but holds btree interfaces
o created new JdbmStore (still working on it)
o added new configuration bean for the store
o have not yet integrated jdbm store into jdbm partition
Added:
directory/branches/trunks/schema2/apacheds/btree-base/ (with props)
directory/branches/trunks/schema2/apacheds/btree-base/pom.xml
directory/branches/trunks/schema2/apacheds/btree-base/src/
directory/branches/trunks/schema2/apacheds/btree-base/src/main/
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/
directory/branches/trunks/schema2/apacheds/constants/ (with props)
directory/branches/trunks/schema2/apacheds/constants/pom.xml
directory/branches/trunks/schema2/apacheds/constants/src/
directory/branches/trunks/schema2/apacheds/constants/src/main/
directory/branches/trunks/schema2/apacheds/constants/src/main/java/
directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/
directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/
directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/
directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/server/
directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/server/core/
directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/server/core/constants/
directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/server/core/partition/
directory/branches/trunks/schema2/apacheds/constants/src/main/java/org/apache/directory/server/core/partition/Oid.java
- copied unchanged from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java
directory/branches/trunks/schema2/apacheds/jdbm-store/ (with props)
directory/branches/trunks/schema2/apacheds/jdbm-store/pom.xml
directory/branches/trunks/schema2/apacheds/jdbm-store/src/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/
directory/branches/trunks/schema2/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
Removed:
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/Oid.java
Modified:
directory/branches/trunks/schema2/apacheds/core/pom.xml
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
directory/branches/trunks/schema2/apacheds/pom.xml
Propchange: directory/branches/trunks/schema2/apacheds/btree-base/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 13:39:31 2006
@@ -0,0 +1,17 @@
+target
+.clover
+.wtpmodules
+.settings
+.deployables
+apache.org
+.metadata
+*.md5
+*.log
+*.iml
+*.ipr
+*.iws
+.project
+.classpath
+
+nbproject
+
Added: directory/branches/trunks/schema2/apacheds/btree-base/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/btree-base/pom.xml?view=auto&rev=486847
==============================================================================
--- directory/branches/trunks/schema2/apacheds/btree-base/pom.xml (added)
+++ directory/branches/trunks/schema2/apacheds/btree-base/pom.xml Wed Dec 13 13:39:31 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>build</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>apacheds-btree-base</artifactId>
+ <name>ApacheDS BTree Base</name>
+ <packaging>jar</packaging>
+ <description>
+ Base BTree interfaces used by the BTreePartition and JdbmPartitions as well
+ as by the JdbmStore. Used to break cyclic dependencies.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>nlog4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
+
Propchange: directory/branches/trunks/schema2/apacheds/constants/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 13:39:31 2006
@@ -0,0 +1,17 @@
+target
+.clover
+.wtpmodules
+.settings
+.deployables
+apache.org
+.metadata
+*.md5
+*.log
+*.iml
+*.ipr
+*.iws
+.project
+.classpath
+
+nbproject
+
Added: directory/branches/trunks/schema2/apacheds/constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/constants/pom.xml?view=auto&rev=486847
==============================================================================
--- directory/branches/trunks/schema2/apacheds/constants/pom.xml (added)
+++ directory/branches/trunks/schema2/apacheds/constants/pom.xml Wed Dec 13 13:39:31 2006
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>build</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>apacheds-constants</artifactId>
+ <name>ApacheDS Constants</name>
+ <packaging>jar</packaging>
+ <description>
+ Contains classes that store interfaces with various constants in ApacheDS.
+ </description>
+</project>
+
Modified: directory/branches/trunks/schema2/apacheds/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/core/pom.xml?view=diff&rev=486847&r1=486846&r2=486847
==============================================================================
--- directory/branches/trunks/schema2/apacheds/core/pom.xml (original)
+++ directory/branches/trunks/schema2/apacheds/core/pom.xml Wed Dec 13 13:39:31 2006
@@ -34,6 +34,11 @@
<artifactId>apacheds-core-shared</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-constants</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?view=diff&rev=486847&r1=486846&r2=486847
==============================================================================
--- directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Wed Dec 13 13:39:31 2006
@@ -124,7 +124,7 @@
* @param indices
* @throws NamingException
*/
- protected void initIndices2(Set<String> indices ) throws NamingException
+ protected void initIndices2(Set indices ) throws NamingException
{
Set<String> sysOidSet = new HashSet<String>();
sysOidSet.add( Oid.EXISTANCE );
Propchange: directory/branches/trunks/schema2/apacheds/jdbm-store/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 13:39:31 2006
@@ -0,0 +1,17 @@
+target
+.clover
+.wtpmodules
+.settings
+.deployables
+apache.org
+.metadata
+*.md5
+*.log
+*.iml
+*.ipr
+*.iws
+.project
+.classpath
+
+nbproject
+
Added: directory/branches/trunks/schema2/apacheds/jdbm-store/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/jdbm-store/pom.xml?view=auto&rev=486847
==============================================================================
--- directory/branches/trunks/schema2/apacheds/jdbm-store/pom.xml (added)
+++ directory/branches/trunks/schema2/apacheds/jdbm-store/pom.xml Wed Dec 13 13:39:31 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>build</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>apacheds-jdbm-store</artifactId>
+ <name>ApacheDS JDBM Store</name>
+ <packaging>jar</packaging>
+ <description>
+ A JDBM entry store which does not have any dependency on core interfaces.
+ The JDBM partition will use this store and build on it to adapt this to
+ server specific partition interfaces.
+
+ Having this separate module without dependencies on core interfaces makes
+ it easier to avoid cyclic dependencies between modules. This is especially
+ important for use within the bootstrap plugin which needs to build the
+ schema partition used for bootstrapping the server.
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>nlog4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jdbm</groupId>
+ <artifactId>jdbm</artifactId>
+ </dependency>
+ </dependencies>
+</project>
+
Modified: directory/branches/trunks/schema2/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/pom.xml?view=diff&rev=486847&r1=486846&r2=486847
==============================================================================
--- directory/branches/trunks/schema2/apacheds/pom.xml (original)
+++ directory/branches/trunks/schema2/apacheds/pom.xml Wed Dec 13 13:39:31 2006
@@ -224,6 +224,7 @@
<module>bootstrap-plugin</module>
<module>bootstrap-schema</module>
+ <module>constants</module>
<module>core</module>
<module>core-shared</module>
<module>core-plugin</module>
@@ -265,6 +266,7 @@
<modules>
<module>maven-osgi-plugin</module>
+ <module>constants</module>
<module>core</module>
<module>core-shared</module>
<module>core-plugin</module>