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/06/16 18:27:48 UTC
svn commit: r190949 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi:
AbstractContextFactory.java ContextFactoryConfiguration.java
ContextFactoryContext.java CoreContextFactory.java
DefaultContextFactoryConfiguration.java DefaultContextFactoryContext.java
RootNexusProxy.java
Author: akarasulu
Date: Thu Jun 16 09:27:47 2005
New Revision: 190949
URL: http://svn.apache.org/viewcvs?rev=190949&view=rev
Log:
renaming ContextFactoryContext to ContextFactoryConfiguration: did same with defualt bean for this interface
Added:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java
- copied, changed from r190945, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java
- copied, changed from r190945, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java
Removed:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java?rev=190949&r1=190948&r2=190949&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/AbstractContextFactory.java Thu Jun 16 09:27:47 2005
@@ -54,7 +54,7 @@
// ------------------------------------------------------------------------
/** The singleton JndiProvider instance */
- private static final ContextFactoryContext provider = new DefaultContextFactoryContext();
+ private static final ContextFactoryConfiguration provider = new DefaultContextFactoryConfiguration();
/**
* Default constructor that sets the provider of this ServerContextFactory.
@@ -84,7 +84,7 @@
}
else if( cfg instanceof StartupConfiguration )
{
- ( ( DefaultContextFactoryContext ) provider ).startup( this, env );
+ ( ( DefaultContextFactoryConfiguration ) provider ).startup( this, env );
}
else
{
@@ -160,10 +160,10 @@
return principal;
}
- protected abstract void beforeStartup( ContextFactoryContext ctx ) throws NamingException;
- protected abstract void afterStartup( ContextFactoryContext ctx ) throws NamingException;
- protected abstract void beforeShutdown( ContextFactoryContext ctx ) throws NamingException;
- protected abstract void afterShutdown( ContextFactoryContext ctx ) throws NamingException;
- protected abstract void beforeSync( ContextFactoryContext ctx ) throws NamingException;
- protected abstract void afterSync( ContextFactoryContext ctx ) throws NamingException;
+ protected abstract void beforeStartup( ContextFactoryConfiguration ctx ) throws NamingException;
+ protected abstract void afterStartup( ContextFactoryConfiguration ctx ) throws NamingException;
+ protected abstract void beforeShutdown( ContextFactoryConfiguration ctx ) throws NamingException;
+ protected abstract void afterShutdown( ContextFactoryConfiguration ctx ) throws NamingException;
+ protected abstract void beforeSync( ContextFactoryConfiguration ctx ) throws NamingException;
+ protected abstract void afterSync( ContextFactoryConfiguration ctx ) throws NamingException;
}
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java (from r190945, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java&r1=190945&r2=190949&rev=190949&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ContextFactoryConfiguration.java Thu Jun 16 09:27:47 2005
@@ -27,7 +27,7 @@
import org.apache.ldap.server.invocation.Invocation;
import org.apache.ldap.server.schema.GlobalRegistries;
-public interface ContextFactoryContext
+public interface ContextFactoryConfiguration
{
/**
* Returns the initial context environment of this context factory.
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java?rev=190949&r1=190948&r2=190949&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/CoreContextFactory.java Thu Jun 16 09:27:47 2005
@@ -45,27 +45,27 @@
{
}
- protected void beforeStartup( ContextFactoryContext ctx ) throws NamingException
+ protected void beforeStartup( ContextFactoryConfiguration ctx ) throws NamingException
{
}
- protected void afterStartup( ContextFactoryContext ctx ) throws NamingException
+ protected void afterStartup( ContextFactoryConfiguration ctx ) throws NamingException
{
}
- protected void beforeShutdown( ContextFactoryContext ctx ) throws NamingException
+ protected void beforeShutdown( ContextFactoryConfiguration ctx ) throws NamingException
{
}
- protected void afterShutdown( ContextFactoryContext ctx ) throws NamingException
+ protected void afterShutdown( ContextFactoryConfiguration ctx ) throws NamingException
{
}
- protected void beforeSync( ContextFactoryContext ctx ) throws NamingException
+ protected void beforeSync( ContextFactoryConfiguration ctx ) throws NamingException
{
}
- protected void afterSync( ContextFactoryContext ctx ) throws NamingException
+ protected void afterSync( ContextFactoryConfiguration ctx ) throws NamingException
{
}
}
Copied: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java (from r190945, directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java)
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java&r1=190945&r2=190949&rev=190949&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryContext.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/DefaultContextFactoryConfiguration.java Thu Jun 16 09:27:47 2005
@@ -70,7 +70,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-class DefaultContextFactoryContext implements ContextFactoryContext
+class DefaultContextFactoryConfiguration implements ContextFactoryConfiguration
{
private AbstractContextFactory factory;
@@ -109,7 +109,7 @@
/**
* Creates a new instance.
*/
- public DefaultContextFactoryContext()
+ public DefaultContextFactoryConfiguration()
{
// Register shutdown hook.
Runtime.getRuntime().addShutdownHook( new Thread( new Runnable() {
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java?rev=190949&r1=190948&r2=190949&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/RootNexusProxy.java Thu Jun 16 09:27:47 2005
@@ -49,9 +49,9 @@
class RootNexusProxy implements PartitionNexus
{
- private final ContextFactoryContext provider;
+ private final ContextFactoryConfiguration provider;
- RootNexusProxy( ContextFactoryContext provider )
+ RootNexusProxy( ContextFactoryConfiguration provider )
{
this.provider = provider;
}
Re: svn commit: r190949 - in /directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi:
AbstractContextFactory.java ContextFactoryConfiguration.java ContextFactoryContext.java
CoreContextFactory.java DefaultContextFactoryConfiguration.
Posted by Enrique Rodriguez <en...@gmail.com>.
Alex Karasulu wrote:
> I know what you're thinking :-). Alex is on one of his naming sprees
> ... really it confused the heck out of me. There are contexts all over
> the place.
> Alex
ContextSomethingContext is a particularly odd name.
Enrique
Re: svn commit: r190949 - in /directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi:
AbstractContextFactory.java ContextFactoryConfiguration.java ContextFactoryContext.java
CoreContextFactory.java DefaultContextFactoryConfiguration.
Posted by Alex Karasulu <ao...@bellsouth.net>.
Trustin Lee wrote:
> Alex, can I know why did you change ContextFactoryContext to
> ContextFactoryConfiguration? It is not a configuration, but is used
> to provide narrowed view of ApacheDS core to extenders of
> AbstractContextFactory. And moreover it doesn't provide anything to
> configure. That's why I named it 'Context' (not JNDI context, but
> context in ServletContext)
I messed up and thought it was a config bean. I did not know this was
the replacement for the JndiProvider. Was trying to remove confusion
between the JNDI Context and ApacheDS Factory Context that you intended
this to be. I'll change it back or better yet we can change it once we
figure out a better name to call it.
I know what you're thinking :-). Alex is on one of his naming sprees
... really it confused the heck out of me. There are contexts all over
the place.
Alex
> 2005/6/17, akarasulu@apache.org <ma...@apache.org>
> <akarasulu@apache.org <ma...@apache.org>>:
>
> Author: akarasulu
> Date: Thu Jun 16 09:27:47 2005
> New Revision: 190949
>
> URL: http://svn.apache.org/viewcvs?rev=190949&view=rev
> <http://svn.apache.org/viewcvs?rev=190949&view=rev>
> Log:
> renaming ContextFactoryContext to ContextFactoryConfiguration: did
> same with defualt bean for this interface
>
>
> Trustin
> --
> what we call human nature is actually human habit
> --
> http://gleamynode.net/
Re: svn commit: r190949 - in /directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi: AbstractContextFactory.java ContextFactoryConfiguration.java ContextFactoryContext.java CoreContextFactory.java DefaultContextFactoryConfiguration.
Posted by Trustin Lee <tr...@gmail.com>.
Alex, can I know why did you change ContextFactoryContext to
ContextFactoryConfiguration? It is not a configuration, but is used to
provide narrowed view of ApacheDS core to extenders of
AbstractContextFactory. And moreover it doesn't provide anything to
configure. That's why I named it 'Context' (not JNDI context, but context in
ServletContext)
Trustin
2005/6/17, akarasulu@apache.org <ak...@apache.org>:
>
> Author: akarasulu
> Date: Thu Jun 16 09:27:47 2005
> New Revision: 190949
>
> URL: http://svn.apache.org/viewcvs?rev=190949&view=rev
> Log:
> renaming ContextFactoryContext to ContextFactoryConfiguration: did same
> with defualt bean for this interface
Trustin
--
what we call human nature is actually human habit
--
http://gleamynode.net/