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 2005/01/07 18:15:50 UTC
svn commit: r124541 - in incubator/directory/server/trunk: core/src/main/java/org/apache/ldap/server core/src/main/java/org/apache/ldap/server/db/gui core/src/main/java/org/apache/ldap/server/exception core/src/main/java/org/apache/ldap/server/jndi core/src/main/java/org/apache/ldap/server/jndi/ibs core/src/test/org/apache/ldap/server/jndi core/src/test/org/apache/ldap/server/jndi/ibs main main/src/main/java/org/apache/ldap/server
Author: akarasulu
Date: Fri Jan 7 09:15:48 2005
New Revision: 124541
URL: http://svn.apache.org/viewcvs?view=rev&rev=124541
Log:
changes ...
o renamed all classes prefixed with name Eve to Server
o renamed all env properties prefixed eve. to server.
o using server-work as default working directory instead of eve-work
o output no longer has Eve: prefix
Added:
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackendSubsystem.java
- copied, changed from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/server.gif
- copied unchanged from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/eve.gif
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/InterceptorException.java
- copied, changed from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java
- copied, changed from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java
- copied, changed from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
- copied, changed from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java
- copied, changed from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java
- copied, changed from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ServerExceptionService.java
- copied, changed from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java
incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ServerContextFactoryTest.java
- copied, changed from r124525, incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java
incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/ServerExceptionServiceTest.java
- copied, changed from r124525, incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java
incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java
- copied, changed from r124531, incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java
Removed:
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/eve.gif
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java
incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java
incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java
incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java
Modified:
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/OnErrorPipeline.java
incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java
incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java
incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractMultiUserJndiTest.java
incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java
incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java
incubator/directory/server/trunk/main/project.properties
Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackendSubsystem.java (from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackendSubsystem.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java&r1=124527&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackendSubsystem.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/BackendSubsystem.java Fri Jan 7 09:15:48 2005
@@ -9,7 +9,7 @@
/**
*
*/
-public interface EveBackendSubsystem
+public interface BackendSubsystem
{
/**
* Gets an LdapContext to attach to a point in the DIT using the supplied
Deleted: /incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/EveBackendSubsystem.java?view=auto&rev=124540
==============================================================================
Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java&r1=124540&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/AboutDialog.java Fri Jan 7 09:15:48 2005
@@ -115,7 +115,7 @@
new java.awt.Insets(5, 5, 5, 0), 0, 0));
image.setText("Eve");
- image.setIcon( new ImageIcon( getClass().getResource( "eve.gif" ) ) );
+ image.setIcon( new ImageIcon( getClass().getResource( "server.gif" ) ) );
image.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
image.setMinimumSize(new java.awt.Dimension(98,44));
Deleted: /incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/eve.gif
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/eve.gif?view=auto&rev=124540
==============================================================================
Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/server.gif (from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/eve.gif)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/server.gif?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/eve.gif&r1=124527&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/db/gui/server.gif&r2=124541
==============================================================================
Deleted: /incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java?view=auto&rev=124540
==============================================================================
Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/InterceptorException.java (from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/InterceptorException.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java&r1=124527&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/InterceptorException.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/EveInterceptorException.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/exception/InterceptorException.java Fri Jan 7 09:15:48 2005
@@ -32,7 +32,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class EveInterceptorException extends LdapNamingException
+public class InterceptorException extends LdapNamingException
{
/** The Invokation the Interceptor failed on */
private final Invocation invocation;
@@ -41,12 +41,12 @@
/**
- * Creates an EveInterceptorException without a message.
+ * Creates an InterceptorException without a message.
*
* @param interceptor the Interceptor causing the failure
* @param invocation the Invocation the Interceptor failed on
*/
- public EveInterceptorException( Interceptor interceptor, Invocation invocation )
+ public InterceptorException( Interceptor interceptor, Invocation invocation )
{
super( ResultCodeEnum.OTHER );
this.invocation = invocation;
@@ -55,13 +55,13 @@
/**
- * Creates an EveInterceptorException with a custom message.
+ * Creates an InterceptorException with a custom message.
*
* @param interceptor the Interceptor causing the failure
* @param invocation the Invocation the Interceptor failed on
* @param explanation String explanation of why the Interceptor failed
*/
- public EveInterceptorException( Interceptor interceptor,
+ public InterceptorException( Interceptor interceptor,
Invocation invocation, String explanation )
{
super( explanation, ResultCodeEnum.OTHER );
@@ -71,13 +71,13 @@
/**
- * Creates an EveInterceptorException without a message.
+ * Creates an InterceptorException without a message.
*
* @param interceptor the Interceptor causing the failure
* @param invocation the Invocation the Interceptor failed on
* @param rootCause the root cause of this exception
*/
- public EveInterceptorException( Interceptor interceptor,
+ public InterceptorException( Interceptor interceptor,
Invocation invocation, Throwable rootCause )
{
this( interceptor, invocation );
Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java&r1=124540&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/AuthenticationService.java Fri Jan 7 09:15:48 2005
@@ -76,7 +76,7 @@
// check if we are already authenticated and if so we return making
// sure first that the credentials are not exposed within context
- EveContext ctx = ( EveLdapContext ) invocation.getContextStack().peek();
+ ServerContext ctx = ( ServerLdapContext ) invocation.getContextStack().peek();
if ( ctx.getPrincipal() != null )
{
if ( ctx.getEnvironment().containsKey( CREDS ) )
@@ -122,7 +122,7 @@
}
- private void doAuthSasl( EveContext ctx ) throws NamingException
+ private void doAuthSasl( ServerContext ctx ) throws NamingException
{
ctx.getEnvironment(); // shut's up idea's yellow light
ResultCodeEnum rc = ResultCodeEnum.AUTHMETHODNOTSUPPORTED;
@@ -130,7 +130,7 @@
}
- private void doAuthNone( EveContext ctx ) throws NamingException
+ private void doAuthNone( ServerContext ctx ) throws NamingException
{
if ( allowAnonymous )
{
@@ -143,7 +143,7 @@
}
- private void doAuthSimple( EveContext ctx ) throws NamingException
+ private void doAuthSimple( ServerContext ctx ) throws NamingException
{
Object creds = ctx.getEnvironment().get( CREDS );
Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java&r1=124540&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/BaseInterceptor.java Fri Jan 7 09:15:48 2005
@@ -86,7 +86,7 @@
*/
public static LdapPrincipal getPrincipal( Invocation invocation )
{
- EveContext ctx = ( EveContext ) invocation.getContextStack().peek();
+ ServerContext ctx = ( ServerContext ) invocation.getContextStack().peek();
return ctx.getPrincipal();
}
Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java&r1=124540&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EnvKeys.java Fri Jan 7 09:15:48 2005
@@ -30,9 +30,9 @@
// ------------------------------------------------------------------------
/** property used to shutdown the system */
- public static final String SHUTDOWN = "eve.operation.shutdown";
+ public static final String SHUTDOWN = "server.operation.shutdown";
/** property used to sync the system with disk */
- public static final String SYNC = "eve.operation.sync";
+ public static final String SYNC = "server.operation.sync";
// ------------------------------------------------------------------------
@@ -40,11 +40,11 @@
// ------------------------------------------------------------------------
/** bootstrap prop: path to eve's working directory - relative or absolute */
- public static final String WKDIR = "eve.wkdir";
+ public static final String WKDIR = "server.wkdir";
/** a comma separated list of schema class files to load */
- public static final String SCHEMAS = "eve.schemas";
+ public static final String SCHEMAS = "server.schemas";
/** bootstrap prop: if key is present it enables anonymous users */
- public static final String DISABLE_ANONYMOUS = "eve.disable.anonymous";
+ public static final String DISABLE_ANONYMOUS = "server.disable.anonymous";
// ------------------------------------------------------------------------
@@ -52,24 +52,24 @@
// ------------------------------------------------------------------------
/** key used to disable the networking layer (wire protocol) */
- public static final String DISABLE_PROTOCOL = "eve.net.disable.protocol";
+ public static final String DISABLE_PROTOCOL = "server.net.disable.protocol";
/** key used to hold the frontend to use rather than creating one */
- public static final String PASSTHRU = "eve.net.passthru";
+ public static final String PASSTHRU = "server.net.passthru";
/** key for port setting for ldap requests beside default 389 */
- public static final String LDAP_PORT = "eve.net.ldap.port";
+ public static final String LDAP_PORT = "server.net.ldap.port";
/** key for port setting for secure ldap requests besides default 636 */
- public static final String LDAPS_PORT = "eve.net.ldaps.port";
+ public static final String LDAPS_PORT = "server.net.ldaps.port";
// ------------------------------------------------------------------------
// Properties for partition configuration
// ------------------------------------------------------------------------
/** a comma separated list of partition names */
- public static final String PARTITIONS = "eve.db.partitions";
+ public static final String PARTITIONS = "server.db.partitions";
/** the envprop key base to the suffix of a partition */
- public static final String SUFFIX = "eve.db.partition.suffix.";
+ public static final String SUFFIX = "server.db.partition.suffix.";
/** the envprop key base to the space separated list of indices for a partition */
- public static final String INDICES = "eve.db.partition.indices.";
+ public static final String INDICES = "server.db.partition.indices.";
/** the envprop key base to the Attributes for the context nexus entry */
- public static final String ATTRIBUTES = "eve.db.partition.attributes.";
+ public static final String ATTRIBUTES = "server.db.partition.attributes.";
}
Deleted: /incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java?view=auto&rev=124540
==============================================================================
Deleted: /incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java?view=auto&rev=124540
==============================================================================
Deleted: /incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java?view=auto&rev=124540
==============================================================================
Deleted: /incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java?view=auto&rev=124540
==============================================================================
Deleted: /incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java?view=auto&rev=124540
==============================================================================
Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java&r1=124540&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/FailFastPipeline.java Fri Jan 7 09:15:48 2005
@@ -19,7 +19,7 @@
import javax.naming.NamingException;
-import org.apache.ldap.server.exception.EveInterceptorException;
+import org.apache.ldap.server.exception.InterceptorException;
/**
@@ -45,9 +45,9 @@
/**
* This invoke method fails and throws at the first failure within the
- * pipeline. If an unexpected Throwable other than an EveInterceptorException
+ * pipeline. If an unexpected Throwable other than an InterceptorException
* results this method catches it and wraps it within an
- * EveInterceptorException and rethrows the new exception.
+ * InterceptorException and rethrows the new exception.
*
* @see Interceptor#invoke(Invocation)
*/
@@ -68,8 +68,8 @@
throw ( NamingException ) throwable;
}
- EveInterceptorException ie;
- ie = new EveInterceptorException( service, invocation );
+ InterceptorException ie;
+ ie = new InterceptorException( service, invocation );
ie.setRootCause( throwable );
throw ie;
}
Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java (from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java&r1=124527&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveJndiProvider.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/JndiProvider.java Fri Jan 7 09:15:48 2005
@@ -28,21 +28,21 @@
import org.apache.ldap.common.exception.LdapNamingException;
import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.ldap.server.EveBackendSubsystem;
+import org.apache.ldap.server.BackendSubsystem;
import org.apache.ldap.server.PartitionNexus;
import org.apache.ldap.server.RootNexus;
/**
- * The EveBackendSubsystem service implementation.
+ * The BackendSubsystem service implementation.
*
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class EveJndiProvider implements EveBackendSubsystem, InvocationHandler
+public class JndiProvider implements BackendSubsystem, InvocationHandler
{
/** Singleton instance of this class */
- private static EveJndiProvider s_singleton = null;
+ private static JndiProvider s_singleton = null;
/** Interceptor of interceptors in post-invocation pipeline */
private InterceptorPipeline after = new FailFastPipeline();
@@ -65,18 +65,18 @@
/**
- * Creates a singlton instance of the EveBackendSubsystem. In the words of
+ * Creates a singlton instance of the BackendSubsystem. In the words of
* the Highlander, "there can only be one."
*
- * @throws IllegalStateException if another EveJndiProvider has already
+ * @throws IllegalStateException if another JndiProvider has already
* been instantiated.
*/
- public EveJndiProvider( RootNexus nexus )
+ public JndiProvider( RootNexus nexus )
{
if ( s_singleton != null )
{
throw new IllegalStateException(
- "Cannot instantiate more than one EveJndiProvider!" );
+ "Cannot instantiate more than one JndiProvider!" );
}
s_singleton = this;
@@ -94,24 +94,24 @@
/**
- * Enables a EveContextFactory with a handle to the system wide
- * EveJndiProvider instance.
+ * Enables a ServerContextFactory with a handle to the system wide
+ * JndiProvider instance.
*
- * @param factory the EveContextFactory to enable
+ * @param factory the ServerContextFactory to enable
*/
- static void setProviderOn( EveContextFactory factory )
+ static void setProviderOn( ServerContextFactory factory )
{
factory.setProvider( s_singleton );
}
// ------------------------------------------------------------------------
- // EveBackendSubsystem Interface Method Implemetations
+ // BackendSubsystem Interface Method Implemetations
// ------------------------------------------------------------------------
/**
- * @see org.apache.ldap.server.EveBackendSubsystem#getLdapContext(Hashtable)
+ * @see org.apache.ldap.server.BackendSubsystem#getLdapContext(Hashtable)
*/
public LdapContext getLdapContext( Hashtable env ) throws NamingException
{
@@ -120,7 +120,7 @@
throw new IllegalStateException( "Eve has been shutdown!" );
}
- return new EveLdapContext( proxy, env );
+ return new ServerLdapContext( proxy, env );
}
Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/OnErrorPipeline.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/OnErrorPipeline.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/OnErrorPipeline.java&r1=124540&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/OnErrorPipeline.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/OnErrorPipeline.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/OnErrorPipeline.java Fri Jan 7 09:15:48 2005
@@ -19,7 +19,7 @@
import javax.naming.NamingException;
-import org.apache.ldap.server.exception.EveInterceptorException;
+import org.apache.ldap.server.exception.InterceptorException;
/**
@@ -46,8 +46,8 @@
/**
* This invoke method does not fail and throw exceptions until all
* Interceptors within the pipeline have been invoked. If an unexpected
- * Throwable other than an EveInterceptorException results this method
- * catches it and wraps it within an EveInterceptorException and adds it to
+ * Throwable other than an InterceptorException results this method
+ * catches it and wraps it within an InterceptorException and adds it to
* the Invocation's list of afterFailure exceptions. The last error if any
* to result after all Interceptors have run is thrown.
*
@@ -68,21 +68,21 @@
catch ( Throwable throwable )
{
/*
- * If exception is EveInterceptorException we add it to the list
+ * If exception is InterceptorException we add it to the list
* of afterFailure exceptions on the Invocation. Otherwise we
- * wrap the unexpected exception as an EveInterceptorException and
+ * wrap the unexpected exception as an InterceptorException and
* add it to the list of afterFailure exceptions on the
* Invocation
*/
- if ( throwable instanceof EveInterceptorException )
+ if ( throwable instanceof InterceptorException )
{
- last = ( EveInterceptorException ) throwable;
+ last = ( InterceptorException ) throwable;
invocation.addFailure( last );
}
else
{
- last = new EveInterceptorException( service, invocation );
+ last = new InterceptorException( service, invocation );
last.setRootCause( throwable );
invocation.addFailure( last );
}
Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java (from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java&r1=124527&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContext.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContext.java Fri Jan 7 09:15:48 2005
@@ -38,7 +38,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public abstract class EveContext implements Context
+public abstract class ServerContext implements Context
{
/** */
public static final String DELETE_OLD_RDN_PROP = "java.naming.ldap.deleteRDN";
@@ -72,7 +72,7 @@
* @throws NamingException if the environment parameters are not set
* correctly.
*/
- protected EveContext( PartitionNexus nexusProxy, Hashtable env ) throws NamingException
+ protected ServerContext( PartitionNexus nexusProxy, Hashtable env ) throws NamingException
{
String url;
@@ -115,7 +115,7 @@
* @param env the environment properties used by this context
* @param dn the distinguished name of this context
*/
- protected EveContext( LdapPrincipal principal, PartitionNexus nexusProxy,
+ protected ServerContext( LdapPrincipal principal, PartitionNexus nexusProxy,
Hashtable env, Name dn )
{
this.dn = ( LdapName ) dn.clone();
@@ -276,14 +276,14 @@
/*
* Add the new context to the server which as a side effect adds
* operational attributes to the attributes refering instance which
- * can them be used to initialize a new EveLdapContext. Remember
+ * can them be used to initialize a new ServerLdapContext. Remember
* we need to copy over the controls as well to propagate the complete
* environment besides whats in the hashtable for env.
*/
nexusProxy.add( target.toString(), target, attributes );
- EveLdapContext ctx = new EveLdapContext( principal, nexusProxy, env, target );
- Control [] controls = ( Control [] ) ( ( EveLdapContext ) this ).getRequestControls().clone();
+ ServerLdapContext ctx = new ServerLdapContext( principal, nexusProxy, env, target );
+ Control [] controls = ( Control [] ) ( ( ServerLdapContext ) this ).getRequestControls().clone();
ctx.setRequestControls( controls );
return ctx;
}
@@ -328,7 +328,7 @@
*/
public void bind( Name name, Object obj ) throws NamingException
{
- if ( obj instanceof EveLdapContext )
+ if ( obj instanceof ServerLdapContext )
{
throw new IllegalArgumentException( "Cannot bind a directory context object!" );
}
@@ -491,10 +491,10 @@
}
// Initialize and return a context since the entry is not a java object
- EveLdapContext ctx = new EveLdapContext( principal, nexusProxy, env, target );
+ ServerLdapContext ctx = new ServerLdapContext( principal, nexusProxy, env, target );
// Need to add controls to propagate extended ldap operational env
- Control [] controls = ( ( EveLdapContext ) this ).getRequestControls();
+ Control [] controls = ( ( ServerLdapContext ) this ).getRequestControls();
if ( null != controls )
{
ctx.setRequestControls( ( Control [] ) controls.clone() );
Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java (from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java&r1=124527&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveContextFactory.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java Fri Jan 7 09:15:48 2005
@@ -72,14 +72,14 @@
* <code>
* Hashtable env = new Hashtable();
* env.put( Context.PROVIDER_URL, "ou=system" );
- * env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ * env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
* InitialContext initialContext = new InitialContext( env );
* </code>
* @see javax.naming.spi.InitialContextFactory
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class EveContextFactory implements InitialContextFactory
+public class ServerContextFactory implements InitialContextFactory
{
private static final String TYPE = Context.SECURITY_AUTHENTICATION;
private static final String CREDS = Context.SECURITY_CREDENTIALS;
@@ -90,17 +90,17 @@
/** the default LDAP port to use */
private static final int LDAP_PORT = 389;
/** default path to working directory if WKDIR_ENV property is not set */
- public static final String DEFAULT_WKDIR = "eve-work";
+ public static final String DEFAULT_WKDIR = "server-work";
/** default schema classes for the SCHEMAS_ENV property if not set */
private static final String[] DEFAULT_SCHEMAS = new String[]
{
- "org.apache.eve.schema.bootstrap.CoreSchema",
- "org.apache.eve.schema.bootstrap.CosineSchema",
- "org.apache.eve.schema.bootstrap.EveSchema",
- "org.apache.eve.schema.bootstrap.InetorgpersonSchema",
- "org.apache.eve.schema.bootstrap.JavaSchema",
- "org.apache.eve.schema.bootstrap.SystemSchema"
+ "org.apache.ldap.server.schema.bootstrap.CoreSchema",
+ "org.apache.ldap.server.schema.bootstrap.CosineSchema",
+ "org.apache.ldap.server.schema.bootstrap.EveSchema",
+ "org.apache.ldap.server.schema.bootstrap.InetorgpersonSchema",
+ "org.apache.ldap.server.schema.bootstrap.JavaSchema",
+ "org.apache.ldap.server.schema.bootstrap.SystemSchema"
};
@@ -108,8 +108,8 @@
// Members
// ------------------------------------------------------------------------
- /** The singleton EveJndiProvider instance */
- private EveJndiProvider provider = null;
+ /** The singleton JndiProvider instance */
+ private JndiProvider provider = null;
/** the initial context environment that fired up the backend subsystem */
private Hashtable initialEnv;
private SystemPartition system;
@@ -124,21 +124,21 @@
/**
- * Default constructor that sets the provider of this EveContextFactory.
+ * Default constructor that sets the provider of this ServerContextFactory.
*/
- public EveContextFactory()
+ public ServerContextFactory()
{
- EveJndiProvider.setProviderOn( this );
+ JndiProvider.setProviderOn( this );
}
/**
- * Enables this EveContextFactory with a handle to the EveJndiProvider
+ * Enables this ServerContextFactory with a handle to the JndiProvider
* singleton.
*
- * @param a_provider the system's singleton EveBackendSubsystem service.
+ * @param a_provider the system's singleton BackendSubsystem service.
*/
- void setProvider( EveJndiProvider a_provider )
+ void setProvider( JndiProvider a_provider )
{
provider = a_provider;
}
@@ -226,7 +226,7 @@
}
}
- ctx = ( EveContext ) provider.getLdapContext( env );
+ ctx = ( ServerContext ) provider.getLdapContext( env );
return ctx;
}
@@ -453,7 +453,7 @@
system = new SystemPartition( db, eng, attributes );
globalRegistries = new GlobalRegistries( system, bootstrapRegistries );
nexus = new RootNexus( system, new LockableAttributesImpl() );
- provider = new EveJndiProvider( nexus );
+ provider = new JndiProvider( nexus );
// --------------------------------------------------------------------
@@ -500,7 +500,7 @@
InvocationStateEnum.PREINVOCATION,
InvocationStateEnum.FAILUREHANDLING
};
- interceptor = new EveExceptionService( nexus );
+ interceptor = new ServerExceptionService( nexus );
provider.addInterceptor( interceptor, state );
/*
Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java (from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java&r1=124527&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveDirContext.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerDirContext.java Fri Jan 7 09:15:48 2005
@@ -39,7 +39,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public abstract class EveDirContext extends EveContext implements DirContext
+public abstract class ServerDirContext extends ServerContext implements DirContext
{
@@ -48,21 +48,21 @@
// ------------------------------------------------------------------------
/**
- * Creates a new EveDirContext by reading the PROVIDER_URL to resolve the
+ * Creates a new ServerDirContext by reading the PROVIDER_URL to resolve the
* distinguished name for this context.
*
* @param nexusProxy the proxy to the backend nexus
* @param env the environment used for this context
* @throws NamingException if something goes wrong
*/
- public EveDirContext( PartitionNexus nexusProxy, Hashtable env ) throws NamingException
+ public ServerDirContext( PartitionNexus nexusProxy, Hashtable env ) throws NamingException
{
super( nexusProxy, env );
}
/**
- * Creates a new EveDirContext with a distinguished name which is used to
+ * Creates a new ServerDirContext with a distinguished name which is used to
* set the PROVIDER_URL to the distinguished name for this context.
*
* @param principal the principal which is propagated
@@ -70,7 +70,7 @@
* @param env the environment properties used by this context
* @param dn the distinguished name of this context
*/
- protected EveDirContext( LdapPrincipal principal, PartitionNexus nexusProxy,
+ protected ServerDirContext( LdapPrincipal principal, PartitionNexus nexusProxy,
Hashtable env, Name dn )
{
super( principal, nexusProxy, env, dn );
@@ -204,7 +204,7 @@
// Need to perform serialization of object into a copy of attrs
else
{
- if ( obj instanceof EveLdapContext )
+ if ( obj instanceof ServerLdapContext )
{
throw new IllegalArgumentException( "Cannot bind a directory context object!" );
}
@@ -287,10 +287,10 @@
getNexusProxy().add( target.toString(), target, attributes );
// Initialize the new context
- EveLdapContext ctx = new EveLdapContext( getPrincipal(), getNexusProxy(),
+ ServerLdapContext ctx = new ServerLdapContext( getPrincipal(), getNexusProxy(),
getEnvironment(), target );
- Control [] controls = ( ( EveLdapContext ) this ).getRequestControls();
+ Control [] controls = ( ( ServerLdapContext ) this ).getRequestControls();
if ( controls != null )
{
controls = ( Control[] ) controls.clone();
Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java (from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java&r1=124527&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/EveLdapContext.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerLdapContext.java Fri Jan 7 09:15:48 2005
@@ -36,7 +36,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class EveLdapContext extends EveDirContext implements LdapContext
+public class ServerLdapContext extends ServerDirContext implements LdapContext
{
private static final Control[] EMPTY_CONTROLS = new Control[0];
private Control[] requestControls = EMPTY_CONTROLS;
@@ -45,20 +45,20 @@
/**
- * Creates an instance of an EveLdapContext.
+ * Creates an instance of an ServerLdapContext.
*
* @param nexusProxy the proxy to a partition nexus
* @param env the JNDI environment parameters
* @throws NamingException the context cannot be created
*/
- public EveLdapContext( PartitionNexus nexusProxy, Hashtable env ) throws NamingException
+ public ServerLdapContext( PartitionNexus nexusProxy, Hashtable env ) throws NamingException
{
super( nexusProxy, env );
}
/**
- * Creates a new EveDirContext with a distinguished name which is used to
+ * Creates a new ServerDirContext with a distinguished name which is used to
* set the PROVIDER_URL to the distinguished name for this context.
*
* @param principal the directory user principal that is propagated
@@ -66,7 +66,7 @@
* @param env the environment properties used by this context
* @param dn the distinguished name of this context
*/
- EveLdapContext( LdapPrincipal principal, PartitionNexus nexusProxy, Hashtable env, Name dn )
+ ServerLdapContext( LdapPrincipal principal, PartitionNexus nexusProxy, Hashtable env, Name dn )
{
super( principal, nexusProxy, env, dn );
}
@@ -89,7 +89,7 @@
public LdapContext newInstance( Control[] requestControls )
throws NamingException
{
- EveLdapContext ctx = new EveLdapContext( getPrincipal(), getNexusProxy(),
+ ServerLdapContext ctx = new ServerLdapContext( getPrincipal(), getNexusProxy(),
getEnvironment(), getDn() );
ctx.setRequestControls( requestControls );
return ctx;
Modified: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java&r1=124540&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/AuthorizationService.java Fri Jan 7 09:15:48 2005
@@ -31,7 +31,7 @@
import org.apache.ldap.server.SystemPartition;
import org.apache.ldap.server.db.SearchResultFilter;
import org.apache.ldap.server.jndi.BaseInterceptor;
-import org.apache.ldap.server.jndi.EveContext;
+import org.apache.ldap.server.jndi.ServerContext;
import org.apache.ldap.server.jndi.Invocation;
import org.apache.ldap.server.jndi.InvocationStateEnum;
@@ -295,7 +295,7 @@
dn = dnParser.parse( result.getName() );
}
- Name principalDn = ( ( EveContext ) ctx ).getPrincipal().getDn();
+ Name principalDn = ( ( ServerContext ) ctx ).getPrincipal().getDn();
if ( ! principalDn.equals( ADMIN_DN ) )
{
if ( dn.size() > 2 )
@@ -332,7 +332,7 @@
private void filter( LdapContext ctx, Name dn ) throws NamingException
{
- Name principalDn = ( ( EveContext ) ctx ).getPrincipal().getDn();
+ Name principalDn = ( ( ServerContext ) ctx ).getPrincipal().getDn();
if ( ! principalDn.equals( ADMIN_DN ) )
{
Deleted: /incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java?view=auto&rev=124540
==============================================================================
Copied: incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ServerExceptionService.java (from r124527, incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ServerExceptionService.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java&r1=124527&p2=incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ServerExceptionService.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/EveExceptionService.java (original)
+++ incubator/directory/server/trunk/core/src/main/java/org/apache/ldap/server/jndi/ibs/ServerExceptionService.java Fri Jan 7 09:15:48 2005
@@ -31,7 +31,7 @@
import org.apache.ldap.common.message.ResultCodeEnum;
import org.apache.ldap.common.name.LdapName;
import org.apache.ldap.server.RootNexus;
-import org.apache.ldap.server.exception.EveInterceptorException;
+import org.apache.ldap.server.exception.InterceptorException;
import org.apache.ldap.server.jndi.BaseInterceptor;
import org.apache.ldap.server.jndi.Invocation;
import org.apache.ldap.server.jndi.InvocationStateEnum;
@@ -50,7 +50,7 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class EveExceptionService extends BaseInterceptor
+public class ServerExceptionService extends BaseInterceptor
{
/** the root nexus of the system */
private RootNexus nexus = null;
@@ -61,7 +61,7 @@
*
* @param nexus the root partition nexus
*/
- public EveExceptionService( RootNexus nexus )
+ public ServerExceptionService( RootNexus nexus )
{
this.nexus = nexus;
}
@@ -83,9 +83,9 @@
{
t = invocation.getBeforeFailure();
- if ( t instanceof EveInterceptorException )
+ if ( t instanceof InterceptorException )
{
- EveInterceptorException eie = ( EveInterceptorException ) t;
+ InterceptorException eie = ( InterceptorException ) t;
if ( eie.getRootCause() != null && ( eie instanceof LdapException ) )
{
@@ -102,9 +102,9 @@
{
t = invocation.getAfterFailure();
- if ( t instanceof EveInterceptorException )
+ if ( t instanceof InterceptorException )
{
- EveInterceptorException eie = ( EveInterceptorException ) t;
+ InterceptorException eie = ( InterceptorException ) t;
if ( eie.getRootCause() != null && ( eie instanceof LdapException ) )
{
Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java&r1=124540&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java (original)
+++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractJndiTest.java Fri Jan 7 09:15:48 2005
@@ -127,7 +127,7 @@
envFinal.putAll( env );
envFinal.put( Context.PROVIDER_URL, "ou=system" );
envFinal.put( EnvKeys.WKDIR, "target" + File.separator + "eve" );
- envFinal.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ envFinal.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
envFinal.putAll( overrides );
return sysRoot = new InitialLdapContext( envFinal, null );
}
@@ -143,7 +143,7 @@
super.tearDown();
Hashtable env = new Hashtable();
env.put( Context.PROVIDER_URL, "ou=system" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
env.put( EnvKeys.SHUTDOWN, "" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractMultiUserJndiTest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractMultiUserJndiTest.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractMultiUserJndiTest.java&r1=124540&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractMultiUserJndiTest.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractMultiUserJndiTest.java (original)
+++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/AbstractMultiUserJndiTest.java Fri Jan 7 09:15:48 2005
@@ -30,7 +30,7 @@
*/
public abstract class AbstractMultiUserJndiTest extends AbstractJndiTest
{
- protected EveLdapContext sysRootAsNonAdminUser;
+ protected ServerLdapContext sysRootAsNonAdminUser;
/**
@@ -46,11 +46,11 @@
// authenticate as akarasulu
Hashtable env = new Hashtable( );
env.put( Context.PROVIDER_URL, "ou=system" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
env.put( Context.SECURITY_PRINCIPAL, "uid=akarasulu,ou=users,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "test" );
InitialContext ictx = new InitialContext( env );
- sysRootAsNonAdminUser = ( EveLdapContext ) ictx.lookup( "" );
+ sysRootAsNonAdminUser = ( ServerLdapContext ) ictx.lookup( "" );
}
Deleted: /incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java?view=auto&rev=124540
==============================================================================
Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java&r1=124540&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java (original)
+++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/RootDSETest.java Fri Jan 7 09:15:48 2005
@@ -84,7 +84,7 @@
super.tearDown();
Hashtable env = new Hashtable();
env.put( Context.PROVIDER_URL, "ou=system" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
env.put( EnvKeys.SHUTDOWN, "" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -105,7 +105,7 @@
env.put( Context.PROVIDER_URL, "" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, EveContextFactory.class.getName() );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
}
@@ -124,7 +124,7 @@
env.put( Context.PROVIDER_URL, "" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, EveContextFactory.class.getName() );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
@@ -146,7 +146,7 @@
env.put( Context.PROVIDER_URL, "" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, EveContextFactory.class.getName() );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
@@ -171,7 +171,7 @@
env.put( Context.PROVIDER_URL, "" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, EveContextFactory.class.getName() );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
@@ -205,7 +205,7 @@
env.put( Context.PROVIDER_URL, "" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, EveContextFactory.class.getName() );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
@@ -239,7 +239,7 @@
env.put( Context.PROVIDER_URL, "" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, EveContextFactory.class.getName() );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
@@ -275,7 +275,7 @@
env.put( Context.PROVIDER_URL, "" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, EveContextFactory.class.getName() );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, ServerContextFactory.class.getName() );
InitialContext initCtx = new InitialContext( env );
assertNotNull( initCtx );
Copied: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ServerContextFactoryTest.java (from r124525, incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ServerContextFactoryTest.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java&r1=124525&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ServerContextFactoryTest.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/EveContextFactoryTest.java (original)
+++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ServerContextFactoryTest.java Fri Jan 7 09:15:48 2005
@@ -30,9 +30,9 @@
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class EveContextFactoryTest extends AbstractJndiTest
+public class ServerContextFactoryTest extends AbstractJndiTest
{
- public EveContextFactoryTest()
+ public ServerContextFactoryTest()
{
BasicAttributes attrs = new BasicAttributes( true );
BasicAttribute attr = new BasicAttribute( "objectClass" );
@@ -109,7 +109,7 @@
env.put( Context.PROVIDER_URL, "dc=example" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
InitialContext initialContext = new InitialContext( env );
DirContext appRoot = ( DirContext ) initialContext.lookup( "" );
assertNotNull( appRoot );
@@ -130,7 +130,7 @@
env.put( Context.PROVIDER_URL, "ou=testing" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
InitialContext initialContext = new InitialContext( env );
DirContext appRoot = ( DirContext ) initialContext.lookup( "" );
assertNotNull( appRoot );
Modified: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java&r1=124540&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java (original)
+++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/SimpleAuthenticationTest.java Fri Jan 7 09:15:48 2005
@@ -142,7 +142,7 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=akarasulu,ou=users,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "test" );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
InitialDirContext ic = new InitialDirContext( env );
Attributes attrs = ic.getAttributes( "uid=akarasulu,ou=users" );
Attribute ou = attrs.get( "ou" );
@@ -199,7 +199,7 @@
// now go in as anonymous user and we should be wh
env.put( Context.PROVIDER_URL, "ou=system" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
InitialLdapContext initial = new InitialLdapContext( env, null );
@@ -290,7 +290,7 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
assertNotNull( new InitialContext( env ) );
}
@@ -309,7 +309,7 @@
env.put( Context.SECURITY_PRINCIPAL, "uid=akarasulu,ou=users,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "test" );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
- env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.EveContextFactory" );
+ env.put( Context.INITIAL_CONTEXT_FACTORY, "org.apache.ldap.server.jndi.ServerContextFactory" );
assertNotNull( new InitialContext( env ) );
}
}
Deleted: /incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java?view=auto&rev=124540
==============================================================================
Copied: incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/ServerExceptionServiceTest.java (from r124525, incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/ServerExceptionServiceTest.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java&r1=124525&p2=incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/ServerExceptionServiceTest.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/EveExceptionServiceTest.java (original)
+++ incubator/directory/server/trunk/core/src/test/org/apache/ldap/server/jndi/ibs/ServerExceptionServiceTest.java Fri Jan 7 09:15:48 2005
@@ -32,12 +32,12 @@
/**
- * Tests the correct operation of the EveExceptionService.
+ * Tests the correct operation of the ServerExceptionService.
*
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class EveExceptionServiceTest extends AbstractJndiTest
+public class ServerExceptionServiceTest extends AbstractJndiTest
{
// ------------------------------------------------------------------------
// Search Operation Tests
Modified: incubator/directory/server/trunk/main/project.properties
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/main/project.properties?view=diff&rev=124541&p1=incubator/directory/server/trunk/main/project.properties&r1=124540&p2=incubator/directory/server/trunk/main/project.properties&r2=124541
==============================================================================
--- incubator/directory/server/trunk/main/project.properties (original)
+++ incubator/directory/server/trunk/main/project.properties Fri Jan 7 09:15:48 2005
@@ -5,7 +5,7 @@
#
maven.javaapp.jar.exclude=junit, maven-javaapp-plugin
-maven.javaapp.mainclass=org.apache.ldap.server.EveMain
+maven.javaapp.mainclass=org.apache.ldap.server.ServerMain
maven.javaapp.jar.name=${maven.final.name}.jar
maven.javaapp.sysproperties=
maven.javaapp.jvmargs=
Deleted: /incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java?view=auto&rev=124540
==============================================================================
Copied: incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java (from r124531, incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java)
Url: http://svn.apache.org/viewcvs/incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java?view=diff&rev=124541&p1=incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java&r1=124531&p2=incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java&r2=124541
==============================================================================
--- incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/EveMain.java (original)
+++ incubator/directory/server/trunk/main/src/main/java/org/apache/ldap/server/ServerMain.java Fri Jan 7 09:15:48 2005
@@ -30,12 +30,13 @@
/**
- * Document this class.
+ * The command line main for the server. Warning this used to be a simple test
+ * case so there really is not much here.
*
* @author <a href="mailto:directory-dev@incubator.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class EveMain
+public class ServerMain
{
/** the default LDAP port to use */
private static final int LDAP_PORT = 389;