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 2004/10/02 01:44:50 UTC
svn commit: rev 51768 - in incubator/directory/eve/trunk/backend: core/src/java/org/apache/eve core/src/java/org/apache/eve/db core/src/java/org/apache/eve/db/jdbm core/src/java/org/apache/eve/jndi sandbox
Author: akarasulu
Date: Fri Oct 1 16:44:49 2004
New Revision: 51768
Added:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/DefaultBackend.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/default-backend-impl/src/java/org/apache/ldap/server/backend/DefaultBackend.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/SystemBackend.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/system-backend-impl/src/java/org/apache/ldap/server/backend/SystemBackend.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/AfterFailurePipeline.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/AfterFailurePipeline.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/DirServerContext.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/DirServerContext.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/FailFastPipeline.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/FailFastPipeline.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/Interceptor.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/Interceptor.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/InterceptorException.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/InterceptorException.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/InterceptorPipeline.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/InterceptorPipeline.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/Invocation.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/Invocation.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/InvocationStateEnum.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/InvocationStateEnum.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JavaLdap.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JavaLdap.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JndiProvider.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JndiProvider.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JndiProviderClient.java
- copied unchanged from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JndiProviderClient.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JndiProviderClientImpl.java
- copied unchanged from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JndiProviderClientImpl.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JndiProviderModule.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JndiProviderModule.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/LdapServerContext.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/LdapServerContext.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/ServerContext.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/ServerContext.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/ServerContextFactory.java
- copied, changed from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/ServerContextFactory.java
Modified:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/AbstractContextPartition.java
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/Database.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java
incubator/directory/eve/trunk/backend/sandbox/position.txt
Log:
Commit changes ...
o moved system backend impl to core
o moved defualt backend impl to core
o moved jndi provider code to core
o while moving removed all avalon references to pojo'ify
o cleaned the code up in terms of style and formatting
o added 2.0 license boilerplate where appropriate
Notes ...
o need to change name SystemBackend -> SystemPartition
o need to change name DefaultBackend -> ApplicationPartition
Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/AbstractContextPartition.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/AbstractContextPartition.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/AbstractContextPartition.java Fri Oct 1 16:44:49 2004
@@ -18,6 +18,7 @@
import java.util.Map;
+import java.util.HashSet;
import java.math.BigInteger;
import javax.naming.Name;
@@ -29,6 +30,7 @@
import javax.naming.directory.ModificationItem;
import org.apache.ldap.common.filter.ExprNode;
+import org.apache.ldap.common.schema.AttributeType;
import org.apache.eve.db.Database;
import org.apache.eve.db.SearchEngine;
@@ -45,6 +47,21 @@
*/
public abstract class AbstractContextPartition implements ContextPartition
{
+ /** Private OID (1.2.6.1.4.1.18060.1.1.3.1) for _ndn op attrib */
+ public static final String NDN_OID = "1.2.6.1.4.1.18060.1.1.3.1" ;
+ /** Private OID (1.2.6.1.4.1.18060.1.1.3.2) for _updn op attrib */
+ public static final String UPDN_OID = "1.2.6.1.4.1.18060.1.1.3.2" ;
+ /** Private OID (1.2.6.1.4.1.18060.1.1.3.3) for _existance op attrib */
+ public static final String EXISTANCE_OID = "1.2.6.1.4.1.18060.1.1.3.3" ;
+ /** Private OID (1.2.6.1.4.1.18060.1.1.3.4) for _hierarchy op attrib */
+ public static final String HIERARCHY_OID = "1.2.6.1.4.1.18060.1.1.3.4" ;
+ /** Private OID (1.2.6.1.4.1.18060.1.1.3.5) for _oneAlias index */
+ public static final String ONEALIAS_OID = "1.2.6.1.4.1.18060.1.1.3.5" ;
+ /** Private OID (1.2.6.1.4.1.18060.1.1.3.6) for _subAlias index */
+ public static final String SUBALIAS_OID = "1.2.6.1.4.1.18060.1.1.3.6" ;
+ /** Private OID (1.2.6.1.4.1.18060.1.1.3.7) for _alias index */
+ public static final String ALIAS_OID = "1.2.6.1.4.1.18060.1.1.3.7" ;
+
/**
* the database used for this backing store which is also initialized during
* configuration time
@@ -55,65 +72,114 @@
* the search engine used to search the database
*/
private SearchEngine engine = null;
-
-
+
+
// ------------------------------------------------------------------------
- // Public Accessors - not declared in any interfaces just for this class
+ // C O N S T R U C T O R S
// ------------------------------------------------------------------------
/**
- * Gets the Database used by this ContextPartition.
+ * Creates a context partition with a new database and a search engine.
*
- * @return the database used
+ * @param db the dedicated database for this backing store
+ * @param searchEngine the search engine for this backing store
*/
- public Database getDb()
+ public AbstractContextPartition( Database db, SearchEngine searchEngine,
+ AttributeType[] indexAttributes )
+ throws NamingException
{
- return db;
- }
+ this.db = db;
+ this.engine = searchEngine;
+ HashSet sysOidSet = new HashSet();
+ sysOidSet.add( EXISTANCE_OID );
+ sysOidSet.add( HIERARCHY_OID );
+ sysOidSet.add( UPDN_OID );
+ sysOidSet.add( NDN_OID );
+ sysOidSet.add( ONEALIAS_OID );
+ sysOidSet.add( SUBALIAS_OID );
+ sysOidSet.add( ALIAS_OID );
- /**
- * Gets the DefaultSearchEngine used by this ContextPartition to search the
- * Database.
- *
- * @return the search engine
- */
- public SearchEngine getEngine()
- {
- return engine;
+ for ( int ii = 0; ii < indexAttributes.length; ii ++ )
+ {
+ String oid = indexAttributes[ii].getOid();
+
+ // check if attribute is a system attribute
+ if ( sysOidSet.contains( oid ) )
+ {
+ if ( oid.equals( EXISTANCE_OID ) )
+ {
+ db.setExistanceIndexOn( indexAttributes[ii] );
+ }
+ else if ( oid.equals( HIERARCHY_OID ) )
+ {
+ db.setHeirarchyIndexOn( indexAttributes[ii] );
+ }
+ else if ( oid.equals( UPDN_OID ) )
+ {
+ db.setUpdnIndexOn( indexAttributes[ii] );
+ }
+ else if ( oid.equals( NDN_OID ) )
+ {
+ db.setNdnIndexOn( indexAttributes[ii] );
+ }
+ else if ( oid.equals( ONEALIAS_OID ) )
+ {
+ db.setOneAliasIndexOn( indexAttributes[ii] );
+ }
+ else if ( oid.equals( SUBALIAS_OID ) )
+ {
+ db.setSubAliasIndexOn( indexAttributes[ii] );
+ }
+ else if ( oid.equals( ALIAS_OID ) )
+ {
+ db.setAliasIndexOn( indexAttributes[ii] );
+ }
+ else
+ {
+ throw new NamingException( "Unidentified system index "
+ + oid );
+ }
+ }
+ else
+ {
+ db.addIndexOn( indexAttributes[ii] );
+ }
+ }
}
// ------------------------------------------------------------------------
- // Protected Mutators
+ // Public Accessors - not declared in any interfaces just for this class
// ------------------------------------------------------------------------
/**
- * Sets the Database used by this AtomicBackend.
+ * Gets the Database used by this ContextPartition.
*
- * @param database the database
+ * @return the database used
*/
- protected void setDb( Database database )
+ public Database getDb()
{
- db = database;
+ return db;
}
/**
- * Sets the search engine to be used by this Backend.
+ * Gets the DefaultSearchEngine used by this ContextPartition to search the
+ * Database.
*
- * @param engine the search engine
+ * @return the search engine
*/
- protected void setEngine( SearchEngine engine )
+ public SearchEngine getEngine()
{
- this.engine = engine;
+ return engine;
}
// ------------------------------------------------------------------------
- // Backend Interface Method Implementations
+ // BackingStore Interface Method Implementations
// ------------------------------------------------------------------------
@@ -139,8 +205,7 @@
/**
* @see org.apache.eve.BackingStore#add( String, Name, Attributes )
*/
- public void add( String updn, Name dn, Attributes entry )
- throws NamingException
+ public void add( String updn, Name dn, Attributes entry ) throws NamingException
{
db.add( updn, dn, entry );
}
@@ -149,8 +214,7 @@
/**
* @see org.apache.eve.BackingStore#modify( Name, int, Attributes )
*/
- public void modify( Name dn, int modOp, Attributes mods )
- throws NamingException
+ public void modify( Name dn, int modOp, Attributes mods ) throws NamingException
{
db.modify( dn, modOp, mods );
}
@@ -159,8 +223,7 @@
/**
* @see org.apache.eve.BackingStore#modify( Name,ModificationItem[] )
*/
- public void modify( Name dn, ModificationItem[] mods )
- throws NamingException
+ public void modify( Name dn, ModificationItem[] mods ) throws NamingException
{
db.modify( dn, mods );
}
@@ -210,10 +273,9 @@
/**
- * @see org.apache.eve.BackingStore#modifyRn( Name, String, boolean )
+ * @see BackingStore#modifyRn( Name, String, boolean )
*/
- public void modifyRdn( Name dn, String newRdn, boolean deleteOldRdn )
- throws NamingException
+ public void modifyRn( Name dn, String newRdn, boolean deleteOldRdn ) throws NamingException
{
db.modifyRdn( dn, newRdn, deleteOldRdn );
}
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/DefaultBackend.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/default-backend-impl/src/java/org/apache/ldap/server/backend/DefaultBackend.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/default-backend-impl/src/java/org/apache/ldap/server/backend/DefaultBackend.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/DefaultBackend.java Fri Oct 1 16:44:49 2004
@@ -1,283 +1,102 @@
-/*
- * 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: DefaultBackend.java,v 1.1 2003/09/03 04:52:22 akarasulu Exp $
+ * 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
*
- * -- (c) LDAPd Group --
- * -- Please refer to the LICENSE.txt file in the root directory of --
- * -- any LDAPd project for copyright and distribution information. --
+ * 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.
*
- * Created on Aug 15, 2003
*/
-package org.apache.ldap.server.backend ;
+package org.apache.eve;
+import org.apache.eve.db.Database;
+import org.apache.eve.db.SearchEngine;
+import org.apache.ldap.common.schema.AttributeType;
+
import javax.naming.Name ;
import javax.naming.NamingException ;
-import org.apache.avalon.framework.configuration.Configurable ;
-import org.apache.avalon.framework.configuration.Configuration ;
-
/**
- * TODO Document me!
+ * Creates a ContextPartition to be use for application specific contexts.
*
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.1 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
-public class DefaultBackend extends AbstractBackend implements Configurable
+public class DefaultBackend extends AbstractContextPartition
{
/**
* user provided suffix distinguished name for this backend set during
* the Avalon configuration life-cycle phase.
*/
- private Name m_upSuffixDn = null ;
+ private Name upSuffix = null ;
/**
* normalized suffix distinguished name for this backend set during
* the Avalon configuration life-cycle phase.
*/
- private Name m_suffix = null ;
-
-
+ private Name normalizedSuffix = null ;
+
+
// ------------------------------------------------------------------------
- // Backend Interface Method Implementations
+ // C O N S T R U C T O R S
// ------------------------------------------------------------------------
/**
- * @see org.apache.ldap.server.backend.AtomicBackend#getSuffix( boolean )
+ *
+ * @param upSuffix the user provided suffix without normalization
+ * @param normalizedSuffix the normalized suffix
+ * @param db the database to use for this partition
+ * @param searchEngine the search engine to use for this partition
+ * @param indexAttributes the index attrivutes including system attributes
+ * @throws NamingException on failures while creating this partition
*/
- public Name getSuffix( boolean a_normalized )
+ public DefaultBackend( Name upSuffix, Name normalizedSuffix, Database db,
+ SearchEngine searchEngine,
+ AttributeType[] indexAttributes )
+ throws NamingException
{
- if ( a_normalized )
- {
- return m_suffix ;
- }
-
- return m_upSuffixDn ;
+ super( db, searchEngine, indexAttributes );
+
+ this.normalizedSuffix = normalizedSuffix;
+ this.upSuffix = upSuffix;
}
+
+ // ------------------------------------------------------------------------
+ // Backend Interface Method Implementations
+ // ------------------------------------------------------------------------
+
+
/**
- * @see org.apache.ldap.server.backend.Backend#isSuffix( javax.naming.Name )
+ * @see ContextPartition#getSuffix( boolean )
*/
- public boolean isSuffix( Name a_dn ) throws NamingException
+ public Name getSuffix( boolean normalized )
{
- return m_suffix.equals( a_dn ) ;
+ if ( normalized )
+ {
+ return normalizedSuffix ;
+ }
+
+ return upSuffix ;
}
/**
- * @see org.apache.avalon.framework.configuration.Configurable#configure(
- * org.apache.avalon.framework.configuration.Configuration)
+ * @see BackingStore#isSuffix( Name )
*/
- public void configure( Configuration a_config )
+ public boolean isSuffix( Name dn ) throws NamingException
{
- Configuration l_indices = a_config.getChild( "indices" ) ;
+ return normalizedSuffix.equals( dn ) ;
}
}
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 1 16:44:49 2004
@@ -31,7 +31,7 @@
import org.apache.ldap.common.filter.ExprNode;
import org.apache.ldap.common.NotImplementedException;
-
+
/**
* A nexus for partitions dedicated for storing entries specific to a naming
* context. The decision was made to rename this to RootNexus because of the
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/SystemBackend.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/system-backend-impl/src/java/org/apache/ldap/server/backend/SystemBackend.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/system-backend-impl/src/java/org/apache/ldap/server/backend/SystemBackend.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/SystemBackend.java Fri Oct 1 16:44:49 2004
@@ -1,299 +1,46 @@
-/*
- * 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: SystemBackend.java,v 1.18 2003/10/10 00:32:49 akarasulu Exp $
+ * 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
*
- * -- (c) LDAPd Group --
- * -- Please refer to the LICENSE.txt file in the root directory of --
- * -- any LDAPd project for copyright and distribution information. --
+ * 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.ldap.server.backend ;
-
-
-import java.io.File ;
-import java.io.IOException ;
-import java.lang.reflect.Method ;
+package org.apache.eve;
import javax.naming.Name ;
import javax.naming.NamingException ;
import javax.naming.InvalidNameException ;
import javax.naming.directory.Attributes ;
-import org.apache.avalon.framework.logger.Logger ;
-import org.apache.avalon.framework.context.Context ;
-import org.apache.avalon.framework.logger.LogEnabled ;
-import org.apache.avalon.framework.activity.Startable ;
-import org.apache.avalon.framework.service.Serviceable ;
-import org.apache.avalon.framework.service.ServiceManager ;
-import org.apache.avalon.framework.activity.Initializable ;
-import org.apache.avalon.framework.context.ContextException ;
-import org.apache.avalon.framework.context.Contextualizable ;
-import org.apache.avalon.framework.service.ServiceException ;
-import org.apache.avalon.framework.configuration.Configurable ;
-import org.apache.avalon.framework.configuration.Configuration ;
-import org.apache.avalon.framework.configuration.ConfigurationException ;
-
import org.apache.ldap.common.name.LdapName ;
import org.apache.ldap.common.util.NamespaceTools ;
-
-import org.apache.ldap.server.backend.db.Database ;
-import org.apache.ldap.server.backend.db.index.Index ;
-import org.apache.ldap.server.backend.db.DefaultDatabase ;
-import org.apache.ldap.server.backend.db.index.DefaultIndex ;
-import org.apache.ldap.server.backend.db.search.DefaultSearchEngine;
-import org.apache.ldap.server.backend.db.search.SearchEngine;
-import org.apache.ldap.server.schema.attribute.AttributeType ;
+import org.apache.ldap.common.schema.AttributeType;
import org.apache.ldap.common.message.LockableAttributesImpl ;
-import org.apache.ldap.server.schema.attribute.AttributeTypeManager ;
-import org.apache.ldap.server.schema.objectclass.ObjectClassManager;
+
+import org.apache.eve.db.Database;
+import org.apache.eve.db.SearchEngine;
/**
- * Special AtomicBackend implementation used to store system information such
- * as users, the system catalog and other administrative information. The
- * SystemBackend is hardcoded or fixed at ou=system.
- *
- * @phoenix:block
- * @phoenix:service name="org.apache.ldap.server.backend.AtomicBackend"
- * @phoenix:mx-topic name="system-backend"
+ * A very special ContextPartition used to store system information such as
+ * users, the system catalog and other administrative information. This
+ * partition is fixed at the ou=system context.
*
- * @avalon.component name="system-backend" lifestyle="singleton"
- * @avalon.service type="org.apache.ldap.server.backend.AtomicBackend" version="1.0"
- *
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.18 $
+ * @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
+ * @version $Rev$
*/
-public class SystemBackend extends AbstractBackend
- implements
- Startable,
- LogEnabled,
- Serviceable,
- Configurable,
- Initializable,
- Contextualizable
+public class SystemBackend extends AbstractContextPartition
{
- /** Private OID (1.2.6.1.4.1.18060.1.1.3.1) for _ndn op attrib */
- public static final String NDN_OID = "1.2.6.1.4.1.18060.1.1.3.1" ;
- /** Private OID (1.2.6.1.4.1.18060.1.1.3.2) for _updn op attrib */
- public static final String UPDN_OID = "1.2.6.1.4.1.18060.1.1.3.2" ;
- /** Private OID (1.2.6.1.4.1.18060.1.1.3.3) for _existance op attrib */
- public static final String EXISTANCE_OID = "1.2.6.1.4.1.18060.1.1.3.3" ;
- /** Private OID (1.2.6.1.4.1.18060.1.1.3.4) for _hierarchy op attrib */
- public static final String HIERARCHY_OID = "1.2.6.1.4.1.18060.1.1.3.4" ;
- /** Private OID (1.2.6.1.4.1.18060.1.1.3.5) for _oneAlias index */
- public static final String ONEALIAS_OID = "1.2.6.1.4.1.18060.1.1.3.5" ;
- /** Private OID (1.2.6.1.4.1.18060.1.1.3.6) for _subAlias index */
- public static final String SUBALIAS_OID = "1.2.6.1.4.1.18060.1.1.3.6" ;
- /** Private OID (1.2.6.1.4.1.18060.1.1.3.7) for _alias index */
- public static final String ALIAS_OID = "1.2.6.1.4.1.18060.1.1.3.7" ;
-
- /**
+ /**
* System backend suffix constant. Should be kept down to a single Dn name
* component or the default constructor will have to parse it instead of
* building the name. Note that what ever the SUFFIX equals it should be
@@ -302,23 +49,8 @@
public static final String SUFFIX = "ou=system" ;
/** The suffix as a name. */
- private Name m_suffix ;
-
- /** path to the system db wkdir */
- private String m_wkdir ;
-
- /** Logger used by the system backend */
- private Logger m_logger = null ;
-
- /** AttributeTypeManager service we depend on */
- private AttributeTypeManager m_attrTypeMgr = null ;
-
- /** ObjectClassManager service we depend on */
- private ObjectClassManager m_objectClassMgr = null ;
-
- /** SearchEngine used on the database */
- private SearchEngine m_searchEngine = null ;
-
+ private final Name suffix ;
+
// ------------------------------------------------------------------------
// C O N S T R U C T O R S
@@ -326,313 +58,75 @@
/**
- * Default constructor initializes this special backend's suffix. Unlike
- * other AtomicBackends which must specify their suffixes within the
- * configuraton this one does not since it will stay fixed at the following
- * namingContext: ou=system.
- */
- public SystemBackend()
+ * Creates the system partition which is used to store various peices of
+ * information critical for server operation. Things like the system
+ * catalog and other operational information like system users are
+ * maintained within the context of this partition. Unlike other
+ * ContextBackends which must have their suffix specified this one does
+ * not since it will stay fixed at the following namingContext: ou=system.
+ *
+ * @param db the database used for this partition
+ * @param searchEngine the search engine to conduct searches with
+ * @param indexAttributes the attributeTypes of indicies to build which must
+ * also contain all system index attribute types - if not the system will
+ * not operate correctly.
+ */
+ public SystemBackend( Database db, SearchEngine searchEngine,
+ AttributeType[] indexAttributes )
+ throws NamingException
{
- m_suffix = new LdapName() ;
+ super( db, searchEngine, indexAttributes );
+ suffix = new LdapName() ;
try
{
- m_suffix.add( SUFFIX ) ;
+ suffix.add( SUFFIX ) ;
}
catch ( InvalidNameException e )
{
; // Never thrown - name will always be valid!
}
- }
-
- // ------------------------------------------------------------------------
- // B A C K E N D M E T H O D S
- // ------------------------------------------------------------------------
-
-
- /**
- * @see org.apache.ldap.server.backend.AtomicBackend#getSuffix(boolean)
- */
- public final Name getSuffix( boolean a_normalized )
- {
- /*
- * The suffix is presummed to be both the normalized and the user
- * provided form so we do not need to take a_normalized into account.
- */
- return ( Name ) m_suffix.clone() ;
- }
-
-
- /**
- * @see org.apache.ldap.server.backend.Backend#isSuffix(javax.naming.Name)
- */
- public final boolean isSuffix( Name a_dn ) throws NamingException
- {
- return SUFFIX.equals( a_dn.toString() ) ;
- }
-
-
- // ------------------------------------------------------------------------
- // A V A L O N L I F E - C Y C L E M E T H O D S
- // ------------------------------------------------------------------------
-
-
- /**
- * Enables the logger.
- *
- * @param a_logger the logger to enable this component with.
- */
- public void enableLogging( Logger a_logger )
- {
- m_logger = a_logger ;
- }
-
-
- /**
- * @avalon.dependency
- * type="org.apache.ldap.server.schema.attribute.AttributeTypeManager"
- * key="bootstrap-attribute-type-manager" version="1.0"
- *
- * @avalon.dependency
- * type="org.apache.ldap.server.schema.objectclass.ObjectClassManager"
- * key="bootstrap-object-class-manager" version="1.0"
- *
- * @avalon.dependency
- * type="org.apache.ldap.server.backend.db.search.SearchEngine"
- * key="search-engine" version="1.0"
- *
- * @see org.apache.avalon.framework.service.Serviceable#service(
- * org.apache.avalon.framework.service.ServiceManager)
- */
- public void service( ServiceManager a_manager )
- throws ServiceException
- {
- m_attrTypeMgr = ( AttributeTypeManager ) a_manager
- .lookup( "bootstrap-attribute-type-manager" ) ;
- m_objectClassMgr = ( ObjectClassManager ) a_manager
- .lookup( "bootstrap-object-class-manager" ) ;
- m_searchEngine = ( DefaultSearchEngine ) a_manager
- .lookup( "search-engine" ) ;
- }
-
-
- /**
- * @todo Eventually add a avalon.configuration meta tag here to assign a
- * RelaxNG schema to this component's configuration.
- *
- * @see org.apache.avalon.framework.configuration.Configurable#configure(
- * org.apache.avalon.framework.configuration.Configuration)
- */
- public void configure( Configuration a_config )
- throws ConfigurationException
- {
- Database l_db = null ;
- Configuration [] l_indices = null ;
-
- /*
- * Fire up the database and the system indices.
- */
-
- try
- {
- l_db = new DefaultDatabase( m_suffix, m_wkdir ) ;
- m_searchEngine.enableDatabase( l_db ) ;
- setEngine( m_searchEngine ) ;
- setDb( l_db ) ;
-
- AttributeType l_spec = m_attrTypeMgr.lookup( EXISTANCE_OID ) ;
- Index l_idx = new DefaultIndex( l_spec , m_wkdir ) ;
- l_db.setExistanceIndex( l_idx ) ;
-
- l_spec = m_attrTypeMgr.lookup( HIERARCHY_OID ) ;
- l_idx = new DefaultIndex( l_spec , m_wkdir ) ;
- l_db.setHeirarchyIndex( l_idx ) ;
-
- l_spec = m_attrTypeMgr.lookup( UPDN_OID ) ;
- l_idx = new DefaultIndex( l_spec , m_wkdir ) ;
- l_db.setUpdnIndex( l_idx ) ;
-
- l_spec = m_attrTypeMgr.lookup( NDN_OID ) ;
- l_idx = new DefaultIndex( l_spec , m_wkdir ) ;
- l_db.setNdnIndex( l_idx ) ;
-
- l_spec = m_attrTypeMgr.lookup( ONEALIAS_OID ) ;
- l_idx = new DefaultIndex( l_spec, m_wkdir ) ;
- l_db.setOneAliasIndex( l_idx ) ;
-
- l_spec = m_attrTypeMgr.lookup( SUBALIAS_OID ) ;
- l_idx = new DefaultIndex( l_spec, m_wkdir ) ;
- l_db.setSubAliasIndex( l_idx ) ;
-
- l_spec = m_attrTypeMgr.lookup( ALIAS_OID ) ;
- l_idx = new DefaultIndex( l_spec, m_wkdir ) ;
- l_db.setAliasIndex( l_idx ) ;
- }
- catch ( NamingException ne )
- {
- throw new ConfigurationException( "Failed to start database", ne ) ;
- }
-
- /*
- * First up the user defined indices.
- */
-
- l_indices = a_config.getChildren( "index" ) ;
- try
- {
- for ( int ii = 0; ii < l_indices.length; ii++ )
- {
- String l_oid = l_indices[ii].getValue( "oid" ) ;
- AttributeType l_spec = m_attrTypeMgr.lookup( l_oid ) ;
- getDb().addIndexOn( l_spec ) ;
- }
- }
- catch ( NamingException ne )
- {
- throw new ConfigurationException(
- "Could not build all user defined indices", ne ) ;
- }
- }
-
-
- /**
- * Creates the working directory for the system database at a location
- * relative to the avalon work directory and fires up the database. This
- * is possible here in the contextualize phase instead of the configuration
- * phase because the system backend will always be fixed in same relative
- * directory every time:
- * <p>
- * <code>avalon:work/var/modsystem </code>
- * </p>
- * There is no extra configuration required - everything is known about the
- * db location this stage. The only remaining information is the database
- * index configuration.
- *
- * @avalon.entry key="urn:avalon:home" type="java.io.File"
- *
- * @see org.apache.avalon.framework.context.Contextualizable#contextualize(
- * org.apache.avalon.framework.context.Context)
- */
- public void contextualize( Context a_ctx )
- throws ContextException
- {
- File l_wkdir = null ;
- File l_avalonWork = null ;
- Class l_clazz = a_ctx.getClass() ;
- String l_fqcn = "org.apache.avalon.phoenix.BlockContext" ;
- boolean l_isBlockContext = false ;
-
- /*
- * We want to avoid container dependencies and the unnecessary bundling
- * of jars in an embedded configuration so we use reflection to get
- * at the same paramter instead of using a phoenix BlockContext cast.
- * Below in the else portion we access the meta-model Type descriptor
- * for the persistant home directory if using Fortress or Merlin.
- */
-
- Class [] l_interfaces = l_clazz.getInterfaces() ;
- for ( int ii = 0; ii < l_interfaces.length; ii++ )
- {
- if ( l_interfaces[ii].getName().equals( l_fqcn ) )
- {
- l_isBlockContext = true ;
- }
- }
-
- if ( l_isBlockContext )
- {
- try
- {
- Method l_call = l_clazz.getMethod( "getBaseDirectory", null ) ;
- l_avalonWork = ( File ) l_call.invoke( a_ctx, null ) ;
- }
- catch ( Exception e )
- {
- throw new ContextException( "Could not call getBaseDirectory()"
- + " method on BlockContext instance: " + a_ctx, e ) ;
- }
- }
- else
- {
- l_avalonWork = ( File ) a_ctx.get( "urn:avalon:home" ) ;
- }
-
-
- /*
- * With the context path we can create the working directory for the
- * database files and fire up the database with its system indices.
- */
- try
- {
- m_wkdir = l_avalonWork.getCanonicalPath() + File.separatorChar
- + "var/modsystem" ;
- l_wkdir = new File( m_wkdir ) ;
- if ( ! l_wkdir.exists() )
- {
- if ( ! l_wkdir.mkdirs() )
- {
- throw new ContextException( "Cannot create wkdir: "
- + m_wkdir ) ;
- }
- }
- }
- catch ( IOException ioe )
- {
- throw new ContextException( "Could not get cannonical path", ioe ) ;
- }
- }
-
-
- /**
- * Does a few things to initialize the SystemBackend:
- * <ul>
- * <li>Add the suffix entry if it is not already present</li>
- * </ul>
- *
- * @see org.apache.avalon.framework.activity.Initializable#initialize()
- */
- public void initialize() throws Exception
- {
- //
- // Add the suffix entry if it is not present
- //
-
- Attributes l_attributes = getDb().getSuffixEntry() ;
+ // add the root entry for the system root context if it does not exist
+ Attributes l_attributes = db.getSuffixEntry() ;
if ( null == l_attributes )
{
l_attributes = new LockableAttributesImpl() ;
l_attributes.put( "objectClass", "top" ) ;
l_attributes.put( "objectClass", "organizationalUnit" ) ;
- l_attributes.put( NamespaceTools.getRdnAttribute( SUFFIX ),
+ l_attributes.put( NamespaceTools.getRdnAttribute( SUFFIX ),
NamespaceTools.getRdnValue( SUFFIX ) ) ;
- getDb().add( SUFFIX, m_suffix, l_attributes ) ;
- m_logger.info( "Added suffix '" + SUFFIX
- + "' for system backend" ) ;
+ getDb().add( SUFFIX, suffix, l_attributes ) ;
+ //m_logger.info( "Added suffix '" + SUFFIX
+ // + "' for system backend" ) ;
}
}
+ // ------------------------------------------------------------------------
+ // B A C K E N D M E T H O D S
+ // ------------------------------------------------------------------------
+
+
/**
- * Does nothing at the present moment but had to implement it since we need
- * stop which closes the db and Startable has both start and stop methods.
- *
- * @see org.apache.avalon.framework.activity.Startable#start()
+ * @see ContextPartition#getSuffix(boolean)
*/
- public void start()
+ public final Name getSuffix( boolean normalized )
{
- // does nothing at the present moment
+ /*
+ * The suffix is presummed to be both the normalized and the user
+ * provided form so we do not need to take a_normalized into account.
+ */
+ return ( Name ) suffix.clone() ;
}
/**
- * Stops this module by closing its database.
- *
- * @see org.apache.avalon.framework.activity.Startable#stop()
+ * @see BackingStore#isSuffix(javax.naming.Name)
*/
- public void stop() throws Exception
+ public final boolean isSuffix( Name dn )
{
- getDb().close() ;
+ return SUFFIX.equals( dn.toString() ) ;
}
}
Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/Database.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/Database.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/Database.java Fri Oct 1 16:44:49 2004
@@ -139,55 +139,55 @@
* Sets the system index defined on the ALIAS_ATTRIBUTE which for LDAP would
* be the aliasedObjectName and for X.500 would be aliasedEntryName.
*
- * @param idx the index on the ALIAS_ATTRIBUTE
+ * @param attrType the index on the ALIAS_ATTRIBUTE
*/
- void setAliasIndex( Index idx );
+ void setAliasIndexOn( AttributeType attrType ) throws NamingException;
/**
* Sets the attribute existance Index.
*
- * @param idx the attribute existance Index
+ * @param attrType the attribute existance Index
*/
- void setExistanceIndex( Index idx );
+ void setExistanceIndexOn( AttributeType attrType ) throws NamingException;
/**
* Sets the heirarchy Index.
*
- * @param idx the heirarchy Index
+ * @param attrType the heirarchy Index
*/
- void setHeirarchyIndex( Index idx );
+ void setHeirarchyIndexOn( AttributeType attrType ) throws NamingException;
/**
* Sets the user provided distinguished name Index.
*
- * @param idx the updn Index
+ * @param attrType the updn Index
*/
- void setUpdnIndex( Index idx );
+ void setUpdnIndexOn( AttributeType attrType ) throws NamingException;
/**
* Sets the normalized distinguished name Index.
*
- * @param idx the ndn Index
+ * @param attrType the ndn Index
*/
- void setNdnIndex( Index idx );
+ void setNdnIndexOn( AttributeType attrType ) throws NamingException;
/**
* Sets the alias index mapping parent entries with scope expanding aliases
* children one level below them; this system index is used to dereference
* aliases on one/single level scoped searches.
*
- * @param idx a one level alias index
+ * @param attrType a one level alias index
*/
- void setOneAliasIndex( Index idx );
+ void setOneAliasIndexOn( AttributeType attrType ) throws NamingException;
/**
* Sets the alias index mapping relative entries with scope expanding
* alias descendents; this system index is used to dereference aliases on
* subtree scoped searches.
*
- * @param idx a subtree alias index
+ * @param attrType a subtree alias index
*/
- void setSubAliasIndex( Index idx );
+ void setSubAliasIndexOn( AttributeType attrType ) throws NamingException;
/**
* TODO Document me!
Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java Fri Oct 1 16:44:49 2004
@@ -86,6 +86,12 @@
/** a system index on aliasedObjectName attribute */
private Index aliasIdx;
+
+ // ------------------------------------------------------------------------
+ // C O N S T R U C T O R S
+ // ------------------------------------------------------------------------
+
+
/**
* Creates a Databased based on JDBM B+Trees.
*
@@ -120,6 +126,11 @@
}
+ // ------------------------------------------------------------------------
+ // I N D E X M E T H O D S
+ // ------------------------------------------------------------------------
+
+
/**
* @see Database#addIndexOn(AttributeType)
*/
@@ -140,14 +151,18 @@
/**
- * Sets the attribute existance Index.
- *
- * @param idx the attribute existance Index
+ * @see Database#setExistanceIndexOn(AttributeType)
*/
- public void setExistanceIndex( Index idx )
+ public void setExistanceIndexOn( AttributeType attrType ) throws NamingException
{
- existanceIdx = idx;
- sysIndices.put( idx.getAttribute().getName().toLowerCase(), idx );
+ if ( existanceIdx != null )
+ {
+ NamingException e = new NamingException( "Index already set!" );
+ throw e;
+ }
+
+ existanceIdx = new JdbmIndex( attrType, wkdir );
+ sysIndices.put( attrType.getName().toLowerCase(), existanceIdx );
}
@@ -161,24 +176,18 @@
/**
- * Sets the heirarchy Index.
- *
- * @param idx the heirarchy Index
- */
- public void setHeirarchyIndex( Index idx )
+ * @see Database#setExistanceIndexOn(AttributeType)
+ */
+ public void setHeirarchyIndexOn( AttributeType attrType ) throws NamingException
{
- heirarchyIdx = idx;
- sysIndices.put( idx.getAttribute().getName().toLowerCase()
- , idx );
- }
+ if ( heirarchyIdx != null )
+ {
+ NamingException e = new NamingException( "Index already set!" );
+ throw e;
+ }
-
- /**
- * @see Database#getUpdnIndex()
- */
- public Index getUpdnIndex()
- {
- return updnIdx;
+ heirarchyIdx = new JdbmIndex( attrType, wkdir );
+ sysIndices.put( attrType.getName().toLowerCase(), heirarchyIdx );
}
@@ -192,12 +201,18 @@
/**
- * @see Database#setAliasIndex(Index)
+ * @see Database#setAliasIndexOn(AttributeType)
*/
- public void setAliasIndex( Index idx )
+ public void setAliasIndexOn( AttributeType attrType ) throws NamingException
{
- aliasIdx = idx;
- sysIndices.put( idx.getAttribute().getName().toLowerCase(), idx );
+ if ( aliasIdx != null )
+ {
+ NamingException e = new NamingException( "Index already set!" );
+ throw e;
+ }
+
+ aliasIdx = new JdbmIndex( attrType, wkdir );
+ sysIndices.put( attrType.getName().toLowerCase(), aliasIdx );
}
@@ -211,12 +226,18 @@
/**
- * @see Database#setOneAliasIndex(Index)
+ * @see Database#setOneAliasIndexOn(AttributeType)
*/
- public void setOneAliasIndex( Index idx )
+ public void setOneAliasIndexOn( AttributeType attrType ) throws NamingException
{
- oneAliasIdx = idx;
- sysIndices.put( idx.getAttribute().getName().toLowerCase(), idx );
+ if ( oneAliasIdx != null )
+ {
+ NamingException e = new NamingException( "Index already set!" );
+ throw e;
+ }
+
+ oneAliasIdx = new JdbmIndex( attrType, wkdir );
+ sysIndices.put( attrType.getName().toLowerCase(), oneAliasIdx );
}
@@ -230,24 +251,43 @@
/**
- * @see Database#setSubAliasIndex(Index)
+ * @see Database#setSubAliasIndexOn(AttributeType)
*/
- public void setSubAliasIndex( Index idx )
+ public void setSubAliasIndexOn( AttributeType attrType ) throws NamingException
{
- subAliasIdx = idx;
- sysIndices.put( idx.getAttribute().getName().toLowerCase(), idx );
+ if ( subAliasIdx != null )
+ {
+ NamingException e = new NamingException( "Index already set!" );
+ throw e;
+ }
+
+ subAliasIdx = new JdbmIndex( attrType, wkdir );
+ sysIndices.put( attrType.getName().toLowerCase(), subAliasIdx );
}
/**
- * Sets the user provided distinguished name Index.
- *
- * @param idx the updn Index
- */
- public void setUpdnIndex( Index idx )
+ * @see Database#getUpdnIndex()
+ */
+ public Index getUpdnIndex()
{
- updnIdx = idx;
- sysIndices.put( idx.getAttribute().getName().toLowerCase(), idx );
+ return updnIdx;
+ }
+
+
+ /**
+ * @see Database#setUpdnIndexOn(AttributeType)
+ */
+ public void setUpdnIndexOn( AttributeType attrType ) throws NamingException
+ {
+ if ( updnIdx != null )
+ {
+ NamingException e = new NamingException( "Index already set!" );
+ throw e;
+ }
+
+ updnIdx = new JdbmIndex( attrType, wkdir );
+ sysIndices.put( attrType.getName().toLowerCase(), updnIdx );
}
@@ -261,14 +301,18 @@
/**
- * Sets the normalized distinguished name Index.
- *
- * @param idx the ndn Index
- */
- public void setNdnIndex( Index idx )
+ * @see Database#setNdnIndexOn(AttributeType)
+ */
+ public void setNdnIndexOn( AttributeType attrType ) throws NamingException
{
- ndnIdx = idx;
- sysIndices.put( idx.getAttribute().getName().toLowerCase(), idx );
+ if ( ndnIdx != null )
+ {
+ NamingException e = new NamingException( "Index already set!" );
+ throw e;
+ }
+
+ ndnIdx = new JdbmIndex( attrType, wkdir );
+ sysIndices.put( attrType.getName().toLowerCase(), ndnIdx );
}
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/AfterFailurePipeline.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/AfterFailurePipeline.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/AfterFailurePipeline.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/AfterFailurePipeline.java Fri Oct 1 16:44:49 2004
@@ -1,218 +1,4 @@
-/*
- * 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: AfterFailurePipeline.java,v 1.2 2003/11/26 06:14:45 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 10, 2003
- */
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi ;
/**
@@ -221,16 +7,13 @@
* exceptions are added to the afterFailure list of exceptions on the
* Invocation.
*
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.2 $
*/
public class AfterFailurePipeline extends InterceptorPipeline
{
/**
* Returns false all the time!
*
- * @see org.apache.ldap.server.jndi.InterceptorPipeline#isFailFast()
+ * @see InterceptorPipeline#isFailFast()
*/
public final boolean isFailFast()
{
@@ -246,7 +29,7 @@
* Invocation's list of afterFailure exceptions. The last error if any to
* result after all Interceptors have run is thrown.
*
- * @see org.apache.ldap.server.jndi.Interceptor#invoke(org.apache.ldap.server.jndi.Invocation)
+ * @see Interceptor#invoke(Invocation)
*/
public void invoke( Invocation a_invocation ) throws InterceptorException
{
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/DirServerContext.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/DirServerContext.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/DirServerContext.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/DirServerContext.java Fri Oct 1 16:44:49 2004
@@ -1,218 +1,4 @@
-/*
- * 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: DirServerContext.java,v 1.4 2003/11/28 15:46:21 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 6, 2003
- */
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi;
import java.io.IOException ;
@@ -222,7 +8,6 @@
import javax.naming.Name ;
import javax.naming.ldap.Control ;
import javax.naming.NamingException ;
-import javax.naming.ldap.LdapContext ;
import javax.naming.NamingEnumeration ;
import javax.naming.directory.Attribute;
import javax.naming.directory.Attributes ;
@@ -240,19 +25,14 @@
import org.apache.ldap.common.util.NamespaceTools ;
import org.apache.ldap.common.filter.FilterParserImpl ;
-import org.apache.ldap.server.nexus.BackendNexus ;
+import org.apache.eve.PartitionNexus;
/**
* The DirContext implementation for the Server Side JNDI LDAP provider.
*
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.4 $
*/
-public class DirServerContext
- extends ServerContext
- implements DirContext
+public class DirServerContext extends ServerContext implements DirContext
{
@@ -268,8 +48,7 @@
* @param a_env the environment used for this context
* @throws NamingException if something goes wrong
*/
- public DirServerContext( BackendNexus a_nexusProxy, Hashtable a_env )
- throws NamingException
+ public DirServerContext( PartitionNexus a_nexusProxy, Hashtable a_env ) throws NamingException
{
super( a_nexusProxy, a_env ) ;
}
@@ -282,12 +61,8 @@
* @param a_nexusProxy the intercepting proxy to the nexus
* @param a_env the environment properties used by this context
* @param a_dn the distinguished name of this context
- * @throws NamingException if the environment parameters are not set
- * correctly
*/
- protected DirServerContext( BackendNexus a_nexusProxy, Hashtable a_env,
- LdapName a_dn )
- throws NamingException
+ protected DirServerContext( PartitionNexus a_nexusProxy, Hashtable a_env, LdapName a_dn )
{
super( a_nexusProxy, a_env, a_dn ) ;
}
@@ -501,8 +276,8 @@
getNexusProxy().add( l_target.toString(), l_target, l_attributes ) ;
// Initialize the new context
- LdapServerContext l_ctx = new LdapServerContext(
- getNexusProxy(), getEnvironment(), l_target ) ;
+ LdapServerContext l_ctx = new LdapServerContext( getNexusProxy(),
+ getEnvironment(), l_target ) ;
Control [] l_controls = ( Control [] )
( ( LdapServerContext ) this ).getRequestControls().clone() ;
l_ctx.setRequestControls( l_controls ) ;
@@ -635,8 +410,7 @@
{
PresenceNode l_filter = new PresenceNode( "objectClass" ) ;
return getNexusProxy().search( l_target , getEnvironment(),
- l_filter, ( ( LdapContext ) this ).getRequestControls(),
- l_ctls ) ;
+ l_filter, l_ctls ) ;
}
/*
@@ -683,8 +457,7 @@
}
return getNexusProxy().search( l_target , getEnvironment(),
- l_filter, ( ( LdapContext ) this ).getRequestControls(),
- l_ctls ) ;
+ l_filter, l_ctls ) ;
}
@@ -737,8 +510,7 @@
}
return getNexusProxy().search( l_target , getEnvironment(),
- l_filter, ( ( LdapContext ) this ).getRequestControls(),
- new SearchControls() ) ;
+ l_filter, new SearchControls() ) ;
}
@@ -766,7 +538,6 @@
public NamingEnumeration search( Name a_name, String a_filterExpr,
Object[] a_filterArgs, SearchControls a_cons ) throws NamingException
{
- int l_index ;
int l_start ;
StringBuffer l_buf = new StringBuffer( a_filterExpr ) ;
@@ -787,9 +558,6 @@
{
ii++ ;
}
-
- // We hit end of a variable so we cut the variable index out of it
- l_index = Integer.parseInt( l_buf.substring( l_start + 1, ii ) ) ;
/*
* Replace the '{ i }' with the string representation of the value
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/FailFastPipeline.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/FailFastPipeline.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/FailFastPipeline.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/FailFastPipeline.java Fri Oct 1 16:44:49 2004
@@ -1,218 +1,4 @@
-/*
- * 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: FailFastPipeline.java,v 1.2 2003/11/28 15:46:21 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 10, 2003
- */
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi ;
/**
@@ -220,9 +6,6 @@
* to fail within the invocation chain of the pipeline shorts the invocation of
* interceptors downstream of the error.
*
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.2 $
*/
public class FailFastPipeline extends InterceptorPipeline
{
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/Interceptor.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/Interceptor.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/Interceptor.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/Interceptor.java Fri Oct 1 16:44:49 2004
@@ -1,219 +1,4 @@
-/*
- * 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: Interceptor.java,v 1.2 2003/11/28 15:46:21 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 7, 2003
- */
-
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi ;
/**
@@ -230,14 +15,9 @@
*
* @author <a href="mailto:peter@realityforge.org">Peter Donald</a>
* @author <a href="mailto:akarasulu@apache.org">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.2 $
*/
public interface Interceptor
{
- /** Avalon ROLE for an Interceptor */
- String ROLE = Interceptor.class.getName() ;
-
/**
* Process a particular invocation.
* The method must NEVER throw an exception and any exceptions should be
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/InterceptorException.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/InterceptorException.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/InterceptorException.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/InterceptorException.java Fri Oct 1 16:44:49 2004
@@ -1,219 +1,4 @@
-/*
- * 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: InterceptorException.java,v 1.1 2003/09/03 03:36:15 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 javax.naming.NamingException ;
@@ -221,12 +6,9 @@
/**
* Exception thrown by an Interceptor while intercepting an Invocation.
* Interceptor failures caught from the
- * {@link org.apache.ldap.server.jndi.JndiProvider#invoke(Object, Method, Object[])}
+ * {@link JndiProvider#invoke(Object, Method, Object[])}
* method are bundled as InterceptorExceptions and rethrown.
*
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.1 $
*/
public class InterceptorException extends NamingException
{
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/InterceptorPipeline.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/InterceptorPipeline.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/InterceptorPipeline.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/InterceptorPipeline.java Fri Oct 1 16:44:49 2004
@@ -1,219 +1,4 @@
-/*
- * 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: InterceptorPipeline.java,v 1.2 2003/11/28 15:46:21 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 7, 2003
- */
-
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi;
import java.util.List ;
@@ -224,9 +9,6 @@
* An Interceptor composed of a pipeline of interceptors that can be called
* sequentially with one invokation.
*
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.2 $
*/
public abstract class InterceptorPipeline
implements Interceptor
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/Invocation.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/Invocation.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/Invocation.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/Invocation.java Fri Oct 1 16:44:49 2004
@@ -1,219 +1,4 @@
-/*
- * 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: Invocation.java,v 1.1 2003/09/03 03:36:15 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 7, 2003
- */
-
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi;
import java.util.List;
@@ -235,7 +20,6 @@
*
* @author <a href="mailto:peter at realityforge.org">Peter Donald</a>
* @author <a href="mailto:aok123 at bellsouth.net">Alex Karasulu</a>
- * @author $author$
*/
public class Invocation
implements Serializable
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/InvocationStateEnum.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/InvocationStateEnum.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/InvocationStateEnum.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/InvocationStateEnum.java Fri Oct 1 16:44:49 2004
@@ -1,229 +1,12 @@
-/*
- * 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: InvocationStateEnum.java,v 1.1 2003/09/03 03:36:15 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 10, 2003
- */
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi ;
-import org.apache.avalon.framework.ValuedEnum ;
+import org.apache.ldap.common.util.ValuedEnum;
/**
* Enumeration type for the states an Invocation object goes through.
*
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.1 $
*/
public class InvocationStateEnum extends ValuedEnum
{
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JavaLdap.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JavaLdap.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JavaLdap.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JavaLdap.java Fri Oct 1 16:44:49 2004
@@ -1,218 +1,4 @@
-/*
- * 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: JavaLdap.java,v 1.1 2003/09/03 03:36:15 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 6, 2003
- */
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi ;
import java.io.ByteArrayInputStream ;
import java.io.ByteArrayOutputStream ;
@@ -230,9 +16,6 @@
* objects within an LDAP directory.
*
* @see <a href="http://www.faqs.org/rfcs/rfc2713.html">RFC 2713</a>
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.1 $
*/
public class JavaLdap
{
@@ -240,22 +23,22 @@
// Attribute Id Constants Used By The Java LDAP Schema
// ------------------------------------------------------------------------
- /** TODO */
+ /** */
public static final String TOP_ATTR = "top" ;
- /** TODO */
+ /** */
public static final String JOBJECT_ATTR = "javaObject" ;
- /** TODO */
+ /** */
public static final String OBJECTCLASS_ATTR = "objectClass" ;
- /** TODO */
+ /** */
public static final String JCONTAINER_ATTR = "javaContainer" ;
- /** TODO */
+ /** */
public static final String JSERIALIZEDOBJ_ATTR = "javaSerializedObject" ;
- /** TODO */
+ /** */
public static final String JCLASSNAME_ATTR = "javaClassName" ;
- /** TODO */
+ /** */
public static final String JCLASSNAMES_ATTR = "javaClassNames" ;
- /** TODO */
+ /** */
public static final String JSERIALDATA_ATTR = "javaSerializedData" ;
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JndiProvider.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JndiProvider.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JndiProvider.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JndiProvider.java Fri Oct 1 16:44:49 2004
@@ -1,221 +1,7 @@
-/*
- * 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: JndiProvider.java,v 1.1 2003/09/03 03:36:15 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. --
- *
- */
-
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi;
-import java.util.Hashtable ;
+import java.util.Hashtable;
import javax.naming.NamingException ;
import javax.naming.ldap.LdapContext ;
@@ -223,25 +9,16 @@
/**
*
- *
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.1 $
*/
public interface JndiProvider
{
- /** Service ROLE for Avalon */
- String ROLE = JndiProvider.class.getName() ;
-
-
/**
* Gets an LdapContext to attach to a point in the DIT using the supplied
* environment parameters.
*
- * @param an_environment environment settings to use for the context
+ * @param env environment settings to use for the context
* @return an LdapContext using the supplied environment
* @throws NamingException if something goes wrong
*/
- LdapContext getLdapContext( Hashtable an_environment )
- throws NamingException ;
+ LdapContext getLdapContext( Hashtable env ) throws NamingException ;
}
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JndiProviderModule.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JndiProviderModule.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/JndiProviderModule.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JndiProviderModule.java Fri Oct 1 16:44:49 2004
@@ -1,219 +1,8 @@
-/*
- * 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: JndiProviderModule.java,v 1.3 2003/11/26 06:14:45 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. --
- *
- */
+package org.apache.eve.jndi ;
-package org.apache.ldap.server.jndi ;
+import org.apache.eve.RootNexus;
+import org.apache.eve.PartitionNexus;
import java.util.Hashtable ;
@@ -224,25 +13,12 @@
import javax.naming.NamingException ;
import javax.naming.ldap.LdapContext ;
-import org.apache.avalon.framework.service.Serviceable ;
-import org.apache.avalon.framework.service.ServiceManager ;
-import org.apache.avalon.framework.service.ServiceException ;
-
-import org.apache.ldap.server.nexus.BackendNexus ;
-
/**
* JndiProvider service implementing block.
*
- * @avalon.component name="jndi-provider" lifestyle="singleton"
- * @avalon.service type="org.apache.ldap.server.jndi.JndiProvider" version="1.0"
- *
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.3 $
*/
-public class JndiProviderModule
- implements JndiProvider, InvocationHandler, Serviceable
+public class JndiProviderModule implements JndiProvider, InvocationHandler
{
/** Singleton instance of this class */
private static JndiProviderModule s_singleton = null ;
@@ -253,10 +29,10 @@
private InterceptorPipeline m_before = new FailFastPipeline() ;
/** Interceptor of interceptors in post-invocation pipeline failure */
private InterceptorPipeline m_afterFailure = new AfterFailurePipeline() ;
- /** BackendNexus as it was given to us by the ServiceManager */
- private BackendNexus m_nexus = null ;
- /** BackendNexus proxy wrapping m_nexus to inject services */
- private BackendNexus m_proxy = null ;
+ /** RootNexus as it was given to us by the ServiceManager */
+ private RootNexus m_nexus = null ;
+ /** PartitionNexus proxy wrapping m_nexus to inject services */
+ private PartitionNexus m_proxy = null ;
// ------------------------------------------------------------------------
@@ -271,7 +47,7 @@
* @throws IllegalStateException if another JndiProviderModule has already
* been instantiated.
*/
- public JndiProviderModule()
+ public JndiProviderModule( RootNexus nexus )
{
if ( s_singleton != null )
{
@@ -280,6 +56,11 @@
}
s_singleton = this ;
+ this.m_nexus = nexus;
+ this.m_proxy = ( PartitionNexus ) Proxy.newProxyInstance(
+ m_nexus.getClass().getClassLoader(),
+ m_nexus.getClass().getInterfaces(), this ) ;
+
}
@@ -306,10 +87,9 @@
/**
- * @see org.apache.ldap.server.jndi.JndiProvider#getLdapContext()
+ * @see JndiProvider#getLdapContext(Hashtable)
*/
- public LdapContext getLdapContext( Hashtable an_env )
- throws NamingException
+ public LdapContext getLdapContext( Hashtable an_env ) throws NamingException
{
return new LdapServerContext( m_proxy, an_env ) ;
}
@@ -450,30 +230,5 @@
throw new IllegalStateException( "The JndiProviderModule's invocation "
+ "handler method invoke should never have reached this line" ) ;
- }
-
-
- // ------------------------------------------------------------------------
- // Avalon Lifecycle Methods
- // ------------------------------------------------------------------------
-
-
- /**
- * Gets a handle on the UnifiedBackend service aka NexusModule.
- *
- * @avalon.dependency
- * type="org.apache.ldap.server.nexus.BackendNexus"
- * key="backend-nexus" version="1.0"
- *
- * @see org.apache.avalon.framework.service.Serviceable#service(
- * org.apache.avalon.framework.service.ServiceManager)
- */
- public void service( ServiceManager a_manager )
- throws ServiceException
- {
- m_nexus = ( BackendNexus ) a_manager.lookup( "backend-nexus" ) ;
- m_proxy = ( BackendNexus ) Proxy.newProxyInstance(
- m_nexus.getClass().getClassLoader(),
- m_nexus.getClass().getInterfaces(), this ) ;
}
}
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/LdapServerContext.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/LdapServerContext.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/LdapServerContext.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/LdapServerContext.java Fri Oct 1 16:44:49 2004
@@ -1,218 +1,5 @@
-/*
- * 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.
- *
- */
+package org.apache.eve.jndi ;
-/*
- * $Id: LdapServerContext.java,v 1.1 2003/09/03 03:36:15 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 6, 2003
- */
-package org.apache.ldap.server.jndi ;
import java.util.Hashtable ;
@@ -223,15 +10,12 @@
import javax.naming.ldap.LdapContext ;
import org.apache.ldap.common.name.LdapName ;
-import org.apache.ldap.server.nexus.BackendNexus;
+
+import org.apache.eve.PartitionNexus;
/**
- * TODO Document me!
*
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.1 $
*/
public class LdapServerContext extends DirServerContext implements LdapContext
{
@@ -241,13 +25,10 @@
*
* @param a_nexusProxy TODO
* @param a_env TODO
- * @throws NamingException TODO
*/
- public LdapServerContext( BackendNexus a_nexusProxy, Hashtable a_env )
- throws NamingException
+ public LdapServerContext( PartitionNexus a_nexusProxy, Hashtable a_env ) throws NamingException
{
super( a_nexusProxy, a_env ) ;
- // TODO Auto-generated constructor stub
}
@@ -258,12 +39,8 @@
* @param a_nexusProxy the intercepting proxy to the nexus
* @param a_env the environment properties used by this context
* @param a_dn the distinguished name of this context
- * @throws NamingException if the environment parameters are not set
- * correctly
*/
- LdapServerContext( BackendNexus a_nexusProxy, Hashtable a_env,
- LdapName a_dn )
- throws NamingException
+ LdapServerContext( PartitionNexus a_nexusProxy, Hashtable a_env, LdapName a_dn )
{
super( a_nexusProxy, a_env, a_dn ) ;
}
@@ -274,7 +51,6 @@
* javax.naming.ldap.ExtendedRequest)
*/
public ExtendedResponse extendedOperation( ExtendedRequest a_request )
- throws NamingException
{
// TODO Auto-generated method stub
return null ;
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/ServerContext.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/ServerContext.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/ServerContext.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/ServerContext.java Fri Oct 1 16:44:49 2004
@@ -1,218 +1,4 @@
-/*
- * 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: ServerContext.java,v 1.4 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. --
- *
- */
-
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi;
import java.util.Hashtable ;
@@ -221,7 +7,6 @@
import javax.naming.Context ;
import javax.naming.NameParser ;
import javax.naming.ldap.Control ;
-import javax.naming.ldap.LdapContext;
import javax.naming.NamingException ;
import javax.naming.NamingEnumeration ;
import javax.naming.directory.Attributes ;
@@ -233,26 +18,20 @@
import org.apache.ldap.common.util.NamespaceTools ;
import org.apache.ldap.common.message.LockableAttributesImpl ;
-import org.apache.ldap.server.nexus.BackendNexus ;
+import org.apache.eve.PartitionNexus;
/**
* A non-federated abstract Context implementation.
*
- * TODO Need a serious test suit around this one!
- *
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.4 $
*/
abstract class ServerContext implements Context
{
/** */
- public static final String DELETE_OLD_RDN_PROP =
- "java.naming.ldap.deleteRDN" ;
-
+ public static final String DELETE_OLD_RDN_PROP = "java.naming.ldap.deleteRDN" ;
+
/** The interceptor proxy to the backend nexus */
- private final BackendNexus m_nexusProxy ;
+ private final PartitionNexus m_nexusProxy ;
/** The cloned environment used by this Context */
private final Hashtable m_env ;
/** The distinguished name of this Context */
@@ -273,8 +52,7 @@
* @throws NamingException if the environment parameters are not set
* correctly.
*/
- protected ServerContext( BackendNexus a_nexusProxy, Hashtable a_env )
- throws NamingException
+ protected ServerContext( PartitionNexus a_nexusProxy, Hashtable a_env ) throws NamingException
{
m_nexusProxy = a_nexusProxy ;
m_env = ( Hashtable ) a_env.clone() ;
@@ -304,12 +82,8 @@
* @param a_nexusProxy the intercepting proxy to the nexus
* @param a_env the environment properties used by this context
* @param a_dn the distinguished name of this context
- * @throws NamingException if the environment parameters are not set
- * correctly
*/
- protected ServerContext( BackendNexus a_nexusProxy, Hashtable a_env,
- LdapName a_dn )
- throws NamingException
+ protected ServerContext( PartitionNexus a_nexusProxy, Hashtable a_env, LdapName a_dn )
{
m_dn = ( LdapName ) a_dn.clone() ;
m_env = ( Hashtable ) a_env.clone() ;
@@ -324,11 +98,11 @@
/**
- * Gets the BackendNexus proxy.
+ * Gets the RootNexus proxy.
*
* @return the proxy to the backend nexus.
*/
- protected BackendNexus getNexusProxy()
+ protected PartitionNexus getNexusProxy()
{
return m_nexusProxy ;
}
@@ -511,9 +285,6 @@
*/
Attributes l_attributes = new LockableAttributesImpl() ;
Name l_target = buildTarget( a_name ) ;
- String l_rdn = a_name.get( a_name.size() - 1 ) ;
- String l_rdnAttribute = NamespaceTools.getRdnAttribute( l_rdn ) ;
- String l_rdnValue = NamespaceTools.getRdnValue( l_rdn ) ;
// Serialize object into entry attributes and add it.
JavaLdap.serialize( l_attributes, a_obj ) ;
@@ -570,7 +341,7 @@
if ( a_oldName.size() == a_newName.size() &&
l_oldBase.equals( l_newBase ) )
{
- m_nexusProxy.modifyRdn( l_oldDn, l_newRdn, l_delOldRdn ) ;
+ m_nexusProxy.modifyRn( l_oldDn, l_newRdn, l_delOldRdn ) ;
}
else
{
@@ -757,7 +528,7 @@
l_ctls.setSearchScope( SearchControls.ONELEVEL_SCOPE ) ;
return m_nexusProxy.search( l_base , getEnvironment(), l_filter,
- ( ( LdapContext ) this ).getRequestControls(), l_ctls ) ;
+ l_ctls ) ;
}
Copied: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/ServerContextFactory.java (from rev 47436, incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/ServerContextFactory.java)
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/jndi-provider/src/java/org/apache/ldap/server/jndi/ServerContextFactory.java (original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/ServerContextFactory.java Fri Oct 1 16:44:49 2004
@@ -1,224 +1,11 @@
-/*
- * 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: ServerContextFactory.java,v 1.2 2003/11/25 19:22:42 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. --
- *
- */
-
-package org.apache.ldap.server.jndi ;
+package org.apache.eve.jndi;
import java.util.Hashtable ;
import javax.naming.Context ;
import javax.naming.NamingException ;
+import javax.naming.spi.InitialContextFactory;
import org.apache.ldap.common.NotImplementedException;
@@ -226,13 +13,15 @@
/**
* An LDAPd server-side provider implementation of a InitialContextFactory.
*
+ * Hashtable env = new Hashtable() ;
+ env.put( Context.PROVIDER_URL, "ou=system" ) ;
+ env.put( Context.INITIAL_CONTEXT_FACTORY,
+ "org.apache.eve.jndi.ServerContextFactory" ) ;
+ InitialContext initialContext = new InitialContext( env ) ;
+
* @see javax.naming.spi.InitialContextFactory
- * @author <a href="mailto:aok123@bellsouth.net">Alex Karasulu</a>
- * @author $Author: akarasulu $
- * @version $Revision: 1.2 $
*/
-public class ServerContextFactory
- implements javax.naming.spi.InitialContextFactory
+public class ServerContextFactory implements InitialContextFactory
{
/** The singleton JndiProviderModule instance */
private JndiProviderModule m_provider = null ;
Modified: incubator/directory/eve/trunk/backend/sandbox/position.txt
==============================================================================
--- incubator/directory/eve/trunk/backend/sandbox/position.txt (original)
+++ incubator/directory/eve/trunk/backend/sandbox/position.txt Fri Oct 1 16:44:49 2004
@@ -1,11 +1,11 @@
This is where I am with the migration process into the form we intend to
have for the final configuration of Eve's backend.
-system-backend-impl/ - not done
-default-backend-impl/ - not done
-jndi-provider/ - not done
backend-database-viewer/ - not done
schema-api/ - partially
+jndi-provider/ - DONE
+default-backend-impl/ - DONE
+system-backend-impl/ - DONE
backend-nexus-api/ - DONE
backend-nexus-impl/ - DONE
backend-api/ - DONE