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:57:00 UTC
svn commit: r486850 - in /directory/branches/trunks/schema2/apacheds: ./
btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/
core/ core/src/main/java/org/apache/directory/server/core/
core/src/main/java/org/apache/directory/...
Author: akarasulu
Date: Wed Dec 13 13:56:59 2006
New Revision: 486850
URL: http://svn.apache.org/viewvc?view=rev&rev=486850
Log:
adding utils module and moving some index stuff to btree-base
Added:
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java
- copied unchanged from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
- copied unchanged from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java
- copied, changed from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java
- copied unchanged from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java
- copied unchanged from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java
- copied unchanged from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java
- copied unchanged from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java
directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java
- copied unchanged from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java
directory/branches/trunks/schema2/apacheds/utils/ (with props)
directory/branches/trunks/schema2/apacheds/utils/pom.xml
directory/branches/trunks/schema2/apacheds/utils/src/
directory/branches/trunks/schema2/apacheds/utils/src/main/
directory/branches/trunks/schema2/apacheds/utils/src/main/java/
directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/
directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/apache/
directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/apache/directory/
directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/apache/directory/server/
directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/apache/directory/server/core/
directory/branches/trunks/schema2/apacheds/utils/src/main/java/org/apache/directory/server/core/ServerUtils.java
- copied unchanged from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/ServerUtils.java
Removed:
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/ServerUtils.java
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Index.java
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexConfiguration.java
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexEnumeration.java
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexNotFoundException.java
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexRecord.java
directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Tuple.java
Modified:
directory/branches/trunks/schema2/apacheds/core/pom.xml
directory/branches/trunks/schema2/apacheds/pom.xml
Copied: directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java (from r486821, directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java)
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java?view=diff&rev=486850&p1=directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java&r1=486821&p2=directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java&r2=486850
==============================================================================
--- directory/branches/trunks/schema2/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java (original)
+++ directory/branches/trunks/schema2/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertionEnumeration.java Wed Dec 13 13:56:59 2006
@@ -20,6 +20,7 @@
package org.apache.directory.server.core.partition.impl.btree;
+import java.math.BigInteger;
import java.util.HashMap;
import java.util.Map;
import java.util.NoSuchElementException;
@@ -44,7 +45,7 @@
/** The iteration cursor */
private final NamingEnumeration underlying;
/** LUT used to avoid returning duplicates */
- private final Map candidates;
+ private final Map<BigInteger,BigInteger> candidates;
/** */
private final IndexAssertion assertion;
/** */
@@ -71,7 +72,7 @@
throws NamingException
{
this.underlying = underlying;
- candidates = new HashMap();
+ candidates = new HashMap<BigInteger,BigInteger>();
this.assertion = assertion;
checkDups = enableDupCheck;
prefetch();
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=486850&r1=486849&r2=486850
==============================================================================
--- directory/branches/trunks/schema2/apacheds/core/pom.xml (original)
+++ directory/branches/trunks/schema2/apacheds/core/pom.xml Wed Dec 13 13:56:59 2006
@@ -36,7 +36,17 @@
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-utils</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-constants</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-btree-base</artifactId>
<version>${pom.version}</version>
</dependency>
</dependencies>
Modified: directory/branches/trunks/schema2/apacheds/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/pom.xml?view=diff&rev=486850&r1=486849&r2=486850
==============================================================================
--- directory/branches/trunks/schema2/apacheds/pom.xml (original)
+++ directory/branches/trunks/schema2/apacheds/pom.xml Wed Dec 13 13:56:59 2006
@@ -210,13 +210,6 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>jdk1.5</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <jdk>1.5</jdk>
- </activation>
<modules>
<!-- module>maven-osgi-plugin</module-->
@@ -224,7 +217,9 @@
<module>bootstrap-plugin</module>
<module>bootstrap-schema</module>
+ <module>utils</module>
<module>constants</module>
+ <module>btree-base</module>
<module>core</module>
<module>core-shared</module>
<module>core-plugin</module>
@@ -256,77 +251,6 @@
<!-- extra for jdk 1.5 -->
</modules>
- </profile>
-
- <!--profile>
- <id>jdk1.4</id>
- <activation>
- <jdk>1.4</jdk>
- </activation>
- <modules>
- <module>maven-osgi-plugin</module>
-
- <module>constants</module>
- <module>core</module>
- <module>core-shared</module>
- <module>core-plugin</module>
- <module>core-unit</module>
- <module>protocol-shared</module>
- <module>protocol-ntp</module>
- <module>protocol-ldap</module>
- <module>protocol-kerberos</module>
- <module>protocol-dhcp</module>
- <module>protocol-dns</module>
- <module>protocol-changepw</module>
- <module>server-tools</module>
-
- <!== breaks the build on first try
- <module>sar-plugin</module>
- <module>server-sar</module>
- ==>
-
- <module>server-unit</module>
- <module>server-main</module>
- <module>server-jndi</module>
- <module>kerberos-shared</module>
-
- <module>mitosis</module>
- <module>server-replication</module>
- </modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <echo>
-====================================================================
- W A R N I N G
- =============
-
-Build with 1.4 jvm will not include modules:
-
- o server-ssl
-
-Use JDK 1.5 to make sure these modules build.
-====================================================================
- </echo>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile-->
- </profiles>
<developers>
<developer>
Propchange: directory/branches/trunks/schema2/apacheds/utils/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 13 13:56:59 2006
@@ -0,0 +1,16 @@
+target
+.clover
+.wtpmodules
+.settings
+.deployables
+apache.org
+.metadata
+*.md5
+*.log
+*.iml
+*.ipr
+*.iws
+.project
+.classpath
+
+nbproject
Added: directory/branches/trunks/schema2/apacheds/utils/pom.xml
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema2/apacheds/utils/pom.xml?view=auto&rev=486850
==============================================================================
--- directory/branches/trunks/schema2/apacheds/utils/pom.xml (added)
+++ directory/branches/trunks/schema2/apacheds/utils/pom.xml Wed Dec 13 13:56:59 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-utils</artifactId>
+ <name>ApacheDS Utils</name>
+ <packaging>jar</packaging>
+ <description>
+ Contains utility classes for ApacheDS.
+ </description>
+</project>
+