You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/10/08 10:55:51 UTC
svn commit: r1005734 - in
/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared:
AbstractProtocolService.java DirectoryBackedService.java ProtocolService.java
Author: elecharny
Date: Fri Oct 8 08:55:51 2010
New Revision: 1005734
URL: http://svn.apache.org/viewvc?rev=1005734&view=rev
Log:
Reorganized the inheritence scheme as the NtpServer does not need a reference to the DS.
Modified:
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ProtocolService.java
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java?rev=1005734&r1=1005733&r2=1005734&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java Fri Oct 8 08:55:51 2010
@@ -22,7 +22,6 @@ package org.apache.directory.server.prot
import java.util.HashSet;
import java.util.Set;
-import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.protocol.shared.transport.Transport;
import org.apache.mina.transport.socket.DatagramAcceptor;
import org.apache.mina.transport.socket.SocketAcceptor;
@@ -51,24 +50,10 @@ public abstract class AbstractProtocolSe
/** The service transports. We may have more than one */
protected Set<Transport> transports = new HashSet<Transport>();
- /** directory service core where protocol data is backed */
- private DirectoryService directoryService;
-
-
- public DirectoryService getDirectoryService()
- {
- return directoryService;
- }
-
/**
+ * {@inheritDoc}
*/
- public void setDirectoryService( DirectoryService directoryService )
- {
- this.directoryService = directoryService;
- }
-
-
public boolean isStarted()
{
return started;
@@ -84,6 +69,9 @@ public abstract class AbstractProtocolSe
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isEnabled()
{
return enabled;
@@ -99,6 +87,9 @@ public abstract class AbstractProtocolSe
}
+ /**
+ * {@inheritDoc}
+ */
public String getServiceId()
{
return serviceId;
@@ -106,6 +97,7 @@ public abstract class AbstractProtocolSe
/**
+ * {@inheritDoc}
*/
public void setServiceId( String serviceId )
{
@@ -114,7 +106,7 @@ public abstract class AbstractProtocolSe
/**
- * @return The server name
+ * {@inheritDoc}
*/
public String getServiceName()
{
@@ -123,8 +115,7 @@ public abstract class AbstractProtocolSe
/**
- * Set the current server's name.
- * @param name The server name
+ * {@inheritDoc}
*/
public void setServiceName( String name )
{
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java?rev=1005734&r1=1005733&r2=1005734&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java Fri Oct 8 08:55:51 2010
@@ -20,6 +20,7 @@
package org.apache.directory.server.protocol.shared;
import org.apache.directory.server.constants.ServerDNConstants;
+import org.apache.directory.server.core.DirectoryService;
/**
@@ -39,6 +40,23 @@ public abstract class DirectoryBackedSer
/** determines if the search base is pointer to a catalog or a single entry point */
private boolean catelogBased;
+
+ /** directory service core where protocol data is backed */
+ private DirectoryService directoryService;
+
+
+ public DirectoryService getDirectoryService()
+ {
+ return directoryService;
+ }
+
+
+ /**
+ */
+ public void setDirectoryService( DirectoryService directoryService )
+ {
+ this.directoryService = directoryService;
+ }
/**
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ProtocolService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ProtocolService.java?rev=1005734&r1=1005733&r2=1005734&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ProtocolService.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ProtocolService.java Fri Oct 8 08:55:51 2010
@@ -19,7 +19,6 @@
package org.apache.directory.server.protocol.shared;
-import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.protocol.shared.transport.Transport;
import org.apache.mina.transport.socket.DatagramAcceptor;
import org.apache.mina.transport.socket.SocketAcceptor;
@@ -123,20 +122,4 @@ public interface ProtocolService
* @param name a descriptive name for the kind of this service
*/
void setServiceName( String name );
-
-
- /**
- * Gets the DirectoryService assigned to this ProtocolService.
- *
- * @return the directory service core assigned to this service
- */
- DirectoryService getDirectoryService();
-
-
- /**
- * Sets the DirectoryService assigned to this ProtocolService.
- *
- * @param directoryService the directory service core assigned to this service
- */
- void setDirectoryService( DirectoryService directoryService );
}