Author: akarasulu
Date: Fri Oct 22 23:24:58 2004
New Revision: 55355
Added:
incubator/directory/eve/trunk/backend/core/build.ajproperties
incubator/directory/eve/trunk/backend/core/src/aspects/
incubator/directory/eve/trunk/backend/core/src/aspects/org/
incubator/directory/eve/trunk/backend/core/src/aspects/org/apache/
incubator/directory/eve/trunk/backend/core/src/aspects/org/apache/eve/
incubator/directory/eve/trunk/backend/core/src/aspects/org/apache/eve/jndi/
incubator/directory/eve/trunk/backend/core/src/aspects/org/apache/eve/jndi/ProviderNexusAspect.java
- copied, changed from rev 55314,
incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java
incubator/directory/eve/trunk/backend/core/src/test/org/apache/eve/jndi/
incubator/directory/eve/trunk/backend/core/src/test/org/apache/eve/jndi/EveContextFactoryTest.java
Modified:
incubator/directory/eve/trunk/backend/core/maven.xml
incubator/directory/eve/trunk/backend/core/project.xml
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/RootNexus.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/IndexComparator.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContextFactory.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveDirContext.java
incubator/directory/eve/trunk/backend/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java
Log:
Commit changes ...
o added the aspectj aspect for interceptor management
o cleaned up some code
o cleaned up the aspect
o fixed a bug where we were not correctly finding the backend to use
THE JNDI PROVIDER WORKS!!!
Added: incubator/directory/eve/trunk/backend/core/build.ajproperties
==============================================================================
--- (empty file)
+++ incubator/directory/eve/trunk/backend/core/build.ajproperties Fri Oct
22 23:24:58 2004
@@ -0,0 +1,4 @@
+src.includes = src/java/,\
+ src/test/,\
+ target/schema/,\
+ src/aspects/
Modified: incubator/directory/eve/trunk/backend/core/maven.xml
==============================================================================
--- incubator/directory/eve/trunk/backend/core/maven.xml (original)
+++ incubator/directory/eve/trunk/backend/core/maven.xml Fri Oct 22
23:24:58 2004
@@ -7,7 +7,15 @@
xmlns:maven="jelly:maven"
>
- <preGoal name="java:compile">
- <attainGoal name="eve:schema"/>
- </preGoal>
+ <preGoal name="java:compile">
+ <attainGoal name="eve:schema"/>
+ </preGoal>
+
+ <preGoal name="aspectj:compile">
+ <attainGoal name="eve:schema"/>
+ </preGoal>
+
+ <postGoal name="java:compile">
+ <attainGoal name="aspectj:compile"/>
+ </postGoal>
</project>
Modified: incubator/directory/eve/trunk/backend/core/project.xml
==============================================================================
--- incubator/directory/eve/trunk/backend/core/project.xml (original)
+++ incubator/directory/eve/trunk/backend/core/project.xml Fri Oct 22
23:24:58 2004
@@ -1,44 +1,70 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
- <extend>${basedir}/../../project.xml</extend>
- <groupId>incubator-directory</groupId>
- <id>eve-backend</id>
-
- <name>Eve's Backend Subsystem</name>
- <package>org.apache.eve</package>
- <currentVersion>SNAPSHOT</currentVersion>
- <inceptionYear>2002</inceptionYear>
-
- <shortDescription>Eve's Backend Subsystem</shortDescription>
-
- <description>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <extend>${basedir}/../../project.xml</extend>
+ <pomVersion>1</pomVersion>
+ <artifactId>eve-backend</artifactId>
+ <groupId>incubator-directory</groupId>
+ <id>eve-backend</id>
+ <name>Eve's Backend Subsystem</name>
+ <package>org.apache.eve</package>
+ <currentVersion>SNAPSHOT</currentVersion>
+ <inceptionYear>2002</inceptionYear>
+ <shortDescription>Eve's Backend Subsystem</shortDescription>
+ <description>
Eve's backend subsystem, providing a LDAP namespace based backing store
using JNDI as the access API. This deliverable is a JNDI LDAP namespace
provider but it does not use the LDAP protocol to access and store
entries. Instead entries are stored within a custom database
implementation on disk designed for fast reads and hierarchical data.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>incubator-directory</groupId>
- <artifactId>ldap-common</artifactId>
- <version>SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>1.2</version>
- <url>http://jakarta.apache.org/regexp/index.html</url>
- </dependency>
-
- <dependency>
- <groupId>jdbm</groupId>
- <artifactId>jdbm</artifactId>
- <version>SNAPSHOT</version>
- <url>http://jdbm.sourceforge.net</url>
- </dependency>
- </dependencies>
-</project>
-
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.2</version>
+ <url>http://jakarta.apache.org/regexp/index.html</url>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.7</version>
+ <url>http://jakarta.apache.org/oro</url>
+ </dependency>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ <url>http://jakarta.apache.org/regexp/index.html</url>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.2</version>
+ <url>http://antlr.org/</url>
+ </dependency>
+ <dependency>
+ <groupId>jdbm</groupId>
+ <artifactId>jdbm</artifactId>
+ <version>SNAPSHOT</version>
+ <type>jar</type>
+ <url>http://jdbm.sourceforge.net</url>
+ </dependency>
+ <dependency>
+ <groupId>incubator-directory</groupId>
+ <artifactId>ldap-common</artifactId>
+ <version>SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <aspectSourceDirectory>${basedir}/src/aspects</aspectSourceDirectory>
+ </build>
+</project>
+
Copied:
incubator/directory/eve/trunk/backend/core/src/aspects/org/apache/eve/jndi/ProviderNexusAspect.java
(from rev 55314,
incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java)
==============================================================================
---
incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/aspects/org/apache/eve/jndi/ProviderNexusAspect.java
Fri Oct 22 23:24:58 2004
@@ -1,229 +1,13 @@
-/*
- * Apache License
- * Version 2.0, January 2004
- * http://www.apache.org/licenses/
- *
- * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- *
- * 1. Definitions.
- *
- * "License" shall mean the terms and conditions for use, reproduction,
- * and distribution as defined by Sections 1 through 9 of this document.
- *
- * "Licensor" shall mean the copyright owner or entity authorized by
- * the copyright owner that is granting the License.
- *
- * "Legal Entity" shall mean the union of the acting entity and all
- * other entities that control, are controlled by, or are under common
- * control with that entity. For the purposes of this definition,
- * "control" means (i) the power, direct or indirect, to cause the
- * direction or management of such entity, whether by contract or
- * otherwise, or (ii) ownership of fifty percent (50%) or more of the
- * outstanding shares, or (iii) beneficial ownership of such entity.
- *
- * "You" (or "Your") shall mean an individual or Legal Entity
- * exercising permissions granted by this License.
- *
- * "Source" form shall mean the preferred form for making modifications,
- * including but not limited to software source code, documentation
- * source, and configuration files.
- *
- * "Object" form shall mean any form resulting from mechanical
- * transformation or translation of a Source form, including but
- * not limited to compiled object code, generated documentation,
- * and conversions to other media types.
- *
- * "Work" shall mean the work of authorship, whether in Source or
- * Object form, made available under the License, as indicated by a
- * copyright notice that is included in or attached to the work
- * (an example is provided in the Appendix below).
- *
- * "Derivative Works" shall mean any work, whether in Source or Object
- * form, that is based on (or derived from) the Work and for which the
- * editorial revisions, annotations, elaborations, or other modifications
- * represent, as a whole, an original work of authorship. For the purposes
- * of this License, Derivative Works shall not include works that remain
- * separable from, or merely link (or bind by name) to the interfaces of,
- * the Work and Derivative Works thereof.
- *
- * "Contribution" shall mean any work of authorship, including
- * the original version of the Work and any modifications or additions
- * to that Work or Derivative Works thereof, that is intentionally
- * submitted to Licensor for inclusion in the Work by the copyright owner
- * or by an individual or Legal Entity authorized to submit on behalf of
- * the copyright owner. For the purposes of this definition, "submitted"
- * means any form of electronic, verbal, or written communication sent
- * to the Licensor or its representatives, including but not limited to
- * communication on electronic mailing lists, source code control systems,
- * and issue tracking systems that are managed by, or on behalf of, the
- * Licensor for the purpose of discussing and improving the Work, but
- * excluding communication that is conspicuously marked or otherwise
- * designated in writing by the copyright owner as "Not a Contribution."
- *
- * "Contributor" shall mean Licensor and any individual or Legal Entity
- * on behalf of whom a Contribution has been received by Licensor and
- * subsequently incorporated within the Work.
- *
- * 2. Grant of Copyright License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * copyright license to reproduce, prepare Derivative Works of,
- * publicly display, publicly perform, sublicense, and distribute the
- * Work and such Derivative Works in Source or Object form.
- *
- * 3. Grant of Patent License. Subject to the terms and conditions of
- * this License, each Contributor hereby grants to You a perpetual,
- * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- * (except as stated in this section) patent license to make, have made,
- * use, offer to sell, sell, import, and otherwise transfer the Work,
- * where such license applies only to those patent claims licensable
- * by such Contributor that are necessarily infringed by their
- * Contribution(s) alone or by combination of their Contribution(s)
- * with the Work to which such Contribution(s) was submitted. If You
- * institute patent litigation against any entity (including a
- * cross-claim or counterclaim in a lawsuit) alleging that the Work
- * or a Contribution incorporated within the Work constitutes direct
- * or contributory patent infringement, then any patent licenses
- * granted to You under this License for that Work shall terminate
- * as of the date such litigation is filed.
- *
- * 4. Redistribution. You may reproduce and distribute copies of the
- * Work or Derivative Works thereof in any medium, with or without
- * modifications, and in Source or Object form, provided that You
- * meet the following conditions:
- *
- * (a) You must give any other recipients of the Work or
- * Derivative Works a copy of this License; and
- *
- * (b) You must cause any modified files to carry prominent notices
- * stating that You changed the files; and
- *
- * (c) You must retain, in the Source form of any Derivative Works
- * that You distribute, all copyright, patent, trademark, and
- * attribution notices from the Source form of the Work,
- * excluding those notices that do not pertain to any part of
- * the Derivative Works; and
- *
- * (d) If the Work includes a "NOTICE" text file as part of its
- * distribution, then any Derivative Works that You distribute must
- * include a readable copy of the attribution notices contained
- * within such NOTICE file, excluding those notices that do not
- * pertain to any part of the Derivative Works, in at least one
- * of the following places: within a NOTICE text file distributed
- * as part of the Derivative Works; within the Source form or
- * documentation, if provided along with the Derivative Works; or,
- * within a display generated by the Derivative Works, if and
- * wherever such third-party notices normally appear. The contents
- * of the NOTICE file are for informational purposes only and
- * do not modify the License. You may add Your own attribution
- * notices within Derivative Works that You distribute, alongside
- * or as an addendum to the NOTICE text from the Work, provided
- * that such additional attribution notices cannot be construed
- * as modifying the License.
- *
- * You may add Your own copyright statement to Your modifications and
- * may provide additional or different license terms and conditions
- * for use, reproduction, or distribution of Your modifications, or
- * for any such Derivative Works as a whole, provided Your use,
- * reproduction, and distribution of the Work otherwise complies with
- * the conditions stated in this License.
- *
- * 5. Submission of Contributions. Unless You explicitly state otherwise,
- * any Contribution intentionally submitted for inclusion in the Work
- * by You to the Licensor shall be under the terms and conditions of
- * this License, without any additional terms or conditions.
- * Notwithstanding the above, nothing herein shall supersede or modify
- * the terms of any separate license agreement you may have executed
- * with Licensor regarding such Contributions.
- *
- * 6. Trademarks. This License does not grant permission to use the trade
- * names, trademarks, service marks, or product names of the Licensor,
- * except as required for reasonable and customary use in describing the
- * origin of the Work and reproducing the content of the NOTICE file.
- *
- * 7. Disclaimer of Warranty. Unless required by applicable law or
- * agreed to in writing, Licensor provides the Work (and each
- * Contributor provides its Contributions) on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied, including, without limitation, any warranties or conditions
- * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- * PARTICULAR PURPOSE. You are solely responsible for determining the
- * appropriateness of using or redistributing the Work and assume any
- * risks associated with Your exercise of permissions under this License.
- *
- * 8. Limitation of Liability. In no event and under no legal theory,
- * whether in tort (including negligence), contract, or otherwise,
- * unless required by applicable law (such as deliberate and grossly
- * negligent acts) or agreed to in writing, shall any Contributor be
- * liable to You for damages, including any direct, indirect, special,
- * incidental, or consequential damages of any character arising as a
- * result of this License or out of the use or inability to use the
- * Work (including but not limited to damages for loss of goodwill,
- * work stoppage, computer failure or malfunction, or any and all
- * other commercial damages or losses), even if such Contributor
- * has been advised of the possibility of such damages.
- *
- * 9. Accepting Warranty or Additional Liability. While redistributing
- * the Work or Derivative Works thereof, You may choose to offer,
- * and charge a fee for, acceptance of support, warranty, indemnity,
- * or other liability obligations and/or rights consistent with this
- * License. However, in accepting such obligations, You may act only
- * on Your own behalf and on Your sole responsibility, not on behalf
- * of any other Contributor, and only if You agree to indemnify,
- * defend, and hold each Contributor harmless for any liability
- * incurred by, or claims asserted against, such Contributor by reason
- * of your accepting any such warranty or additional liability.
- *
- * END OF TERMS AND CONDITIONS
- *
- * APPENDIX: How to apply the Apache License to your work.
- *
- * To apply the Apache License to your work, attach the following
- * boilerplate notice, with the fields enclosed by brackets "[]"
- * replaced with your own identifying information. (Don't include
- * the brackets!) The text should be enclosed in the appropriate
- * comment syntax for the file format. We also recommend that a
- * file or class name and description of purpose be included on the
- * same "printed page" as the copyright notice for easier
- * identification within third-party archives.
- *
- * Copyright [yyyy] [name of copyright owner]
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/*
- * $Id: ProviderNexusAspect.java,v 1.5 2003/11/26 20:55:52 akarasulu Exp $
- *
- * -- (c) LDAPd Group --
- * -- Please refer to the LICENSE.txt file in the root directory of --
- * -- any LDAPd project for copyright and distribution information. --
- *
- * Created on Aug 8, 2003
- */
-
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi ;
+import java.util.Map ;
import java.util.Stack ;
import java.util.Iterator ;
-import java.util.Hashtable ;
import java.util.EmptyStackException ;
import javax.naming.Name ;
import javax.naming.Context ;
-import javax.naming.ldap.Control ;
import javax.naming.ldap.LdapContext ;
import javax.naming.NamingEnumeration ;
import javax.naming.directory.Attributes ;
@@ -231,9 +15,9 @@
import javax.naming.directory.ModificationItem ;
import org.apache.ldap.common.filter.ExprNode ;
-import org.apache.ldap.server.nexus.BackendNexus ;
-import org.apache.ldap.server.backend.db.Database ;
-import org.apache.ldap.server.backend.AtomicBackend ;
+import org.apache.eve.PartitionNexus ;
+import org.apache.eve.db.Database ;
+import org.apache.eve.ContextPartition;
/**
@@ -256,8 +40,7 @@
* backend nexus calls made by the JndiProvider's contexts within the same
* thread of execution.
*/
- private static ThreadLocal JndiProviderModule.s_contextStacks =
- new ThreadLocal() ;
+ private static ThreadLocal EveJndiProvider.s_contextStacks = new
ThreadLocal() ;
// ------------------------------------------------------------------------
@@ -269,19 +52,19 @@
* Pushes a calling LdapContext onto the Thread's ThreadLocal Stack before
* calls are made on the nexus within the LdapContext code.
*
- * @param a_context the caller or the current context for the nexus call
+ * @param context the caller or the current context for the nexus call
*/
- private static void JndiProviderModule.push( LdapContext a_context )
+ private static void EveJndiProvider.push( LdapContext context )
{
- Stack l_stack = ( Stack ) s_contextStacks.get() ;
+ Stack stack = ( Stack ) s_contextStacks.get() ;
- if ( null == l_stack )
+ if ( null == stack )
{
- l_stack = new Stack() ;
- s_contextStacks.set( l_stack ) ;
+ stack = new Stack() ;
+ s_contextStacks.set( stack ) ;
}
- l_stack.push( a_context ) ;
+ stack.push( context ) ;
}
@@ -291,16 +74,16 @@
*
* @return the last LdapContext or caller
*/
- private static LdapContext JndiProviderModule.pop()
+ private static LdapContext EveJndiProvider.pop()
{
- Stack l_stack = ( Stack ) s_contextStacks.get() ;
+ Stack stack = ( Stack ) s_contextStacks.get() ;
- if ( null == l_stack )
+ if ( null == stack )
{
throw new EmptyStackException() ;
}
- return ( LdapContext ) l_stack.pop() ;
+ return ( LdapContext ) stack.pop() ;
}
@@ -309,16 +92,16 @@
*
* @return the current LdapContext or caller
*/
- static LdapContext JndiProviderModule.peek()
+ static LdapContext EveJndiProvider.peek()
{
- Stack l_stack = ( Stack ) s_contextStacks.get() ;
+ Stack stack = ( Stack ) s_contextStacks.get() ;
- if ( null == l_stack )
+ if ( null == stack )
{
throw new EmptyStackException() ;
}
- return ( LdapContext ) l_stack.peek() ;
+ return ( LdapContext ) stack.peek() ;
}
@@ -334,14 +117,14 @@
*/
private static Stack getContextStack()
{
- Stack l_stack = ( Stack ) JndiProviderModule.s_contextStacks.get() ;
+ Stack stack = ( Stack ) EveJndiProvider.s_contextStacks.get() ;
- if ( null == l_stack )
+ if ( null == stack )
{
throw new NullPointerException( "Thread had null stack" ) ;
}
- return ( Stack ) l_stack.clone() ;
+ return ( Stack ) stack.clone() ;
}
@@ -356,33 +139,38 @@
* caller. Makes sure that Proxy methods (static) and the
* getInvokationHandler() do not get selected.
*
- * @param a_caller the calling LdapContext.
+ * @param caller the calling LdapContext.
*/
- pointcut jndiNexusCalls( Context a_caller ):
- this( a_caller ) &&
- ! this( AtomicBackend ) &&
- target( BackendNexus ) &&
+ pointcut jndiNexusCalls( Context caller ):
+ this( caller ) &&
+ ! this( ContextPartition ) &&
+ target( PartitionNexus ) &&
! target( Database ) &&
(
- call( public void add( Name, Attributes ) ) ||
- call( public void delete( Name ) ) ||
+ // these are for the ContextPartition interface methods
+
+ // not used anymore since it was moved to RootNexus class
+ // call( public Attributes getRootDSE() ) ||
+
call( public Name getMatchedDn( Name, boolean ) ) ||
- call( public Attributes getRootDSE() ) ||
- call( public Name getSuffix( boolean ) ) ||
call( public Name getSuffix( Name, boolean ) ) ||
- call( public boolean hasEntry( Name ) ) ||
+ call( public Iterator listSuffixes( boolean ) ) ||
+ call( public Attributes lookup( Name, String [] ) ) ||
+
+ // these are for BackingStore interface methods
+ call( public void add( String, Name, Attributes ) ) ||
+ call( public void delete( Name ) ) ||
+ call( public boolean hasEntry( Name ) ) ||
call( public boolean isSuffix( Name ) ) ||
call( public NamingEnumeration list( Name ) ) ||
- call( public Iterator listSuffixes( boolean ) ) ||
- call( public Attributes lookup( Name ) ) ||
- call( public Attributes lookup( Name, String [] ) ) ||
+ call( public Attributes lookup( Name ) ) ||
call( public void modify( Name, int, Attributes ) ) ||
call( public void modify( Name, ModificationItem [] ) ) ||
call( public void modifyRdn( Name, String, boolean ) ) ||
call( public void move( Name, Name ) ) ||
call( public void move( Name, Name, String, boolean ) ) ||
call( public NamingEnumeration
- search( Name, Hashtable, ExprNode, Control [], SearchControls ) ) )
;
+ search( Name, Map, ExprNode, SearchControls ) ) ) ;
/**
@@ -403,18 +191,18 @@
before( Context a_caller ):
jndiNexusCalls( a_caller )
{
- JndiProviderModule.push( ( LdapContext ) a_caller ) ;
- System.out.println( "\npushed " + a_caller + " for join point "
- + thisJoinPoint ) ;
+ EveJndiProvider.push( ( LdapContext ) a_caller ) ;
+ //System.out.println( "\npushed " + a_caller + " for join point "
+ // + thisJoinPoint ) ;
}
after( Context a_caller ):
jndiNexusCalls( a_caller )
{
- LdapContext l_head = JndiProviderModule.pop() ;
- System.out.println( "\npopped " + a_caller + " for join point "
- + thisJoinPoint ) ;
+ LdapContext l_head = EveJndiProvider.pop() ;
+ //System.out.println( "\npopped " + a_caller + " for join point "
+ // + thisJoinPoint ) ;
}
@@ -422,9 +210,9 @@
newInvocation( a_invocation )
{
a_invocation.setContextStack( getContextStack() ) ;
- System.out.println(
- "\nJust set the context stack on a new Invocation: "
- + thisJoinPoint ) ;
+ //System.out.println(
+ // "\nJust set the context stack on a new Invocation: "
+ // + thisJoinPoint ) ;
}
}
Modified:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/RootNexus.java
==============================================================================
---
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/RootNexus.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/RootNexus.java
Fri Oct 22 23:24:58 2004
@@ -306,7 +306,7 @@
return ( ContextPartition ) backends.get( clonedDn.toString()
);
}
- clonedDn.remove( 0 );
+ clonedDn.remove( clonedDn.size() - 1 );
}
throw new NameNotFoundException();
Modified:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/IndexComparator.java
==============================================================================
---
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/IndexComparator.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/IndexComparator.java
Fri Oct 22 23:24:58 2004
@@ -28,8 +28,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a>
* @version $Rev$
*/
-public class IndexComparator
- implements TupleComparator
+public class IndexComparator implements TupleComparator
{
/** Whether or not the key/value is swapped */
private final boolean isForwardMap;
Modified:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContextFactory.java
==============================================================================
---
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContextFactory.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContextFactory.java
Fri Oct 22 23:24:58 2004
@@ -2,17 +2,24 @@
import java.util.Hashtable;
+import java.util.List;
+import java.io.File;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import org.apache.ldap.common.NotImplementedException;
-import org.apache.ldap.common.schema.Syntax;
-import org.apache.eve.schema.bootstrap.BootstrapSyntaxRegistry;
-import org.apache.eve.schema.bootstrap.BootstrapOidRegistry;
+import org.apache.ldap.common.name.LdapName;
+import org.apache.ldap.common.schema.AttributeType;
-import org.apache.eve.schema.bootstrap. SystemSyntaxProducer;
+import org.apache.eve.RootNexus;
+import org.apache.eve.SystemPartition;
+import org.apache.eve.db.*;
+import org.apache.eve.db.jdbm.JdbmDatabase;
+import org.apache.eve.schema.bootstrap.BootstrapRegistries;
+import org.apache.eve.schema.bootstrap.BootstrapSchemaLoader;
+import org.apache.eve.schema.AttributeTypeRegistry;
+import org.apache.eve.schema.OidRegistry;
/**
@@ -28,6 +35,29 @@
*/
public class EveContextFactory implements InitialContextFactory
{
+ /** key base for a set of user indices provided as comma sep list of
attribute names or oids */
+ public static final String USER_INDICES_ENV_BASE = "eve.user.db.indices";
+ /** the path to eve's working directory - relative or absolute */
+ public static final String WKDIR_ENV = "eve.wkdir";
+ /** default path to working directory if WKDIR_ENV property is not set */
+ public static final String DEFAULT_WKDIR = "eve";
+ /** a comma separated list of schema class files to load */
+ public static final String SCHEMAS_ENV = "eve.schemas";
+ /** default schema classes for the SCHEMAS_ENV property if not set */
+ private static final String[] DEFAULT_SCHEMAS = new String[]
+ {
+ "org.apache.eve.schema.bootstrap.AutofsSchema",
+ "org.apache.eve.schema.bootstrap.CorbaSchema",
+ "org.apache.eve.schema.bootstrap.CoreSchema",
+ "org.apache.eve.schema.bootstrap.CosineSchema",
+ "org.apache.eve.schema.bootstrap.EveSchema",
+ "org.apache.eve.schema.bootstrap.InetorgpersonSchema",
+ "org.apache.eve.schema.bootstrap.JavaSchema",
+ "org.apache.eve.schema.bootstrap.Krb5kdcSchema",
+ "org.apache.eve.schema.bootstrap.NisSchema",
+ "org.apache.eve.schema.bootstrap.SystemSchema"
+ };
+
/** The singleton EveJndiProvider instance */
private EveJndiProvider provider = null;
/** the initial context environment that fired up the backend subsystem */
@@ -65,15 +95,115 @@
if ( null == provider )
{
this.initialEnv = env;
- throw new NotImplementedException();
+ initialize();
}
return provider.getLdapContext( env );
}
- private EveJndiProvider create( Hashtable env )
+ private void initialize() throws NamingException
{
- throw new NotImplementedException( "bootstrap code not yet written" );
+ // --------------------------------------------------------------------
+ // Load the schema here and check that it is ok!
+ // --------------------------------------------------------------------
+
+ BootstrapRegistries registries = new BootstrapRegistries();
+ BootstrapSchemaLoader loader = new BootstrapSchemaLoader();
+
+ String[] schemas = DEFAULT_SCHEMAS;
+ if ( initialEnv.containsKey( SCHEMAS_ENV ) )
+ {
+ schemas = ( ( String ) initialEnv.get( SCHEMAS_ENV ) ).split( ","
);
+ }
+
+ loader.load( schemas, registries );
+ List errors = registries.checkRefInteg();
+ if ( ! errors.isEmpty() )
+ {
+ NamingException e = new NamingException();
+ e.setRootCause( ( Throwable ) errors.get( 0 ) );
+ throw e;
+ }
+
+ // --------------------------------------------------------------------
+ // Fire up the system partition
+ // --------------------------------------------------------------------
+
+
+ String wkdir = DEFAULT_WKDIR;
+ if ( initialEnv.containsKey( WKDIR_ENV ) )
+ {
+ wkdir = ( ( String ) initialEnv.get( WKDIR_ENV ) ).trim();
+ }
+
+ File wkdirFile = new File( wkdir );
+ if ( wkdirFile.isAbsolute() )
+ {
+ if ( ! wkdirFile.exists() )
+ {
+ throw new NamingException( "working directory " + wkdir
+ + " does not exist" );
+ }
+ }
+ else
+ {
+ File current = new File( "." );
+ mkdirs( current.getAbsolutePath(), wkdir );
+ }
+
+ LdapName suffix = new LdapName();
+ suffix.add( SystemPartition.SUFFIX );
+ Database db = new JdbmDatabase( suffix, wkdir );
+
+ AttributeTypeRegistry attributeTypeRegistry;
+ attributeTypeRegistry = registries.getAttributeTypeRegistry();
+ OidRegistry oidRegistry;
+ oidRegistry = registries.getOidRegistry();
+
+ ExpressionEvaluator evaluator;
+ evaluator = new ExpressionEvaluator( db, oidRegistry,
attributeTypeRegistry );
+
+ ExpressionEnumerator enumerator;
+ enumerator = new ExpressionEnumerator( db, evaluator );
+
+ SearchEngine eng = new DefaultSearchEngine( db, evaluator, enumerator
);
+
+ AttributeType[] attributes = new AttributeType[] {
+ attributeTypeRegistry.lookup( SystemPartition.ALIAS_OID ),
+ attributeTypeRegistry.lookup( SystemPartition.EXISTANCE_OID ),
+ attributeTypeRegistry.lookup( SystemPartition.HIERARCHY_OID ),
+ attributeTypeRegistry.lookup( SystemPartition.NDN_OID ),
+ attributeTypeRegistry.lookup( SystemPartition.ONEALIAS_OID ),
+ attributeTypeRegistry.lookup( SystemPartition.SUBALIAS_OID ),
+ attributeTypeRegistry.lookup( SystemPartition.UPDN_OID )
+ };
+
+ SystemPartition system = new SystemPartition( db, eng, attributes );
+ RootNexus root = new RootNexus( system );
+ this.provider = new EveJndiProvider( root );
+ }
+
+
+ protected boolean mkdirs( String base, String path )
+ {
+ String[] comps = path.split( "/" );
+ File file = new File( base );
+
+ if ( ! file.exists() )
+ {
+ file.mkdirs();
+ }
+
+ for ( int ii = 0; ii < comps.length; ii++ )
+ {
+ file = new File( file, comps[ii] );
+ if ( ! file.exists() )
+ {
+ file.mkdirs();
+ }
+ }
+
+ return file.exists();
}
}
Modified:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveDirContext.java
==============================================================================
---
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveDirContext.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveDirContext.java
Fri Oct 22 23:24:58 2004
@@ -278,9 +278,18 @@
// Initialize the new context
EveLdapContext l_ctx = new EveLdapContext( getNexusProxy(),
getEnvironment(), l_target ) ;
- Control [] l_controls = ( Control [] )
- ( ( EveLdapContext ) this ).getRequestControls().clone() ;
- l_ctx.setRequestControls( l_controls ) ;
+
+ Control [] controls = ( ( EveLdapContext ) this ).getRequestControls();
+ if ( controls != null )
+ {
+ controls = ( Control[] ) controls.clone();
+ }
+ else
+ {
+ controls = new Control[0];
+ }
+
+ l_ctx.setRequestControls( controls ) ;
return l_ctx ;
}
Added:
incubator/directory/eve/trunk/backend/core/src/test/org/apache/eve/jndi/EveContextFactoryTest.java
==============================================================================
--- (empty file)
+++
incubator/directory/eve/trunk/backend/core/src/test/org/apache/eve/jndi/EveContextFactoryTest.java
Fri Oct 22 23:24:58 2004
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.eve.jndi;
+
+
+import java.util.Hashtable;
+import javax.naming.NamingException;
+import javax.naming.InitialContext;
+import javax.naming.Context;
+import javax.naming.directory.*;
+import javax.naming.ldap.LdapContext;
+
+import junit.framework.TestCase;
+
+
+/**
+ * Tests to see if we can fire up the Eve directory server via JNDI.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a>
+ * @version $Rev$
+ */
+public class EveContextFactoryTest extends TestCase
+{
+ private LdapContext sysRoot;
+
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ Hashtable env = new Hashtable();
+ env.put( Context.PROVIDER_URL, "ou=system" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY,
"org.apache.eve.jndi.EveContextFactory" );
+ env.put( EveContextFactory.WKDIR_ENV, "target/eve" );
+ InitialContext initialContext = new InitialContext( env );
+ sysRoot = ( LdapContext ) initialContext.lookup( "" );
+ }
+
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
+
+ public void testSystemContext() throws NamingException
+ {
+ assertNotNull( sysRoot );
+
+ Attributes attributes = sysRoot.getAttributes( "" );
+ assertNotNull( attributes );
+ assertEquals( "system", attributes.get( "ou" ).get() );
+ Attribute attribute = attributes.get( "objectClass" );
+ assertNotNull( attribute );
+ assertTrue( attribute.contains( "top" ) );
+ assertTrue( attribute.contains( "organizationalUnit" ) );
+ }
+
+
+ public void testCreateContext() throws NamingException
+ {
+ Attributes attributes = new BasicAttributes();
+ Attribute attribute = new BasicAttribute( "objectClass" );
+ attribute.add( "top" );
+ attribute.add( "organizationalUnit" );
+ attributes.put( attribute );
+ attributes.put( "ou", "testing" );
+ DirContext ctx = sysRoot.createSubcontext( "ou=testing", attributes );
+ assertNotNull( ctx );
+
+ ctx = ( DirContext ) sysRoot.lookup( "ou=testing" );
+ assertNotNull( ctx );
+
+ attributes = ctx.getAttributes( "" );
+ assertNotNull( attributes );
+ assertEquals( "testing", attributes.get( "ou" ).get() );
+ attribute = attributes.get( "objectClass" );
+ assertNotNull( attribute );
+ assertTrue( attribute.contains( "top" ) );
+ assertTrue( attribute.contains( "organizationalUnit" ) );
+ }
+
+}
Modified:
incubator/directory/eve/trunk/backend/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java
==============================================================================
---
incubator/directory/eve/trunk/backend/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/test/org/apache/eve/schema/bootstrap/BootstrapSchemaLoaderTest.java
Fri Oct 22 23:24:58 2004
@@ -17,7 +17,6 @@
package org.apache.eve.schema.bootstrap;
-import java.util.Iterator;
import java.util.List;
import java.io.StringWriter;
import java.io.PrintWriter;
@@ -25,9 +24,6 @@
import junit.framework.TestCase;
import org.apache.ldap.common.schema.AttributeType;
-import org.apache.ldap.common.schema.ObjectClass;
-import org.apache.ldap.common.schema.MatchingRule;
-import org.apache.ldap.common.schema.Syntax;
/**
