directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccust...@apache.org
Subject svn commit: r556238 [6/8] - in /directory: apacheds/trunk-with-dependencies/ sandbox/ccustine/new_installers/apacheds/ sandbox/ccustine/new_installers/apacheds/benchmarks/ sandbox/ccustine/new_installers/apacheds/bootstrap-extract/ sandbox/ccustine/new...
Date Sat, 14 Jul 2007 07:55:59 GMT
Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuPlateauTable.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuPlateauTable.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuPlateauTable.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuPlateauTable.java Sat Jul 14 00:55:44 2007
@@ -44,7 +44,12 @@
     private byte[] pathMtuPlateauTable;
 
 
-    public PathMtuPlateauTable(byte[] pathMtuPlateauTable)
+    /**
+     * Creates a new instance of PathMtuPlateauTable.
+     *
+     * @param pathMtuPlateauTable
+     */
+    public PathMtuPlateauTable( byte[] pathMtuPlateauTable )
     {
         super( 25, 2 );
         this.pathMtuPlateauTable = pathMtuPlateauTable;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PolicyFilter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PolicyFilter.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PolicyFilter.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PolicyFilter.java Sat Jul 14 00:55:44 2007
@@ -46,7 +46,12 @@
     private byte[] policyFilter;
 
 
-    public PolicyFilter(byte[] policyFilter)
+    /**
+     * Creates a new instance of PolicyFilter.
+     *
+     * @param policyFilter
+     */
+    public PolicyFilter( byte[] policyFilter )
     {
         super( 21, 8 );
         this.policyFilter = policyFilter;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/AllSubnetsAreLocal.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/AllSubnetsAreLocal.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/AllSubnetsAreLocal.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/AllSubnetsAreLocal.java Sat Jul 14 00:55:44 2007
@@ -44,7 +44,12 @@
     private byte[] allSubnetsAreLocal;
 
 
-    public AllSubnetsAreLocal(byte[] allSubnetsAreLocal)
+    /**
+     * Creates a new instance of AllSubnetsAreLocal.
+     *
+     * @param allSubnetsAreLocal
+     */
+    public AllSubnetsAreLocal( byte[] allSubnetsAreLocal )
     {
         super( 27, 1 );
         this.allSubnetsAreLocal = allSubnetsAreLocal;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/BroadcastAddress.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/BroadcastAddress.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/BroadcastAddress.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/BroadcastAddress.java Sat Jul 14 00:55:44 2007
@@ -40,7 +40,12 @@
     private byte[] broadcastAddress;
 
 
-    public BroadcastAddress(byte[] broadcastAddress)
+    /**
+     * Creates a new instance of BroadcastAddress.
+     *
+     * @param broadcastAddress
+     */
+    public BroadcastAddress( byte[] broadcastAddress )
     {
         super( 28, 4 );
         this.broadcastAddress = broadcastAddress;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/InterfaceMtu.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/InterfaceMtu.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/InterfaceMtu.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/InterfaceMtu.java Sat Jul 14 00:55:44 2007
@@ -41,7 +41,12 @@
     private byte[] interfaceMtu;
 
 
-    public InterfaceMtu(byte[] interfaceMtu)
+    /**
+     * Creates a new instance of InterfaceMtu.
+     *
+     * @param interfaceMtu
+     */
+    public InterfaceMtu( byte[] interfaceMtu )
     {
         super( 26, 2 );
         this.interfaceMtu = interfaceMtu;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/MaskSupplier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/MaskSupplier.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/MaskSupplier.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/MaskSupplier.java Sat Jul 14 00:55:44 2007
@@ -42,7 +42,12 @@
     private byte[] maskSupplier;
 
 
-    public MaskSupplier(byte[] maskSupplier)
+    /**
+     * Creates a new instance of MaskSupplier.
+     *
+     * @param maskSupplier
+     */
+    public MaskSupplier( byte[] maskSupplier )
     {
         super( 30, 1 );
         this.maskSupplier = maskSupplier;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformMaskDiscovery.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformMaskDiscovery.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformMaskDiscovery.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformMaskDiscovery.java Sat Jul 14 00:55:44 2007
@@ -42,7 +42,12 @@
     private byte[] performMaskDiscovery;
 
 
-    public PerformMaskDiscovery(byte[] performMaskDiscovery)
+    /**
+     * Creates a new instance of PerformMaskDiscovery.
+     *
+     * @param performMaskDiscovery
+     */
+    public PerformMaskDiscovery( byte[] performMaskDiscovery )
     {
         super( 29, 1 );
         this.performMaskDiscovery = performMaskDiscovery;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformRouterDiscovery.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformRouterDiscovery.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformRouterDiscovery.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformRouterDiscovery.java Sat Jul 14 00:55:44 2007
@@ -43,7 +43,12 @@
     private byte[] performRouterDiscovery;
 
 
-    public PerformRouterDiscovery(byte[] performRouterDiscovery)
+    /**
+     * Creates a new instance of PerformRouterDiscovery.
+     *
+     * @param performRouterDiscovery
+     */
+    public PerformRouterDiscovery( byte[] performRouterDiscovery )
     {
         super( 31, 1 );
         this.performRouterDiscovery = performRouterDiscovery;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/RouterSolicitationAddress.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/RouterSolicitationAddress.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/RouterSolicitationAddress.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/RouterSolicitationAddress.java Sat Jul 14 00:55:44 2007
@@ -40,7 +40,12 @@
     private byte[] routerSolicitationAddress;
 
 
-    public RouterSolicitationAddress(byte[] routerSolicitationAddress)
+    /**
+     * Creates a new instance of RouterSolicitationAddress.
+     *
+     * @param routerSolicitationAddress
+     */
+    public RouterSolicitationAddress( byte[] routerSolicitationAddress )
     {
         super( 32, 4 );
         this.routerSolicitationAddress = routerSolicitationAddress;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/StaticRoute.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/StaticRoute.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/StaticRoute.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/StaticRoute.java Sat Jul 14 00:55:44 2007
@@ -50,7 +50,12 @@
     private byte[] staticRoute;
 
 
-    public StaticRoute(byte[] staticRoute)
+    /**
+     * Creates a new instance of StaticRoute.
+     *
+     * @param staticRoute
+     */
+    public StaticRoute( byte[] staticRoute )
     {
         super( 33, 8 );
         this.staticRoute = staticRoute;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java Sat Jul 14 00:55:44 2007
@@ -41,7 +41,12 @@
     private byte[] tcpDefaultTimeToLive;
 
 
-    public TcpDefaultTimeToLive(byte[] tcpDefaultTimeToLive)
+    /**
+     * Creates a new instance of TcpDefaultTimeToLive.
+     *
+     * @param tcpDefaultTimeToLive
+     */
+    public TcpDefaultTimeToLive( byte[] tcpDefaultTimeToLive )
     {
         super( 37, 1 );
         this.tcpDefaultTimeToLive = tcpDefaultTimeToLive;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java Sat Jul 14 00:55:44 2007
@@ -43,7 +43,12 @@
     private byte[] tcpKeepaliveGarbage;
 
 
-    public TcpKeepaliveGarbage(byte[] tcpKeepaliveGarbage)
+    /**
+     * Creates a new instance of TcpKeepaliveGarbage.
+     *
+     * @param tcpKeepaliveGarbage
+     */
+    public TcpKeepaliveGarbage( byte[] tcpKeepaliveGarbage )
     {
         super( 38, 4 );
         this.tcpKeepaliveGarbage = tcpKeepaliveGarbage;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java Sat Jul 14 00:55:44 2007
@@ -43,7 +43,12 @@
     private byte[] tcpKeepaliveInterval;
 
 
-    public TcpKeepaliveInterval(byte[] tcpKeepaliveInterval)
+    /**
+     * Creates a new instance of TcpKeepaliveInterval.
+     *
+     * @param tcpKeepaliveInterval
+     */
+    public TcpKeepaliveInterval( byte[] tcpKeepaliveInterval )
     {
         super( 39, 1 );
         this.tcpKeepaliveInterval = tcpKeepaliveInterval;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java Sat Jul 14 00:55:44 2007
@@ -42,7 +42,12 @@
     private byte[] bootFileSize;
 
 
-    public BootFileSize(byte[] bootFileSize)
+    /**
+     * Creates a new instance of BootFileSize.
+     *
+     * @param bootFileSize
+     */
+    public BootFileSize( byte[] bootFileSize )
     {
         super( 13, 2 );
         this.bootFileSize = bootFileSize;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java Sat Jul 14 00:55:44 2007
@@ -38,7 +38,12 @@
  */
 public class CookieServers extends AddressListOption
 {
-    public CookieServers(byte[] cookieServers)
+    /**
+     * Creates a new instance of CookieServers.
+     *
+     * @param cookieServers
+     */
+    public CookieServers( byte[] cookieServers )
     {
         super( 8, cookieServers );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java Sat Jul 14 00:55:44 2007
@@ -41,7 +41,12 @@
     private byte[] domainName;
 
 
-    public DomainName(byte[] domainName)
+    /**
+     * Creates a new instance of DomainName.
+     *
+     * @param domainName
+     */
+    public DomainName( byte[] domainName )
     {
         super( 15, 1 );
         this.domainName = domainName;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java Sat Jul 14 00:55:44 2007
@@ -39,7 +39,12 @@
  */
 public class DomainNameServers extends AddressListOption
 {
-    public DomainNameServers(byte[] domainNameServers)
+    /**
+     * Creates a new instance of DomainNameServers.
+     *
+     * @param domainNameServers
+     */
+    public DomainNameServers( byte[] domainNameServers )
     {
         super( 6, domainNameServers );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/EndOption.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/EndOption.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/EndOption.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/EndOption.java Sat Jul 14 00:55:44 2007
@@ -38,6 +38,9 @@
  */
 public class EndOption extends DhcpOption
 {
+    /**
+     * Creates a new instance of EndOption.
+     */
     public EndOption()
     {
         super( 255, 1 );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java Sat Jul 14 00:55:44 2007
@@ -48,7 +48,12 @@
     private byte[] extensionsPath;
 
 
-    public ExtensionsPath(byte[] extensionsPath)
+    /**
+     * Creates a new instance of ExtensionsPath.
+     *
+     * @param extensionsPath
+     */
+    public ExtensionsPath( byte[] extensionsPath )
     {
         super( 18, 1 );
         this.extensionsPath = extensionsPath;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java Sat Jul 14 00:55:44 2007
@@ -43,7 +43,12 @@
     private byte[] hostName;
 
 
-    public HostName(byte[] hostName)
+    /**
+     * Creates a new instance of HostName.
+     *
+     * @param hostName
+     */
+    public HostName( byte[] hostName )
     {
         super( 12, 1 );
         this.hostName = hostName;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java Sat Jul 14 00:55:44 2007
@@ -39,7 +39,12 @@
  */
 public class ImpressServers extends AddressListOption
 {
-    public ImpressServers(byte[] impressServers)
+    /**
+     * Creates a new instance of ImpressServers.
+     *
+     * @param impressServers
+     */
+    public ImpressServers( byte[] impressServers )
     {
         super( 10, impressServers );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LogServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LogServers.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LogServers.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LogServers.java Sat Jul 14 00:55:44 2007
@@ -38,7 +38,12 @@
  */
 public class LogServers extends AddressListOption
 {
-    public LogServers(byte[] logServers)
+    /**
+     * Creates a new instance of LogServers.
+     *
+     * @param logServers
+     */
+    public LogServers( byte[] logServers )
     {
         super( 7, logServers );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LprServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LprServers.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LprServers.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LprServers.java Sat Jul 14 00:55:44 2007
@@ -38,7 +38,12 @@
  */
 public class LprServers extends AddressListOption
 {
-    public LprServers(byte[] lprServers)
+    /**
+     * Creates a new instance of LprServers.
+     *
+     * @param lprServers
+     */
+    public LprServers( byte[] lprServers )
     {
         super( 9, lprServers );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/MeritDumpFile.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/MeritDumpFile.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/MeritDumpFile.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/MeritDumpFile.java Sat Jul 14 00:55:44 2007
@@ -43,7 +43,12 @@
     private byte[] meritDumpFile;
 
 
-    public MeritDumpFile(byte[] meritDumpFile)
+    /**
+     * Creates a new instance of MeritDumpFile.
+     *
+     * @param meritDumpFile
+     */
+    public MeritDumpFile( byte[] meritDumpFile )
     {
         super( 14, 1 );
         this.meritDumpFile = meritDumpFile;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/NameServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/NameServers.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/NameServers.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/NameServers.java Sat Jul 14 00:55:44 2007
@@ -39,7 +39,12 @@
  */
 public class NameServers extends AddressListOption
 {
-    public NameServers(byte[] nameServers)
+    /**
+     * Creates a new instance of NameServers.
+     *
+     * @param nameServers
+     */
+    public NameServers( byte[] nameServers )
     {
         super( 5, nameServers );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/PadOption.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/PadOption.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/PadOption.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/PadOption.java Sat Jul 14 00:55:44 2007
@@ -37,6 +37,9 @@
  */
 public class PadOption extends DhcpOption
 {
+    /**
+     * Creates a new instance of PadOption.
+     */
     public PadOption()
     {
         super( 0, 1 );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ResourceLocationServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ResourceLocationServers.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ResourceLocationServers.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ResourceLocationServers.java Sat Jul 14 00:55:44 2007
@@ -38,7 +38,12 @@
  */
 public class ResourceLocationServers extends AddressListOption
 {
-    public ResourceLocationServers(byte[] resourceLocationServers)
+    /**
+     * Creates a new instance of ResourceLocationServers.
+     *
+     * @param resourceLocationServers
+     */
+    public ResourceLocationServers( byte[] resourceLocationServers )
     {
         super( 11, resourceLocationServers );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/RootPath.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/RootPath.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/RootPath.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/RootPath.java Sat Jul 14 00:55:44 2007
@@ -42,7 +42,12 @@
     private byte[] rootPath;
 
 
-    public RootPath(byte[] rootPath)
+    /**
+     * Creates a new instance of RootPath.
+     *
+     * @param rootPath
+     */
+    public RootPath( byte[] rootPath )
     {
         super( 17, 1 );
         this.rootPath = rootPath;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/Routers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/Routers.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/Routers.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/Routers.java Sat Jul 14 00:55:44 2007
@@ -38,7 +38,12 @@
  */
 public class Routers extends AddressListOption
 {
-    public Routers(byte[] routers)
+    /**
+     * Creates a new instance of Routers.
+     *
+     * @param routers
+     */
+    public Routers( byte[] routers )
     {
         super( 3, routers );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SubnetMask.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SubnetMask.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SubnetMask.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SubnetMask.java Sat Jul 14 00:55:44 2007
@@ -39,7 +39,12 @@
  */
 public class SubnetMask extends AddressOption
 {
-    public SubnetMask(byte[] subnetMask)
+    /**
+     * Creates a new instance of SubnetMask.
+     *
+     * @param subnetMask
+     */
+    public SubnetMask( byte[] subnetMask )
     {
         super( 1, subnetMask );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SwapServer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SwapServer.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SwapServer.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SwapServer.java Sat Jul 14 00:55:44 2007
@@ -35,7 +35,12 @@
  */
 public class SwapServer extends AddressOption
 {
-    public SwapServer(byte[] swapServer)
+    /**
+     * Creates a new instance of SwapServer.
+     *
+     * @param swapServer
+     */
+    public SwapServer( byte[] swapServer )
     {
         super( 16, swapServer );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeOffset.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeOffset.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeOffset.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeOffset.java Sat Jul 14 00:55:44 2007
@@ -44,7 +44,12 @@
     private byte[] timeOffset;
 
 
-    public TimeOffset(byte[] timeOffset)
+    /**
+     * Creates a new instance of TimeOffset.
+     *
+     * @param timeOffset
+     */
+    public TimeOffset( byte[] timeOffset )
     {
         super( 2, 4 );
         this.timeOffset = timeOffset;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeServers.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeServers.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeServers.java Sat Jul 14 00:55:44 2007
@@ -39,7 +39,12 @@
  */
 public class TimeServers extends AddressListOption
 {
-    public TimeServers(byte[] timeServers)
+    /**
+     * Creates a new instance of TimeServers.
+     *
+     * @param timeServers
+     */
+    public TimeServers( byte[] timeServers )
     {
         super( 4, timeServers );
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java Sat Jul 14 00:55:44 2007
@@ -34,6 +34,8 @@
 import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.transport.socket.nio.DatagramConnector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -42,43 +44,44 @@
  */
 public class DhcpProtocolHandler implements IoHandler
 {
+    private static final Logger log = LoggerFactory.getLogger( DhcpProtocolHandler.class );
+
+
     public void sessionCreated( IoSession session ) throws Exception
     {
-        System.out.println( session.getRemoteAddress() + " CREATED" );
+        log.debug( "{} CREATED", session.getRemoteAddress() );
         session.getFilterChain().addFirst( "codec", new ProtocolCodecFilter( new DhcpProtocolCodecFactory() ) );
     }
 
 
     public void sessionOpened( IoSession session )
     {
-        System.out.println( session.getRemoteAddress() + " OPENED" );
+        log.debug( "{} OPENED", session.getRemoteAddress() );
     }
 
 
     public void sessionClosed( IoSession session )
     {
-        System.out.println( session.getRemoteAddress() + " CLOSED" );
+        log.debug( "{} CLOSED", session.getRemoteAddress() );
     }
 
 
     public void sessionIdle( IoSession session, IdleStatus status )
     {
-        System.out.println( session.getRemoteAddress() + " IDLE(" + status + ")" );
+        log.debug( "{} IDLE ({})", session.getRemoteAddress(), status );
     }
 
 
     public void exceptionCaught( IoSession session, Throwable cause )
     {
-        System.out.println( session.getRemoteAddress() + " EXCEPTION" );
-        cause.printStackTrace( System.out );
-
+        log.debug( session.getRemoteAddress() + " EXCEPTION", cause );
         session.close();
     }
 
 
     public void messageReceived( IoSession session, Object message ) throws Exception
     {
-        System.out.println( session.getRemoteAddress() + " RCVD: " + message );
+        log.debug( "{} RCVD:  {}", session.getRemoteAddress(), message );
 
         DhcpMessage request = ( DhcpMessage ) message;
 
@@ -90,6 +93,7 @@
             int PORT = 68;
             IoConnector connector = new DatagramConnector();
             InetAddress broadcast = InetAddress.getByName( null );
+
             ConnectFuture future = connector.connect( new InetSocketAddress( broadcast, PORT ),
                 new DhcpProtocolHandler() );
             future.join();
@@ -102,6 +106,6 @@
 
     public void messageSent( IoSession session, Object message )
     {
-        System.out.println( session.getRemoteAddress() + " SENT: " + message );
+        log.debug( "{} SENT:  {}", session.getRemoteAddress(), message );
     }
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/pom.xml?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/pom.xml (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/pom.xml Sat Jul 14 00:55:44 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-dns</artifactId>
@@ -16,11 +16,6 @@
   <packaging>jar</packaging>  
 
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.mina</groupId>

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java Sat Jul 14 00:55:44 2007
@@ -76,7 +76,7 @@
 
             acceptor.bind( new InetSocketAddress( port ), handler, serviceConfig );
 
-            log.debug( "{} listening on port {}", name, new Integer( port ) );
+            log.debug( "{} listening on port {}.", name, new Integer( port ) );
         }
         catch ( IOException ioe )
         {
@@ -91,7 +91,7 @@
      * @param newConfig
      * @return Whether configuration being proposed as new is really different.
      */
-    public boolean isDifferent( Dictionary newConfig )
+    public boolean isDifferent( Dictionary<String, Object> newConfig )
     {
         return config.isDifferent( newConfig );
     }
@@ -107,6 +107,6 @@
         acceptor = null;
         handler = null;
 
-        log.debug( "{} has stopped listening on port {}", config.getServiceName(), new Integer( config.getIpPort() ) );
+        log.debug( "{} has stopped listening on port {}.", config.getServiceName(), new Integer( config.getIpPort() ) );
     }
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/Main.java Sat Jul 14 00:55:44 2007
@@ -26,6 +26,7 @@
 import org.apache.mina.common.IoAcceptor;
 import org.apache.mina.transport.socket.nio.DatagramAcceptor;
 import org.apache.mina.transport.socket.nio.DatagramAcceptorConfig;
+import org.apache.mina.transport.socket.nio.SocketAcceptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,10 +47,12 @@
     private static final int MAX_THREADS_DEFAULT = 4;
 
     protected static IoAcceptor udpAcceptor;
+    protected static IoAcceptor tcpAcceptor;
     protected static ThreadPoolExecutor threadPoolExecutor;
     protected static ExecutorThreadModel threadModel = ExecutorThreadModel.getInstance( "ApacheDS" );
 
     private static DnsServer udpDnsServer;
+    private static DnsServer tcpDnsServer;
 
 
     /**
@@ -66,6 +69,7 @@
         threadModel.setExecutor( threadPoolExecutor );
 
         udpAcceptor = new DatagramAcceptor();
+        tcpAcceptor = new SocketAcceptor();
 
         new Main().go();
     }
@@ -96,10 +100,11 @@
 
         try
         {
-            DatagramAcceptorConfig udpConfig = new DatagramAcceptorConfig();
-            udpConfig.setThreadModel( threadModel );
+            DatagramAcceptorConfig serviceConfig = new DatagramAcceptorConfig();
+            serviceConfig.setThreadModel( threadModel );
 
-            udpDnsServer = new DnsServer( dnsConfig, udpAcceptor, udpConfig, store );
+            udpDnsServer = new DnsServer( dnsConfig, udpAcceptor, serviceConfig, store );
+            tcpDnsServer = new DnsServer( dnsConfig, tcpAcceptor, serviceConfig, store );
         }
         catch ( Throwable t )
         {
@@ -120,6 +125,18 @@
             }
 
             udpDnsServer = null;
+        }
+
+        if ( tcpDnsServer != null )
+        {
+            tcpDnsServer.destroy();
+
+            if ( log.isInfoEnabled() )
+            {
+                log.info( "Unbind of DNS Service complete: " + tcpDnsServer );
+            }
+
+            tcpDnsServer = null;
         }
     }
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoder.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoder.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoder.java Sat Jul 14 00:55:44 2007
@@ -51,7 +51,7 @@
  */
 public class AddressRecordDecoder implements RecordDecoder
 {
-    public Map decode( ByteBuffer byteBuffer, short length ) throws IOException
+    public Map<String, Object> decode( ByteBuffer byteBuffer, short length ) throws IOException
     {
         Map<String, Object> attributes = new HashMap<String, Object>();
         byte[] addressBytes = new byte[length];

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/DnsMessageDecoder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/DnsMessageDecoder.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/DnsMessageDecoder.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/DnsMessageDecoder.java Sat Jul 14 00:55:44 2007
@@ -60,7 +60,7 @@
     /**
      * A Hashed Adapter mapping record types to their encoders.
      */
-    private static final Map DEFAULT_DECODERS;
+    private static final Map<RecordType, RecordDecoder> DEFAULT_DECODERS;
 
     static
     {
@@ -133,7 +133,7 @@
             int timeToLive = byteBuffer.getInt();
             short dataLength = byteBuffer.getShort();
 
-            Map attributes = decode( byteBuffer, recordType, dataLength );
+            Map<String, Object> attributes = decode( byteBuffer, recordType, dataLength );
             records.add( new ResourceRecordImpl( domainName, recordType, recordClass, timeToLive, attributes ) );
         }
 
@@ -141,7 +141,7 @@
     }
 
 
-    private Map decode( ByteBuffer byteBuffer, RecordType type, short length ) throws IOException
+    private Map<String, Object> decode( ByteBuffer byteBuffer, RecordType type, short length ) throws IOException
     {
         RecordDecoder recordDecoder = ( RecordDecoder ) DEFAULT_DECODERS.get( type );
 

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/IPv6RecordDecoder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/IPv6RecordDecoder.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/IPv6RecordDecoder.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/IPv6RecordDecoder.java Sat Jul 14 00:55:44 2007
@@ -46,7 +46,7 @@
 public class IPv6RecordDecoder implements RecordDecoder
 {
 
-    public Map decode( ByteBuffer byteBuffer, short length ) throws IOException
+    public Map<String, Object> decode( ByteBuffer byteBuffer, short length ) throws IOException
     {
         Map<String, Object> attributes = new HashMap<String, Object>();
         byte[] addressBytes = new byte[length];

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/MailExchangeRecordDecoder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/MailExchangeRecordDecoder.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/MailExchangeRecordDecoder.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/MailExchangeRecordDecoder.java Sat Jul 14 00:55:44 2007
@@ -58,7 +58,7 @@
  */
 public class MailExchangeRecordDecoder implements RecordDecoder
 {
-    public Map decode( ByteBuffer byteBuffer, short length ) throws IOException
+    public Map<String, Object> decode( ByteBuffer byteBuffer, short length ) throws IOException
     {
         Map<String, Object> attributes = new HashMap<String, Object>();
         attributes.put( DnsAttribute.MX_PREFERENCE, byteBuffer.getShort() );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/NameServerRecordDecoder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/NameServerRecordDecoder.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/NameServerRecordDecoder.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/NameServerRecordDecoder.java Sat Jul 14 00:55:44 2007
@@ -52,10 +52,9 @@
  */
 public class NameServerRecordDecoder implements RecordDecoder
 {
-
-    public Map decode( ByteBuffer byteBuffer, short length ) throws IOException
+    public Map<String, Object> decode( ByteBuffer byteBuffer, short length ) throws IOException
     {
-        Map<String, String> map = new HashMap<String, String>();
+        Map<String, Object> map = new HashMap<String, Object>();
         map.put( DnsAttribute.DOMAIN_NAME, DnsMessageDecoder.getDomainName( byteBuffer ) );
         return map;
     }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java Sat Jul 14 00:55:44 2007
@@ -42,5 +42,5 @@
      * @return The map of attributes.
      * @throws IOException
      */
-    public Map decode( ByteBuffer byteBuffer, short length ) throws IOException;
+    public Map<String, Object> decode( ByteBuffer byteBuffer, short length ) throws IOException;
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/DnsMessageEncoder.java Sat Jul 14 00:55:44 2007
@@ -35,7 +35,6 @@
 import org.apache.directory.server.dns.messages.RecordType;
 import org.apache.directory.server.dns.messages.ResourceRecord;
 import org.apache.directory.server.dns.messages.ResponseCode;
-import org.apache.directory.server.dns.protocol.DnsEncoder;
 import org.apache.mina.common.ByteBuffer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,14 +51,13 @@
  */
 public class DnsMessageEncoder
 {
-
     /** the log for this class */
-    private static final Logger log = LoggerFactory.getLogger( DnsEncoder.class );
+    private static final Logger log = LoggerFactory.getLogger( DnsMessageEncoder.class );
 
     /**
      * A Hashed Adapter mapping record types to their encoders.
      */
-    private static final Map DEFAULT_ENCODERS;
+    private static final Map<RecordType, RecordEncoder> DEFAULT_ENCODERS;
 
     static
     {
@@ -125,11 +123,11 @@
 
         QuestionRecordEncoder encoder = new QuestionRecordEncoder();
 
-        Iterator it = questions.iterator();
+        Iterator<QuestionRecord> it = questions.iterator();
 
         while ( it.hasNext() )
         {
-            QuestionRecord question = ( QuestionRecord ) it.next();
+            QuestionRecord question = it.next();
             encoder.put( byteBuffer, question );
         }
     }
@@ -142,11 +140,11 @@
             return;
         }
 
-        Iterator it = records.iterator();
+        Iterator<ResourceRecord> it = records.iterator();
 
         while ( it.hasNext() )
         {
-            ResourceRecord record = ( ResourceRecord ) it.next();
+            ResourceRecord record = it.next();
 
             try
             {
@@ -233,5 +231,4 @@
     {
         return ( byte ) ( responseCode.convert() & 0x0F );
     }
-
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordImpl.java Sat Jul 14 00:55:44 2007
@@ -89,7 +89,7 @@
      * resource.  The format of this information varies
      * according to the TYPE and CLASS of the resource record.
      */
-    private Map attributes;
+    private Map<String, Object> attributes;
 
 
     /**
@@ -102,7 +102,7 @@
      * @param attributes
      */
     public ResourceRecordImpl( String domainName, RecordType recordType, RecordClass recordClass, int timeToLive,
-        Map attributes )
+        Map<String, Object> attributes )
     {
         this.domainName = domainName;
         this.recordType = recordType;

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordModifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordModifier.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordModifier.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecordModifier.java Sat Jul 14 00:55:44 2007
@@ -35,7 +35,7 @@
     private RecordClass dnsClass;
     private int dnsTtl;
 
-    private Map<String, String> attributes = new HashMap<String, String>();
+    private Map<String, Object> attributes = new HashMap<String, Object>();
 
 
     /**

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java Sat Jul 14 00:55:44 2007
@@ -37,6 +37,7 @@
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoSession;
+import org.apache.mina.common.TransportType;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
 import org.apache.mina.handler.chain.IoHandlerCommand;
 import org.slf4j.Logger;
@@ -74,9 +75,21 @@
 
     public void sessionCreated( IoSession session ) throws Exception
     {
-        log.debug( "{} CREATED", session.getRemoteAddress() );
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( "{} CREATED:  {}", session.getRemoteAddress(), session.getTransportType() );
+        }
 
-        session.getFilterChain().addFirst( "codec", new ProtocolCodecFilter( DnsProtocolCodecFactory.getInstance() ) );
+        if ( session.getTransportType() == TransportType.DATAGRAM )
+        {
+            session.getFilterChain().addFirst( "codec",
+                new ProtocolCodecFilter( DnsProtocolUdpCodecFactory.getInstance() ) );
+        }
+        else
+        {
+            session.getFilterChain().addFirst( "codec",
+                new ProtocolCodecFilter( DnsProtocolTcpCodecFactory.getInstance() ) );
+        }
     }
 
 
@@ -94,7 +107,7 @@
 
     public void sessionIdle( IoSession session, IdleStatus status )
     {
-        log.debug( "{} IDLE({})", session.getRemoteAddress(), status );
+        log.debug( "{} IDLE ({})", session.getRemoteAddress(), status );
     }
 
 
@@ -107,7 +120,7 @@
 
     public void messageReceived( IoSession session, Object message )
     {
-        log.debug( "{} RCVD: {}", session.getRemoteAddress(), message );
+        log.debug( "{} RCVD:  {}", session.getRemoteAddress(), message );
 
         try
         {
@@ -153,7 +166,7 @@
 
     public void messageSent( IoSession session, Object message )
     {
-        log.debug( "{} SENT: {}", session.getRemoteAddress(), message );
+        log.debug( "{} SENT:  {}", session.getRemoteAddress(), message );
     }
 
 

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/GetResourceRecords.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/GetResourceRecords.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/GetResourceRecords.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/GetResourceRecords.java Sat Jul 14 00:55:44 2007
@@ -30,7 +30,6 @@
 import org.apache.directory.server.dns.messages.ResourceRecord;
 import org.apache.directory.server.dns.messages.ResponseCode;
 import org.apache.directory.server.dns.store.RecordStore;
-import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.handler.chain.IoHandlerCommand;
 import org.slf4j.Logger;
@@ -57,11 +56,11 @@
         DnsMessage request = ( DnsMessage ) message;
         List<QuestionRecord> questions = request.getQuestionRecords();
 
-        Iterator it = questions.iterator();
+        Iterator<QuestionRecord> it = questions.iterator();
 
         while ( it.hasNext() )
         {
-            dnsContext.addResourceRecords( getEntry( store, ( QuestionRecord ) it.next() ) );
+            dnsContext.addResourceRecords( getEntry( store, it.next() ) );
         }
 
         next.execute( session, message );
@@ -74,28 +73,13 @@
      * @param store
      * @param question
      * @return The set of {@link ResourceRecord}s.
-     * @throws Exception
+     * @throws DNSException
      */
-    public Set<ResourceRecord> getEntry( RecordStore store, QuestionRecord question ) throws Exception
+    public Set<ResourceRecord> getEntry( RecordStore store, QuestionRecord question ) throws DnsException
     {
         Set<ResourceRecord> records = null;
 
-        try
-        {
-            records = store.getRecords( question );
-        }
-        catch ( LdapNameNotFoundException lnnfe )
-        {
-            log.debug( "Name for DNS record search does not exist.", lnnfe );
-
-            throw new DnsException( ResponseCode.NAME_ERROR );
-        }
-        catch ( Exception e )
-        {
-            log.debug( "Unexpected error retrieving DNS records.", e );
-
-            throw new DnsException( ResponseCode.SERVER_FAILURE );
-        }
+        records = store.getRecords( question );
 
         if ( records == null || records.isEmpty() )
         {

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java Sat Jul 14 00:55:44 2007
@@ -22,6 +22,7 @@
 
 import java.util.Set;
 
+import org.apache.directory.server.dns.DnsException;
 import org.apache.directory.server.dns.messages.QuestionRecord;
 import org.apache.directory.server.dns.messages.ResourceRecord;
 
@@ -36,10 +37,10 @@
 {
     /**
      * Returns a set of {@link ResourceRecord}s, given a DNS {@link QuestionRecord}.
-     *
+     * If something bad happens throw the accurate {@link DNSException} 
      * @param question
      * @return The set of {@link ResourceRecord}s.
-     * @throws Exception
+     * @throws DNSException
      */
-    public Set<ResourceRecord> getRecords( QuestionRecord question ) throws Exception;
+    public Set<ResourceRecord> getRecords( QuestionRecord question ) throws DnsException;
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStoreStub.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStoreStub.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStoreStub.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStoreStub.java Sat Jul 14 00:55:44 2007
@@ -23,6 +23,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.server.dns.DnsException;
 import org.apache.directory.server.dns.messages.QuestionRecord;
 import org.apache.directory.server.dns.messages.RecordClass;
 import org.apache.directory.server.dns.messages.RecordType;
@@ -36,7 +37,7 @@
  */
 public class RecordStoreStub implements RecordStore
 {
-    public Set<ResourceRecord> getRecords( QuestionRecord question ) throws Exception
+    public Set<ResourceRecord> getRecords( QuestionRecord question ) throws DnsException
     {
         Set<ResourceRecord> set = new HashSet<ResourceRecord>();
 

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/package-info.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/package-info.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/package-info.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/package-info.java Sat Jul 14 00:55:44 2007
@@ -19,8 +19,8 @@
  */
 
 /**
- * Provides the store implementation for serving DNS resource records
- * backed by JNDI.
+ * Provides {@link RecordStore} interface for serving DNS resource records
+ * to {@link DNSServer}.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/pom.xml?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/pom.xml (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/pom.xml Sat Jul 14 00:55:44 2007
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.directory.server</groupId>
-    <artifactId>build</artifactId>
+    <artifactId>apacheds-parent</artifactId>
     <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-protocol-kerberos</artifactId>
@@ -16,12 +16,6 @@
   <packaging>jar</packaging>  
 
   <dependencies>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>nlog4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-kerberos-shared</artifactId>

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java Sat Jul 14 00:55:44 2007
@@ -77,7 +77,7 @@
 
             acceptor.bind( new InetSocketAddress( port ), handler, serviceConfig );
 
-            log.debug( name + " listening on port " + port );
+            log.debug( "{} listening on port {}.", name, port );
         }
         catch ( IOException ioe )
         {
@@ -108,6 +108,6 @@
         acceptor = null;
         handler = null;
 
-        log.debug( config.getServiceName() + " has stopped listening on port " + config.getIpPort() );
+        log.debug( "{} has stopped listening on port {}.", config.getServiceName(), config.getIpPort() );
     }
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorContext.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorContext.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorContext.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorContext.java Sat Jul 14 00:55:44 2007
@@ -44,9 +44,15 @@
 
         if ( log.isDebugEnabled() )
         {
-            log.debug( "Monitoring context:" + "\n\tconfig:                 " + kdcContext.getConfig()
-                + "\n\tstore:                  " + kdcContext.getStore() + "\n\trequest:                "
-                + kdcContext.getRequest() + "\n\treply:                  " + kdcContext.getReply() );
+            StringBuffer sb = new StringBuffer();
+
+            sb.append( "Monitoring context:" );
+            sb.append( "\n\t" + "config:                 " + kdcContext.getConfig() );
+            sb.append( "\n\t" + "store:                  " + kdcContext.getStore() );
+            sb.append( "\n\t" + "request:                " + kdcContext.getRequest() );
+            sb.append( "\n\t" + "reply:                  " + kdcContext.getReply() );
+
+            log.debug( sb.toString() );
         }
 
         next.execute( session, message );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java Sat Jul 14 00:55:44 2007
@@ -51,15 +51,23 @@
 
             if ( log.isDebugEnabled() )
             {
-                log.debug( "Responding to authentication request with reply:" + "\n\tclient realm:          "
-                    + success.getClientRealm() + "\n\tserver realm:          " + success.getServerRealm()
-                    + "\n\tserverPrincipal:       " + success.getServerPrincipal() + "\n\tclientPrincipal:       "
-                    + success.getClientPrincipal() + "\n\thostAddresses:         " + success.getClientAddresses()
-                    + "\n\tstart time:            " + success.getStartTime() + "\n\tend time:              "
-                    + success.getEndTime() + "\n\tauth time:             " + success.getAuthTime()
-                    + "\n\trenew till time:       " + success.getRenewTill() + "\n\tmessageType:           "
-                    + success.getMessageType() + "\n\tnonce:                 " + success.getNonce()
-                    + "\n\tprotocolVersionNumber: " + success.getProtocolVersionNumber() );
+                StringBuffer sb = new StringBuffer();
+
+                sb.append( "Responding to authentication request with reply:" );
+                sb.append( "\n\t" + "client realm:          " + success.getClientRealm() );
+                sb.append( "\n\t" + "server realm:          " + success.getServerRealm() );
+                sb.append( "\n\t" + "serverPrincipal:       " + success.getServerPrincipal() );
+                sb.append( "\n\t" + "clientPrincipal:       " + success.getClientPrincipal() );
+                sb.append( "\n\t" + "hostAddresses:         " + success.getClientAddresses() );
+                sb.append( "\n\t" + "start time:            " + success.getStartTime() );
+                sb.append( "\n\t" + "end time:              " + success.getEndTime() );
+                sb.append( "\n\t" + "auth time:             " + success.getAuthTime() );
+                sb.append( "\n\t" + "renew till time:       " + success.getRenewTill() );
+                sb.append( "\n\t" + "messageType:           " + success.getMessageType() );
+                sb.append( "\n\t" + "nonce:                 " + success.getNonce() );
+                sb.append( "\n\t" + "protocolVersionNumber: " + success.getProtocolVersionNumber() );
+
+                log.debug( sb.toString() );
             }
         }
         else
@@ -70,11 +78,17 @@
 
                 if ( log.isDebugEnabled() )
                 {
-                    log.debug( "Responding to authentication request with error:" + "\n\tserverPrincipal:       "
-                        + error.getServerPrincipal() + "\n\tclientPrincipal:       " + error.getClientPrincipal()
-                        + "\n\tserver time:           " + error.getClientTime() + "\n\tclient time:           "
-                        + error.getServerTime() + "\n\terror code:            " + error.getErrorCode()
-                        + "\n\texplanatory text:      " + error.getExplanatoryText() );
+                    StringBuffer sb = new StringBuffer();
+
+                    sb.append( "Responding to authentication request with error:" );
+                    sb.append( "\n\t" + "serverPrincipal:       " + error.getServerPrincipal() );
+                    sb.append( "\n\t" + "clientPrincipal:       " + error.getClientPrincipal() );
+                    sb.append( "\n\t" + "server time:           " + error.getClientTime() );
+                    sb.append( "\n\t" + "client time:           " + error.getServerTime() );
+                    sb.append( "\n\t" + "error code:            " + error.getErrorCode() );
+                    sb.append( "\n\t" + "explanatory text:      " + error.getExplanatoryText() );
+
+                    log.debug( sb.toString() );
                 }
             }
         }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java Sat Jul 14 00:55:44 2007
@@ -48,15 +48,24 @@
 
         if ( log.isDebugEnabled() )
         {
-            log.debug( "Responding to authentication request:" + "\n\trealm:                 " + request.getRealm()
-                + "\n\tserverPrincipal:       " + request.getServerPrincipal() + "\n\tclientPrincipal:       "
-                + request.getClientPrincipal() + "\n\tclientAddress:         " + clientAddress
-                + "\n\thostAddresses:         " + request.getAddresses() + "\n\tencryptionType:        "
-                + getEncryptionTypes( request ) + "\n\tfrom krb time:         " + request.getFrom()
-                + "\n\trealm krb time:        " + request.getRtime() + "\n\tkdcOptions:            "
-                + request.getKdcOptions() + "\n\tmessageType:           " + request.getMessageType()
-                + "\n\tnonce:                 " + request.getNonce() + "\n\tprotocolVersionNumber: "
-                + request.getProtocolVersionNumber() + "\n\ttill:                  " + request.getTill() );
+            StringBuffer sb = new StringBuffer();
+
+            sb.append( "Responding to authentication request:" );
+            sb.append( "\n\t" + "realm:                 " + request.getRealm() );
+            sb.append( "\n\t" + "serverPrincipal:       " + request.getServerPrincipal() );
+            sb.append( "\n\t" + "clientPrincipal:       " + request.getClientPrincipal() );
+            sb.append( "\n\t" + "clientAddress:         " + clientAddress );
+            sb.append( "\n\t" + "hostAddresses:         " + request.getAddresses() );
+            sb.append( "\n\t" + "encryptionType:        " + getEncryptionTypes( request ) );
+            sb.append( "\n\t" + "from krb time:         " + request.getFrom() );
+            sb.append( "\n\t" + "realm krb time:        " + request.getRtime() );
+            sb.append( "\n\t" + "kdcOptions:            " + request.getKdcOptions() );
+            sb.append( "\n\t" + "messageType:           " + request.getMessageType() );
+            sb.append( "\n\t" + "nonce:                 " + request.getNonce() );
+            sb.append( "\n\t" + "protocolVersionNumber: " + request.getProtocolVersionNumber() );
+            sb.append( "\n\t" + "till:                  " + request.getTill() );
+
+            log.debug( sb.toString() );
         }
 
         next.execute( session, message );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java Sat Jul 14 00:55:44 2007
@@ -50,7 +50,7 @@
 
         EncryptionType bestType = getBestEncryptionType( requestedTypes, config.getEncryptionTypes() );
 
-        log.debug( "Session will use encryption type " + bestType );
+        log.debug( "Session will use encryption type {}.", bestType );
 
         if ( bestType == null )
         {

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java Sat Jul 14 00:55:44 2007
@@ -42,12 +42,13 @@
 
     private Ticket ticket;
     private EncryptionKey clientKey;
-    private EncryptionKey sessionKey;
     private ReplayCache replayCache;
 
     private PrincipalStoreEntry clientEntry;
     private PrincipalStoreEntry serverEntry;
 
+    private boolean isPreAuthenticated;
+
 
     /**
      * @return Returns the serverEntry.
@@ -140,37 +141,37 @@
 
 
     /**
-     * @return Returns the sessionKey.
+     * @return Returns the ticket.
      */
-    public EncryptionKey getSessionKey()
+    public Ticket getTicket()
     {
-        return sessionKey;
+        return ticket;
     }
 
 
     /**
-     * @param sessionKey The sessionKey to set.
+     * @param ticket The ticket to set.
      */
-    public void setSessionKey( EncryptionKey sessionKey )
+    public void setTicket( Ticket ticket )
     {
-        this.sessionKey = sessionKey;
+        this.ticket = ticket;
     }
 
 
     /**
-     * @return Returns the ticket.
+     * @return true if the client used pre-authentication.
      */
-    public Ticket getTicket()
+    public boolean isPreAuthenticated()
     {
-        return ticket;
+        return isPreAuthenticated;
     }
 
 
     /**
-     * @param ticket The ticket to set.
+     * @param isPreAuthenticated Whether the client used pre-authentication.
      */
-    public void setTicket( Ticket ticket )
+    public void setPreAuthenticated( boolean isPreAuthenticated )
     {
-        this.ticket = ticket;
+        this.isPreAuthenticated = isPreAuthenticated;
     }
 }

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java Sat Jul 14 00:55:44 2007
@@ -44,7 +44,6 @@
         addLast( "verifyPolicy", new VerifyPolicy() );
         addLast( "preAuthenticationChain", new PreAuthenticationChain() );
         addLast( "getServerEntry", new GetServerEntry() );
-        addLast( "getSessionKey", new GetSessionKey() );
         addLast( "generateTicket", new GenerateTicket() );
         addLast( "buildReply", new BuildReply() );
         addLast( "sealReply", new SealReply() );

Modified: directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java
URL: http://svn.apache.org/viewvc/directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java?view=diff&rev=556238&r1=556237&r2=556238
==============================================================================
--- directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java (original)
+++ directory/sandbox/ccustine/new_installers/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java Sat Jul 14 00:55:44 2007
@@ -26,6 +26,7 @@
 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;
+import org.apache.directory.server.kerberos.shared.crypto.encryption.RandomKeyFactory;
 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.KdcRequest;
@@ -70,7 +71,15 @@
         KerberosPrincipal ticketPrincipal = request.getServerPrincipal();
         EncTicketPartModifier newTicketBody = new EncTicketPartModifier();
         KdcConfiguration config = authContext.getConfig();
-        EncryptionKey sessionKey = authContext.getSessionKey();
+
+        // The INITIAL flag indicates that a ticket was issued using the AS protocol.
+        newTicketBody.setFlag( TicketFlags.INITIAL );
+
+        // The PRE-AUTHENT flag indicates that the client used pre-authentication.
+        if ( authContext.isPreAuthenticated() )
+        {
+            newTicketBody.setFlag( TicketFlags.PRE_AUTHENT );
+        }
 
         if ( request.getKdcOptions().get( KdcOptions.FORWARDABLE ) )
         {
@@ -94,7 +103,9 @@
             throw new KerberosException( ErrorType.KDC_ERR_BADOPTION );
         }
 
+        EncryptionKey sessionKey = RandomKeyFactory.getRandomKey( authContext.getEncryptionType() );
         newTicketBody.setSessionKey( sessionKey );
+
         newTicketBody.setClientPrincipal( request.getClientPrincipal() );
         newTicketBody.setTransitedEncoding( new TransitedEncoding() );
 
@@ -188,7 +199,7 @@
 
         if ( log.isDebugEnabled() )
         {
-            log.debug( "Ticket will be issued for access to " + serverPrincipal.toString() + "." );
+            log.debug( "Ticket will be issued for access to {}.", serverPrincipal.toString() );
         }
 
         authContext.setTicket( newTicket );



Mime
View raw message