You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dj...@apache.org on 2007/10/11 21:57:30 UTC
svn commit: r583938 - in /directory/apacheds/branches/bigbang: ./
protocol-changepw/src/main/java/org/apache/directory/server/changepw/
protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/
protocol-changepw/src/main/java/org/a...
Author: djencks
Date: Thu Oct 11 12:57:20 2007
New Revision: 583938
URL: http://svn.apache.org/viewvc?rev=583938&view=rev
Log:
Rename XXXConfiguration to XXXServer for changepw, dns, kdc, ntp protocols. Also upgrade to xbean-ized mina version.
Added:
directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java (contents, props changed)
- copied, changed from r583683, directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordLDAPServers.java
directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java (contents, props changed)
- copied, changed from r583683, directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java (contents, props changed)
- copied, changed from r583683, directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java
directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java (contents, props changed)
- copied, changed from r583683, directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java
Removed:
directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordLDAPServers.java
directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java
directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java
Modified:
directory/apacheds/branches/bigbang/pom.xml
directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/package-info.java
directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java
directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java
directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java
directory/apacheds/branches/bigbang/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java
directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java
directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/package-info.java
directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsContext.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/package-info.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgt.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/package-info.java
directory/apacheds/branches/bigbang/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java
directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml
Modified: directory/apacheds/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/pom.xml?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/pom.xml (original)
+++ directory/apacheds/branches/bigbang/pom.xml Thu Oct 11 12:57:20 2007
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>1.1.2</version>
+ <version>1.1.4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-filter-ssl</artifactId>
- <version>1.1.2</version>
+ <version>1.1.4-SNAPSHOT</version>
</dependency>
<dependency>
Copied: directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java (from r583683, directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordLDAPServers.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java?p2=directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java&p1=directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordLDAPServers.java&r1=583683&r2=583938&rev=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordLDAPServers.java (original)
+++ directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java Thu Oct 11 12:57:20 2007
@@ -47,7 +47,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class ChangePasswordLDAPServers extends ServiceConfiguration
+public class ChangePasswordServer extends ServiceConfiguration
{
private static final long serialVersionUID = 3509208713288140629L;
@@ -121,7 +121,7 @@
/**
* Creates a new instance of ChangePasswordConfiguration.
*/
- public ChangePasswordLDAPServers( DatagramAcceptor datagramAcceptor, SocketAcceptor socketAcceptor, DirectoryService directoryService )
+ public ChangePasswordServer( DatagramAcceptor datagramAcceptor, SocketAcceptor socketAcceptor, DirectoryService directoryService )
{
this.datagramAcceptor = datagramAcceptor;
this.socketAcceptor = socketAcceptor;
Propchange: directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu Oct 11 12:57:20 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/package-info.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/package-info.java (original)
+++ directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/package-info.java Thu Oct 11 12:57:20 2007
@@ -20,7 +20,7 @@
/**
* Provides the entry point to an instance of the
- * {@link org.apache.directory.server.changepw.ChangePasswordLDAPServers},
+ * {@link org.apache.directory.server.changepw.ChangePasswordServer},
* as well as support for configuration.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
Modified: directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java (original)
+++ directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java Thu Oct 11 12:57:20 2007
@@ -28,7 +28,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.changepw.ChangePasswordLDAPServers;
+import org.apache.directory.server.changepw.ChangePasswordServer;
import org.apache.directory.server.changepw.exceptions.ChangePasswordException;
import org.apache.directory.server.changepw.exceptions.ErrorType;
import org.apache.directory.server.changepw.messages.ChangePasswordErrorModifier;
@@ -58,7 +58,7 @@
{
private static final Logger log = LoggerFactory.getLogger( ChangePasswordProtocolHandler.class );
- private ChangePasswordLDAPServers config;
+ private ChangePasswordServer config;
private PrincipalStore store;
private IoHandlerCommand changepwService;
private String contextKey = "context";
@@ -70,7 +70,7 @@
* @param config
* @param store
*/
- public ChangePasswordProtocolHandler( ChangePasswordLDAPServers config, PrincipalStore store )
+ public ChangePasswordProtocolHandler( ChangePasswordServer config, PrincipalStore store )
{
this.config = config;
this.store = store;
Modified: directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java (original)
+++ directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java Thu Oct 11 12:57:20 2007
@@ -22,7 +22,7 @@
import java.net.InetAddress;
-import org.apache.directory.server.changepw.ChangePasswordLDAPServers;
+import org.apache.directory.server.changepw.ChangePasswordServer;
import org.apache.directory.server.changepw.messages.AbstractPasswordMessage;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
@@ -41,7 +41,7 @@
{
private static final long serialVersionUID = -5124209294966799740L;
- private ChangePasswordLDAPServers config;
+ private ChangePasswordServer config;
private PrincipalStore store;
private AbstractPasswordMessage request;
private AbstractPasswordMessage reply;
@@ -95,7 +95,7 @@
/**
* @return Returns the config.
*/
- public ChangePasswordLDAPServers getConfig()
+ public ChangePasswordServer getConfig()
{
return config;
}
@@ -104,7 +104,7 @@
/**
* @param config The config to set.
*/
- public void setConfig( ChangePasswordLDAPServers config )
+ public void setConfig( ChangePasswordServer config )
{
this.config = config;
}
Modified: directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java (original)
+++ directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java Thu Oct 11 12:57:20 2007
@@ -25,7 +25,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.changepw.ChangePasswordLDAPServers;
+import org.apache.directory.server.changepw.ChangePasswordServer;
import org.apache.directory.server.changepw.exceptions.ChangePasswordException;
import org.apache.directory.server.changepw.exceptions.ErrorType;
import org.apache.directory.server.kerberos.shared.messages.components.Authenticator;
@@ -53,7 +53,7 @@
{
ChangePasswordContext changepwContext = ( ChangePasswordContext ) session.getAttribute( getContextKey() );
- ChangePasswordLDAPServers config = changepwContext.getConfig();
+ ChangePasswordServer config = changepwContext.getConfig();
Authenticator authenticator = changepwContext.getAuthenticator();
KerberosPrincipal clientPrincipal = authenticator.getClientPrincipal();
Modified: directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java (original)
+++ directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/VerifyServiceTicket.java Thu Oct 11 12:57:20 2007
@@ -22,7 +22,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.changepw.ChangePasswordLDAPServers;
+import org.apache.directory.server.changepw.ChangePasswordServer;
import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
@@ -42,7 +42,7 @@
public void execute( NextCommand next, IoSession session, Object message ) throws Exception
{
ChangePasswordContext changepwContext = ( ChangePasswordContext ) session.getAttribute( getContextKey() );
- ChangePasswordLDAPServers config = changepwContext.getConfig();
+ ChangePasswordServer config = changepwContext.getConfig();
Ticket ticket = changepwContext.getTicket();
String primaryRealm = config.getPrimaryRealm();
KerberosPrincipal changepwPrincipal = config.getServicePrincipal();
Modified: directory/apacheds/branches/bigbang/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java Thu Oct 11 12:57:20 2007
@@ -30,7 +30,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
import junit.framework.TestCase;
-import org.apache.directory.server.changepw.ChangePasswordLDAPServers;
+import org.apache.directory.server.changepw.ChangePasswordServer;
import org.apache.directory.server.changepw.io.ChangePasswordDataEncoder;
import org.apache.directory.server.changepw.messages.ChangePasswordError;
import org.apache.directory.server.changepw.messages.ChangePasswordRequest;
@@ -84,7 +84,7 @@
//private static final byte[] SUCCESS = new byte[]
// { ( byte ) 0x00, ( byte ) 0x00 };
- private ChangePasswordLDAPServers config;
+ private ChangePasswordServer config;
private PrincipalStore store;
private ChangePasswordProtocolHandler handler;
private DummySession session;
@@ -97,7 +97,7 @@
*/
public ChangepwProtocolHandlerTest()
{
- config = new ChangePasswordLDAPServers( null, null, null );
+ config = new ChangePasswordServer( null, null, null );
store = new MapPrincipalStoreImpl();
handler = new ChangePasswordProtocolHandler( config, store );
session = new DummySession();
Copied: directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java (from r583683, directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java?p2=directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java&p1=directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java&r1=583683&r2=583938&rev=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java Thu Oct 11 12:57:20 2007
@@ -42,7 +42,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class DnsConfiguration extends ServiceConfiguration
+public class DnsServer extends ServiceConfiguration
{
private static final long serialVersionUID = 6943138644427163149L;
@@ -63,7 +63,7 @@
/**
* Creates a new instance of DnsConfiguration.
*/
- public DnsConfiguration( DatagramAcceptor datagramAcceptor, SocketAcceptor socketAcceptor, DirectoryService directoryService)
+ public DnsServer( DatagramAcceptor datagramAcceptor, SocketAcceptor socketAcceptor, DirectoryService directoryService)
{
this.datagramAcceptor = datagramAcceptor;
this.socketAcceptor = socketAcceptor;
Propchange: directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu Oct 11 12:57:20 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java Thu Oct 11 12:57:20 2007
@@ -39,7 +39,7 @@
/** Logger for this class */
private static final Logger log = LoggerFactory.getLogger( Main.class );
- private static DnsConfiguration dnsConfiguration;
+ private static DnsServer dnsConfiguration;
/**
* Entry point for the DNS server.
@@ -61,7 +61,7 @@
DatagramAcceptor datagramAcceptor = new DatagramAcceptor( null );
SocketAcceptor socketAcceptor = new SocketAcceptor( null );
DirectoryService directoryService = new DefaultDirectoryService();
- dnsConfiguration = new DnsConfiguration( datagramAcceptor, socketAcceptor, directoryService );
+ dnsConfiguration = new DnsServer( datagramAcceptor, socketAcceptor, directoryService );
dnsConfiguration.setEnabled( true );
dnsConfiguration.setIpPort( 10053 );
dnsConfiguration.start();
Modified: directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/package-info.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/package-info.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/package-info.java Thu Oct 11 12:57:20 2007
@@ -20,7 +20,7 @@
/**
* Provides the entry point to an instance of the
- * {@link org.apache.directory.server.dns.DnsConfiguration},
+ * {@link org.apache.directory.server.dns.DnsServer},
* as well as support for configuration and the root
* of the exception hierarchy.
*
Modified: directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java Thu Oct 11 12:57:20 2007
@@ -23,7 +23,7 @@
import java.util.ArrayList;
-import org.apache.directory.server.dns.DnsConfiguration;
+import org.apache.directory.server.dns.DnsServer;
import org.apache.directory.server.dns.DnsException;
import org.apache.directory.server.dns.messages.DnsMessage;
import org.apache.directory.server.dns.messages.DnsMessageModifier;
@@ -52,7 +52,7 @@
{
private static final Logger log = LoggerFactory.getLogger( DnsProtocolHandler.class );
- private DnsConfiguration config;
+ private DnsServer config;
private RecordStore store;
private IoHandlerCommand dnsService;
private String contextKey = "context";
@@ -64,7 +64,7 @@
* @param config
* @param store
*/
- public DnsProtocolHandler( DnsConfiguration config, RecordStore store )
+ public DnsProtocolHandler( DnsServer config, RecordStore store )
{
this.config = config;
this.store = store;
Modified: directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsContext.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsContext.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsContext.java Thu Oct 11 12:57:20 2007
@@ -24,7 +24,7 @@
import java.util.Collection;
import java.util.List;
-import org.apache.directory.server.dns.DnsConfiguration;
+import org.apache.directory.server.dns.DnsServer;
import org.apache.directory.server.dns.messages.DnsMessage;
import org.apache.directory.server.dns.messages.ResourceRecord;
import org.apache.directory.server.dns.store.RecordStore;
@@ -38,7 +38,7 @@
{
private static final long serialVersionUID = -5911142975867852436L;
- private DnsConfiguration config;
+ private DnsServer config;
private RecordStore store;
private DnsMessage reply;
private List<ResourceRecord> records = new ArrayList<ResourceRecord>();
@@ -74,7 +74,7 @@
/**
* @return Returns the config.
*/
- public DnsConfiguration getConfig()
+ public DnsServer getConfig()
{
return config;
}
@@ -83,7 +83,7 @@
/**
* @param config The config to set.
*/
- public void setConfig( DnsConfiguration config )
+ public void setConfig( DnsServer config )
{
this.config = config;
}
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java Thu Oct 11 12:57:20 2007
@@ -37,7 +37,7 @@
{
private static final long serialVersionUID = 6490030984626825108L;
- private KdcConfiguration config;
+ private KdcServer config;
private PrincipalStore store;
private KdcRequest request;
private KerberosMessage reply;
@@ -49,7 +49,7 @@
/**
* @return Returns the config.
*/
- public KdcConfiguration getConfig()
+ public KdcServer getConfig()
{
return config;
}
@@ -58,7 +58,7 @@
/**
* @param config The config to set.
*/
- public void setConfig( KdcConfiguration config )
+ public void setConfig( KdcServer config )
{
this.config = config;
}
Copied: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java (from r583683, directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java?p2=directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java&p1=directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java&r1=583683&r2=583938&rev=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java Thu Oct 11 12:57:20 2007
@@ -47,7 +47,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class KdcConfiguration extends ServiceConfiguration
+public class KdcServer extends ServiceConfiguration
{
private static final long serialVersionUID = 522567370475574165L;
@@ -150,7 +150,7 @@
/**
* Creates a new instance of KdcConfiguration.
*/
- public KdcConfiguration( DatagramAcceptor datagramAcceptor, SocketAcceptor socketAcceptor, DirectoryService directoryService)
+ public KdcServer( DatagramAcceptor datagramAcceptor, SocketAcceptor socketAcceptor, DirectoryService directoryService)
{
this.datagramAcceptor = datagramAcceptor;
this.socketAcceptor = socketAcceptor;
Propchange: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu Oct 11 12:57:20 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java Thu Oct 11 12:57:20 2007
@@ -44,7 +44,7 @@
public void execute( NextCommand next, IoSession session, Object message ) throws Exception
{
KdcContext kdcContext = ( KdcContext ) session.getAttribute( getContextKey() );
- KdcConfiguration config = kdcContext.getConfig();
+ KdcServer config = kdcContext.getConfig();
EncryptionType[] requestedTypes = kdcContext.getRequest().getEType();
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java Thu Oct 11 12:57:20 2007
@@ -22,7 +22,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -70,7 +70,7 @@
KerberosPrincipal ticketPrincipal = request.getServerPrincipal();
EncTicketPartModifier newTicketBody = new EncTicketPartModifier();
- KdcConfiguration config = authContext.getConfig();
+ KdcServer config = authContext.getConfig();
// The INITIAL flag indicates that a ticket was issued using the AS protocol.
newTicketBody.setFlag( TicketFlags.INITIAL );
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/package-info.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/package-info.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/package-info.java Thu Oct 11 12:57:20 2007
@@ -19,7 +19,7 @@
*/
/**
- * Provides the entry point to an instance of the {@link KdcConfiguration}
+ * Provides the entry point to an instance of the {@link KdcServer}
* (KDC), as well as classes common to the KDC's two services: the
* Authentication Service (AS) and the Ticket-Granting Service (TGS). The
* AS and TGS service implementations follow the Chain of Responsibility
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java Thu Oct 11 12:57:20 2007
@@ -22,7 +22,7 @@
import java.io.IOException;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationContext;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
@@ -62,7 +62,7 @@
}
log.debug( "Verifying using encrypted timestamp." );
- KdcConfiguration config = authContext.getConfig();
+ KdcServer config = authContext.getConfig();
KdcRequest request = authContext.getRequest();
CipherTextHandler cipherTextHandler = authContext.getCipherTextHandler();
PrincipalStoreEntry clientEntry = authContext.getClientEntry();
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java Thu Oct 11 12:57:20 2007
@@ -22,7 +22,7 @@
import javax.security.auth.kerberos.KerberosKey;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationContext;
import org.apache.directory.server.kerberos.sam.SamException;
import org.apache.directory.server.kerberos.sam.SamSubsystem;
@@ -61,7 +61,7 @@
log.debug( "Verifying using SAM subsystem." );
AuthenticationContext authContext = ( AuthenticationContext ) session.getAttribute( getContextKey() );
KdcRequest request = authContext.getRequest();
- KdcConfiguration config = authContext.getConfig();
+ KdcServer config = authContext.getConfig();
PrincipalStoreEntry clientEntry = authContext.getClientEntry();
String clientName = clientEntry.getPrincipal().getName();
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java Thu Oct 11 12:57:20 2007
@@ -20,7 +20,7 @@
package org.apache.directory.server.kerberos.kdc.ticketgrant;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
@@ -45,7 +45,7 @@
{
TicketGrantingContext tgsContext = ( TicketGrantingContext ) session.getAttribute( getContextKey() );
- KdcConfiguration config = tgsContext.getConfig();
+ KdcServer config = tgsContext.getConfig();
long clockSkew = config.getAllowableClockSkew();
replayCache.setClockSkew( clockSkew );
tgsContext.setReplayCache( replayCache );
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java Thu Oct 11 12:57:20 2007
@@ -26,7 +26,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
@@ -70,7 +70,7 @@
EncryptionType encryptionType = tgsContext.getEncryptionType();
EncryptionKey serverKey = tgsContext.getRequestPrincipalEntry().getKeyMap().get( encryptionType );
- KdcConfiguration config = tgsContext.getConfig();
+ KdcServer config = tgsContext.getConfig();
EncTicketPartModifier newTicketBody = new EncTicketPartModifier();
@@ -127,7 +127,7 @@
}
- private void processFlags( KdcConfiguration config, KdcRequest request, Ticket tgt,
+ private void processFlags( KdcServer config, KdcRequest request, Ticket tgt,
EncTicketPartModifier newTicketBody ) throws KerberosException
{
if ( tgt.getFlag( TicketFlags.PRE_AUTHENT ) )
@@ -305,7 +305,7 @@
}
- private void processTimes( KdcConfiguration config, KdcRequest request, EncTicketPartModifier newTicketBody,
+ private void processTimes( KdcServer config, KdcRequest request, EncTicketPartModifier newTicketBody,
Ticket tgt ) throws KerberosException
{
KerberosTime now = new KerberosTime();
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java Thu Oct 11 12:57:20 2007
@@ -20,7 +20,7 @@
package org.apache.directory.server.kerberos.kdc.ticketgrant;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
@@ -48,7 +48,7 @@
public void execute( NextCommand next, IoSession session, Object message ) throws Exception
{
TicketGrantingContext tgsContext = ( TicketGrantingContext ) session.getAttribute( getContextKey() );
- KdcConfiguration config = tgsContext.getConfig();
+ KdcServer config = tgsContext.getConfig();
if ( config.isBodyChecksumVerified() )
{
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgt.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgt.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgt.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgt.java Thu Oct 11 12:57:20 2007
@@ -20,7 +20,7 @@
package org.apache.directory.server.kerberos.kdc.ticketgrant;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
@@ -45,7 +45,7 @@
public void execute( NextCommand next, IoSession session, Object message ) throws Exception
{
TicketGrantingContext tgsContext = ( TicketGrantingContext ) session.getAttribute( getContextKey() );
- KdcConfiguration config = tgsContext.getConfig();
+ KdcServer config = tgsContext.getConfig();
Ticket tgt = tgsContext.getTgt();
// Check primary realm.
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java Thu Oct 11 12:57:20 2007
@@ -25,7 +25,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationContext;
import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationServiceChain;
import org.apache.directory.server.kerberos.kdc.ticketgrant.TicketGrantingContext;
@@ -58,7 +58,7 @@
{
private static final Logger log = LoggerFactory.getLogger( KerberosProtocolHandler.class );
- private KdcConfiguration config;
+ private KdcServer config;
private PrincipalStore store;
private IoHandlerCommand authService;
private IoHandlerCommand tgsService;
@@ -71,7 +71,7 @@
* @param config
* @param store
*/
- public KerberosProtocolHandler( KdcConfiguration config, PrincipalStore store )
+ public KerberosProtocolHandler( KdcServer config, PrincipalStore store )
{
this.config = config;
this.store = store;
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java Thu Oct 11 12:57:20 2007
@@ -87,7 +87,7 @@
ldapConfig.setSaslPrincipal( "ldap/localhost@EXAMPLE.COM" );
SocketAcceptor socketAcceptor = new SocketAcceptor( null );
- KdcConfiguration kdcConfig = new KdcConfiguration( null, socketAcceptor, apacheDS.getDirectoryService() );
+ KdcServer kdcConfig = new KdcServer( null, socketAcceptor, apacheDS.getDirectoryService() );
kdcConfig.setEnabled( true );
kdcConfig.setSearchBaseDn( "ou=users,dc=example,dc=com" );
kdcConfig.setSecurityAuthentication( "simple" );
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java Thu Oct 11 12:57:20 2007
@@ -26,7 +26,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KerberosKeyFactory;
@@ -57,7 +57,7 @@
*/
public class AuthenticationEncryptionTypeTest extends AbstractAuthenticationServiceTest
{
- private KdcConfiguration config;
+ private KdcServer config;
private PrincipalStore store;
private KerberosProtocolHandler handler;
private DummySession session;
@@ -68,7 +68,7 @@
*/
public AuthenticationEncryptionTypeTest()
{
- config = new KdcConfiguration( null, null, null );
+ config = new KdcServer( null, null, null );
store = new MapPrincipalStoreImpl();
handler = new KerberosProtocolHandler( config, store );
session = new DummySession();
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java Thu Oct 11 12:57:20 2007
@@ -20,7 +20,7 @@
package org.apache.directory.server.kerberos.protocol;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
import org.apache.directory.server.kerberos.shared.messages.MessageType;
@@ -38,7 +38,7 @@
*/
public class AuthenticationPolicyTest extends AbstractAuthenticationServiceTest
{
- private KdcConfiguration config;
+ private KdcServer config;
private PrincipalStore store;
private KerberosProtocolHandler handler;
private DummySession session;
@@ -49,7 +49,7 @@
*/
public AuthenticationPolicyTest()
{
- config = new KdcConfiguration( null, null, null );
+ config = new KdcServer( null, null, null );
store = new MapPrincipalStoreImpl();
handler = new KerberosProtocolHandler( config, store );
session = new DummySession();
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java Thu Oct 11 12:57:20 2007
@@ -22,7 +22,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
import org.apache.directory.server.kerberos.shared.messages.AuthenticationReply;
@@ -45,7 +45,7 @@
*/
public class AuthenticationServiceTest extends AbstractAuthenticationServiceTest
{
- private KdcConfiguration config;
+ private KdcServer config;
private PrincipalStore store;
private KerberosProtocolHandler handler;
private DummySession session;
@@ -56,7 +56,7 @@
*/
public AuthenticationServiceTest()
{
- config = new KdcConfiguration( null, null, null );
+ config = new KdcServer( null, null, null );
store = new MapPrincipalStoreImpl();
handler = new KerberosProtocolHandler( config, store );
session = new DummySession();
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java Thu Oct 11 12:57:20 2007
@@ -22,7 +22,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
@@ -45,7 +45,7 @@
*/
public class EncTktInSkeyTest extends AbstractTicketGrantingServiceTest
{
- private KdcConfiguration config;
+ private KdcServer config;
private PrincipalStore store;
private KerberosProtocolHandler handler;
private DummySession session;
@@ -56,7 +56,7 @@
*/
public EncTktInSkeyTest()
{
- config = new KdcConfiguration( null, null, null );
+ config = new KdcServer( null, null, null );
/*
* Body checksum verification must be disabled because we are bypassing
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java Thu Oct 11 12:57:20 2007
@@ -22,7 +22,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
import org.apache.directory.server.kerberos.shared.io.encoder.EncryptedDataEncoder;
@@ -50,7 +50,7 @@
*/
public class PreAuthenticationTest extends AbstractAuthenticationServiceTest
{
- private KdcConfiguration config;
+ private KdcServer config;
private PrincipalStore store;
private KerberosProtocolHandler handler;
private DummySession session;
@@ -61,7 +61,7 @@
*/
public PreAuthenticationTest()
{
- config = new KdcConfiguration( null, null, null );
+ config = new KdcServer( null, null, null );
store = new MapPrincipalStoreImpl();
handler = new KerberosProtocolHandler( config, store );
session = new DummySession();
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java Thu Oct 11 12:57:20 2007
@@ -26,7 +26,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KerberosKeyFactory;
@@ -51,7 +51,7 @@
*/
public class TicketGrantingEncryptionTypeTest extends AbstractTicketGrantingServiceTest
{
- private KdcConfiguration config;
+ private KdcServer config;
private PrincipalStore store;
private KerberosProtocolHandler handler;
private DummySession session;
@@ -62,7 +62,7 @@
*/
public TicketGrantingEncryptionTypeTest()
{
- config = new KdcConfiguration( null, null, null );
+ config = new KdcServer( null, null, null );
/*
* Body checksum verification must be disabled because we are bypassing
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java Thu Oct 11 12:57:20 2007
@@ -24,7 +24,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
@@ -49,7 +49,7 @@
*/
public class TicketGrantingPolicyTest extends AbstractTicketGrantingServiceTest
{
- private KdcConfiguration config;
+ private KdcServer config;
private PrincipalStore store;
private KerberosProtocolHandler handler;
private DummySession session;
@@ -60,7 +60,7 @@
*/
public TicketGrantingPolicyTest()
{
- config = new KdcConfiguration( null, null, null );
+ config = new KdcServer( null, null, null );
/*
* Body checksum verification must be disabled because we are bypassing
Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java Thu Oct 11 12:57:20 2007
@@ -24,7 +24,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumType;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
@@ -55,7 +55,7 @@
*/
public class TicketGrantingServiceTest extends AbstractTicketGrantingServiceTest
{
- private KdcConfiguration config;
+ private KdcServer config;
private PrincipalStore store;
private KerberosProtocolHandler handler;
private DummySession session;
@@ -66,7 +66,7 @@
*/
public TicketGrantingServiceTest()
{
- config = new KdcConfiguration(null, null, null);
+ config = new KdcServer(null, null, null);
/*
* Body checksum verification must be disabled because we are bypassing
Copied: directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java (from r583683, directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java?p2=directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java&p1=directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java&r1=583683&r2=583938&rev=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java Thu Oct 11 12:57:20 2007
@@ -39,7 +39,7 @@
* @version $Rev$, $Date$
* @org.apache.xbean.XBean
*/
-public class NtpConfiguration extends ServiceConfiguration
+public class NtpServer extends ServiceConfiguration
{
private static final long serialVersionUID = 2961795205765175775L;
@@ -64,7 +64,7 @@
/**
* Creates a new instance of NtpConfiguration.
*/
- public NtpConfiguration( DatagramAcceptor datagramAcceptor, SocketAcceptor socketAcceptor )
+ public NtpServer( DatagramAcceptor datagramAcceptor, SocketAcceptor socketAcceptor )
{
this.datagramAcceptor = datagramAcceptor;
this.socketAcceptor = socketAcceptor;
Propchange: directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu Oct 11 12:57:20 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/package-info.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/package-info.java (original)
+++ directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/package-info.java Thu Oct 11 12:57:20 2007
@@ -20,7 +20,7 @@
/**
* Provides the entry point to instances of the
- * {@link org.apache.directory.server.ntp.NtpConfiguration},
+ * {@link org.apache.directory.server.ntp.NtpServer},
* as well as support for configuration and the root
* of the exception hierarchy.
*
Modified: directory/apacheds/branches/bigbang/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java (original)
+++ directory/apacheds/branches/bigbang/protocol-ntp/src/test/java/org/apache/directory/server/ntp/NtpITest.java Thu Oct 11 12:57:20 2007
@@ -39,7 +39,7 @@
*/
public class NtpITest extends TestCase
{
- private NtpConfiguration ntpConfig;
+ private NtpServer ntpConfig;
private int port;
@@ -49,7 +49,7 @@
public void setUp() throws Exception
{
DatagramAcceptor datagramAcceptor = new DatagramAcceptor( null );
- ntpConfig = new NtpConfiguration( datagramAcceptor, null );
+ ntpConfig = new NtpServer( datagramAcceptor, null );
ntpConfig.setEnabled( true );
port = AvailablePortFinder.getNextAvailable( 10123 );
ntpConfig.setIpPort( port );
Modified: directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml?rev=583938&r1=583937&r2=583938&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml (original)
+++ directory/apacheds/branches/bigbang/server-xml/src/main/resources/server.xml Thu Oct 11 12:57:20 2007
@@ -151,25 +151,25 @@
<datagramAcceptor executor="#standardThreadPool"/>
<socketAcceptor executor="#standardThreadPool"/>
- <changePasswordConfiguration ipPort="80464">
+ <changePasswordServer ipPort="80464">
<directoryService>#directoryService</directoryService>
<datagramAcceptor>#datagramAcceptor</datagramAcceptor>
<socketAcceptor>#socketAcceptor</socketAcceptor>
- </changePasswordConfiguration>
- <kdcConfiguration ipPort="80088">
+ </changePasswordServer>
+ <kdcServer ipPort="80088">
<directoryService>#directoryService</directoryService>
<datagramAcceptor>#datagramAcceptor</datagramAcceptor>
<socketAcceptor>#socketAcceptor</socketAcceptor>
- </kdcConfiguration>
- <ntpConfiguration ipPort="80123">
+ </kdcServer>
+ <ntpServer ipPort="80123">
<datagramAcceptor>#datagramAcceptor</datagramAcceptor>
<socketAcceptor>#socketAcceptor</socketAcceptor>
- </ntpConfiguration>
- <dnsConfiguration ipPort="8053">
+ </ntpServer>
+ <dnsServer ipPort="8053">
<directoryService>#directoryService</directoryService>
<datagramAcceptor>#datagramAcceptor</datagramAcceptor>
<socketAcceptor>#socketAcceptor</socketAcceptor>
- </dnsConfiguration>
+ </dnsServer>
<!-- another bean I didn't convert -->
<spring:bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">