directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [32/45] - in /directory/trunks/apacheds: ./ core-plugin/ core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ core-shared/ core-shared/src/...
Date Mon, 20 Feb 2006 03:58:21 GMT
Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
 
 package org.apache.directory.server.dhcp.options.tcp;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 /**
  * This option specifies the default TTL that the client should use when
  * sending TCP segments.  The value is represented as an 8-bit unsigned
@@ -30,17 +32,18 @@
  */
 public class TcpDefaultTimeToLive extends DhcpOption
 {
-	private byte[] tcpDefaultTimeToLive;
-	
-	public TcpDefaultTimeToLive( byte[] tcpDefaultTimeToLive )
-	{
-		super( 37, 1 );
-		this.tcpDefaultTimeToLive = tcpDefaultTimeToLive;
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		out.put( tcpDefaultTimeToLive );
-	}
-}
+    private byte[] tcpDefaultTimeToLive;
+
 
+    public TcpDefaultTimeToLive(byte[] tcpDefaultTimeToLive)
+    {
+        super( 37, 1 );
+        this.tcpDefaultTimeToLive = tcpDefaultTimeToLive;
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        out.put( tcpDefaultTimeToLive );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
 
 package org.apache.directory.server.dhcp.options.tcp;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 /**
  * This option specifies the interval (in seconds) that the client TCP
  * should wait before sending a keepalive message on a TCP connection.
@@ -32,17 +34,18 @@
  */
 public class TcpKeepaliveGarbage extends DhcpOption
 {
-	private byte[] tcpKeepaliveGarbage;
-	
-	public TcpKeepaliveGarbage( byte[] tcpKeepaliveGarbage )
-	{
-		super( 38, 4 );
-		this.tcpKeepaliveGarbage = tcpKeepaliveGarbage;
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		out.put( tcpKeepaliveGarbage );
-	}
-}
+    private byte[] tcpKeepaliveGarbage;
+
 
+    public TcpKeepaliveGarbage(byte[] tcpKeepaliveGarbage)
+    {
+        super( 38, 4 );
+        this.tcpKeepaliveGarbage = tcpKeepaliveGarbage;
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        out.put( tcpKeepaliveGarbage );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
 
 package org.apache.directory.server.dhcp.options.tcp;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 /**
  * This option specifies the whether or not the client should send TCP
  * keepalive messages with a octet of garbage for compatibility with
@@ -32,17 +34,18 @@
  */
 public class TcpKeepaliveInterval extends DhcpOption
 {
-	private byte[] tcpKeepaliveInterval;
-	
-	public TcpKeepaliveInterval( byte[] tcpKeepaliveInterval )
-	{
-		super( 39, 1 );
-		this.tcpKeepaliveInterval = tcpKeepaliveInterval;
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		out.put( tcpKeepaliveInterval );
-	}
-}
+    private byte[] tcpKeepaliveInterval;
+
 
+    public TcpKeepaliveInterval(byte[] tcpKeepaliveInterval)
+    {
+        super( 39, 1 );
+        this.tcpKeepaliveInterval = tcpKeepaliveInterval;
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        out.put( tcpKeepaliveInterval );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java Sun Feb 19 19:57:02 2006
@@ -24,23 +24,26 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 public class BootFileSize extends DhcpOption
 {
-	private byte[] bootFileSize;
-	
-	public BootFileSize( byte[] bootFileSize )
-	{
-		super( 13, 2 );
-		this.bootFileSize = bootFileSize;
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		out.put( bootFileSize );
-	}
-}
+    private byte[] bootFileSize;
+
 
+    public BootFileSize(byte[] bootFileSize)
+    {
+        super( 13, 2 );
+        this.bootFileSize = bootFileSize;
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        out.put( bootFileSize );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java Sun Feb 19 19:57:02 2006
@@ -25,13 +25,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressListOption;
 
+
 public class CookieServers extends AddressListOption
 {
-	public CookieServers( byte[] cookieServers )
-	{
-		super( 8, cookieServers );
-	}
+    public CookieServers(byte[] cookieServers)
+    {
+        super( 8, cookieServers );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java Sun Feb 19 19:57:02 2006
@@ -23,23 +23,26 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 public class DomainName extends DhcpOption
 {
-	private byte[] domainName;
-	
-	public DomainName( byte[] domainName )
-	{
-		super( 15, 1 );
-		this.domainName = domainName;
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		out.put( domainName );
-	}
-}
+    private byte[] domainName;
+
 
+    public DomainName(byte[] domainName)
+    {
+        super( 15, 1 );
+        this.domainName = domainName;
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        out.put( domainName );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java Sun Feb 19 19:57:02 2006
@@ -26,13 +26,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressListOption;
 
+
 public class DomainNameServers extends AddressListOption
 {
-	public DomainNameServers( byte[] domainNameServers )
-	{
-		super( 6, domainNameServers );
-	}
+    public DomainNameServers(byte[] domainNameServers)
+    {
+        super( 6, domainNameServers );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/EndOption.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/EndOption.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/EndOption.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/EndOption.java Sun Feb 19 19:57:02 2006
@@ -23,27 +23,30 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 public class EndOption extends DhcpOption
 {
-	public EndOption()
-	{
-		super( 255, 1 );
-	}
-	
-	public void writeTo( ByteBuffer out )
-	{
-		out.put( (byte)0xFF );
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		/**
-		 * This option has no value
-		 */
-	}
-}
+    public EndOption()
+    {
+        super( 255, 1 );
+    }
+
 
+    public void writeTo( ByteBuffer out )
+    {
+        out.put( ( byte ) 0xFF );
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        /**
+         * This option has no value
+         */
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/EndOption.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/EndOption.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java Sun Feb 19 19:57:02 2006
@@ -30,23 +30,26 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 public class ExtensionsPath extends DhcpOption
 {
-	private byte[] extensionsPath;
-	
-	public ExtensionsPath( byte[] extensionsPath )
-	{
-		super( 18, 1 );
-		this.extensionsPath = extensionsPath;
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		out.put( extensionsPath );
-	}
-}
+    private byte[] extensionsPath;
+
 
+    public ExtensionsPath(byte[] extensionsPath)
+    {
+        super( 18, 1 );
+        this.extensionsPath = extensionsPath;
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        out.put( extensionsPath );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java Sun Feb 19 19:57:02 2006
@@ -25,23 +25,26 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 public class HostName extends DhcpOption
 {
-	private byte[] hostName;
-	
-	public HostName( byte[] hostName )
-	{
-		super( 12, 1 );
-		this.hostName = hostName;
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		out.put( hostName );
-	}
-}
+    private byte[] hostName;
+
 
+    public HostName(byte[] hostName)
+    {
+        super( 12, 1 );
+        this.hostName = hostName;
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        out.put( hostName );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java Sun Feb 19 19:57:02 2006
@@ -26,13 +26,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressListOption;
 
+
 public class ImpressServers extends AddressListOption
 {
-	public ImpressServers( byte[] impressServers )
-	{
-		super( 10, impressServers );
-	}
+    public ImpressServers(byte[] impressServers)
+    {
+        super( 10, impressServers );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ImpressServers.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LogServers.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LogServers.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LogServers.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LogServers.java Sun Feb 19 19:57:02 2006
@@ -25,13 +25,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressListOption;
 
+
 public class LogServers extends AddressListOption
 {
-	public LogServers( byte[] logServers )
-	{
-		super( 7, logServers );
-	}
+    public LogServers(byte[] logServers)
+    {
+        super( 7, logServers );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LogServers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LogServers.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LprServers.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LprServers.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LprServers.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LprServers.java Sun Feb 19 19:57:02 2006
@@ -25,13 +25,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressListOption;
 
+
 public class LprServers extends AddressListOption
 {
-	public LprServers( byte[] lprServers )
-	{
-		super( 9, lprServers );
-	}
+    public LprServers(byte[] lprServers)
+    {
+        super( 9, lprServers );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LprServers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/LprServers.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/MeritDumpFile.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/MeritDumpFile.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/MeritDumpFile.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/MeritDumpFile.java Sun Feb 19 19:57:02 2006
@@ -25,23 +25,26 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 public class MeritDumpFile extends DhcpOption
 {
-	private byte[] meritDumpFile;
-	
-	public MeritDumpFile( byte[] meritDumpFile )
-	{
-		super( 14, 1 );
-		this.meritDumpFile = meritDumpFile;
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		out.put( meritDumpFile );
-	}
-}
+    private byte[] meritDumpFile;
+
 
+    public MeritDumpFile(byte[] meritDumpFile)
+    {
+        super( 14, 1 );
+        this.meritDumpFile = meritDumpFile;
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        out.put( meritDumpFile );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/MeritDumpFile.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/MeritDumpFile.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/NameServers.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/NameServers.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/NameServers.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/NameServers.java Sun Feb 19 19:57:02 2006
@@ -26,13 +26,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressListOption;
 
+
 public class NameServers extends AddressListOption
 {
-	public NameServers( byte[] nameServers )
-	{
-		super( 5, nameServers );
-	}
+    public NameServers(byte[] nameServers)
+    {
+        super( 5, nameServers );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/NameServers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/NameServers.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/PadOption.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/PadOption.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/PadOption.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/PadOption.java Sun Feb 19 19:57:02 2006
@@ -17,10 +17,12 @@
 
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 /**
  * The pad option can be used to cause subsequent fields to align on
  * word boundaries.
@@ -29,16 +31,16 @@
  */
 public class PadOption extends DhcpOption
 {
-	public PadOption()
-	{
-		super( 0, 1 );
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		/**
-		 * This option has no value
-		 */
-	}
-}
+    public PadOption()
+    {
+        super( 0, 1 );
+    }
 
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        /**
+         * This option has no value
+         */
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/PadOption.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/PadOption.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ResourceLocationServers.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ResourceLocationServers.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ResourceLocationServers.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ResourceLocationServers.java Sun Feb 19 19:57:02 2006
@@ -25,13 +25,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressListOption;
 
+
 public class ResourceLocationServers extends AddressListOption
 {
-	public ResourceLocationServers( byte[] resourceLocationServers )
-	{
-		super( 11, resourceLocationServers );
-	}
+    public ResourceLocationServers(byte[] resourceLocationServers)
+    {
+        super( 11, resourceLocationServers );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ResourceLocationServers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ResourceLocationServers.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/RootPath.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/RootPath.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/RootPath.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/RootPath.java Sun Feb 19 19:57:02 2006
@@ -24,23 +24,26 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 public class RootPath extends DhcpOption
 {
-	private byte[] rootPath;
-	
-	public RootPath( byte[] rootPath )
-	{
-		super( 17, 1 );
-		this.rootPath = rootPath;
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		out.put( rootPath );
-	}
-}
+    private byte[] rootPath;
+
 
+    public RootPath(byte[] rootPath)
+    {
+        super( 17, 1 );
+        this.rootPath = rootPath;
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        out.put( rootPath );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/RootPath.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/RootPath.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/Routers.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/Routers.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/Routers.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/Routers.java Sun Feb 19 19:57:02 2006
@@ -25,13 +25,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressListOption;
 
+
 public class Routers extends AddressListOption
 {
-	public Routers( byte[] routers )
-	{
-		super( 3, routers );
-	}
+    public Routers(byte[] routers)
+    {
+        super( 3, routers );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/Routers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/Routers.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SubnetMask.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SubnetMask.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SubnetMask.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SubnetMask.java Sun Feb 19 19:57:02 2006
@@ -26,13 +26,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressOption;
 
+
 public class SubnetMask extends AddressOption
 {
-	public SubnetMask( byte[] subnetMask )
-	{
-		super( 1, subnetMask );
-	}
+    public SubnetMask(byte[] subnetMask)
+    {
+        super( 1, subnetMask );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SubnetMask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SubnetMask.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SwapServer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SwapServer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SwapServer.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SwapServer.java Sun Feb 19 19:57:02 2006
@@ -22,13 +22,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressOption;
 
+
 public class SwapServer extends AddressOption
 {
-	public SwapServer( byte[] swapServer )
-	{
-		super( 16, swapServer );
-	}
+    public SwapServer(byte[] swapServer)
+    {
+        super( 16, swapServer );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SwapServer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/SwapServer.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeOffset.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeOffset.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeOffset.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeOffset.java Sun Feb 19 19:57:02 2006
@@ -26,23 +26,26 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.options.DhcpOption;
 
+
 public class TimeOffset extends DhcpOption
 {
-	private byte[] timeOffset;
-	
-	public TimeOffset( byte[] timeOffset )
-	{
-		super( 2, 4 );
-		this.timeOffset = timeOffset;
-	}
-	
-	protected void valueToByteBuffer( ByteBuffer out )
-	{
-		out.put( timeOffset );
-	}
-}
+    private byte[] timeOffset;
+
 
+    public TimeOffset(byte[] timeOffset)
+    {
+        super( 2, 4 );
+        this.timeOffset = timeOffset;
+    }
+
+
+    protected void valueToByteBuffer( ByteBuffer out )
+    {
+        out.put( timeOffset );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeOffset.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeOffset.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeServers.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeServers.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeServers.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeServers.java Sun Feb 19 19:57:02 2006
@@ -26,13 +26,14 @@
  */
 package org.apache.directory.server.dhcp.options.vendor;
 
+
 import org.apache.directory.server.dhcp.options.AddressListOption;
 
+
 public class TimeServers extends AddressListOption
 {
-	public TimeServers( byte[] timeServers )
-	{
-		super( 4, timeServers );
-	}
+    public TimeServers(byte[] timeServers)
+    {
+        super( 4, timeServers );
+    }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeServers.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/TimeServers.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java Sun Feb 19 19:57:02 2006
@@ -1,39 +1,41 @@
-/*
- *   Copyright 2005 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-package org.apache.directory.server.dhcp.protocol;
-
-import org.apache.directory.server.dhcp.DhcpException;
-import org.apache.directory.server.dhcp.io.DhcpMessageDecoder;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.filter.codec.ProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-
-public class DhcpDecoder implements ProtocolDecoder
-{
-    public void decode( IoSession session, ByteBuffer in,
-            ProtocolDecoderOutput out ) throws DhcpException
-    {
-        DhcpMessageDecoder decoder = new DhcpMessageDecoder();
-        out.write( decoder.decode( in.buf() ) );
-    }
-
-    public void dispose( IoSession arg0 ) throws Exception
-    {
-    }
-}
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package org.apache.directory.server.dhcp.protocol;
+
+
+import org.apache.directory.server.dhcp.DhcpException;
+import org.apache.directory.server.dhcp.io.DhcpMessageDecoder;
+import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+
+
+public class DhcpDecoder implements ProtocolDecoder
+{
+    public void decode( IoSession session, ByteBuffer in, ProtocolDecoderOutput out ) throws DhcpException
+    {
+        DhcpMessageDecoder decoder = new DhcpMessageDecoder();
+        out.write( decoder.decode( in.buf() ) );
+    }
+
+
+    public void dispose( IoSession arg0 ) throws Exception
+    {
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpDecoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpEncoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpEncoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpEncoder.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpEncoder.java Sun Feb 19 19:57:02 2006
@@ -1,46 +1,47 @@
-/*
- *   Copyright 2005 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-package org.apache.directory.server.dhcp.protocol;
-
-import org.apache.directory.server.dhcp.io.DhcpMessageEncoder;
-import org.apache.directory.server.dhcp.messages.DhcpMessage;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.filter.codec.ProtocolEncoder;
-import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-
-
-public class DhcpEncoder implements ProtocolEncoder
-{
-    public void encode( IoSession session, Object message, ProtocolEncoderOutput out )
-    {
-        DhcpMessageEncoder encoder = new DhcpMessageEncoder();
-        
-        ByteBuffer buf = ByteBuffer.allocate( 1024 );
-        encoder.encode( buf.buf(), (DhcpMessage)message );
-        
-        buf.flip();
-        
-        out.write( buf );
-    }
-
-    public void dispose( IoSession arg0 ) throws Exception
-    {
-    }
-}
-
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package org.apache.directory.server.dhcp.protocol;
+
+
+import org.apache.directory.server.dhcp.io.DhcpMessageEncoder;
+import org.apache.directory.server.dhcp.messages.DhcpMessage;
+import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
+
+
+public class DhcpEncoder implements ProtocolEncoder
+{
+    public void encode( IoSession session, Object message, ProtocolEncoderOutput out )
+    {
+        DhcpMessageEncoder encoder = new DhcpMessageEncoder();
+
+        ByteBuffer buf = ByteBuffer.allocate( 1024 );
+        encoder.encode( buf.buf(), ( DhcpMessage ) message );
+
+        buf.flip();
+
+        out.write( buf );
+    }
+
+
+    public void dispose( IoSession arg0 ) throws Exception
+    {
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpEncoder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpEncoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolCodecFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolCodecFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolCodecFactory.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolCodecFactory.java Sun Feb 19 19:57:02 2006
@@ -1,48 +1,50 @@
-/*
- *   Copyright 2005 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-package org.apache.directory.server.dhcp.protocol;
-
-import org.apache.mina.filter.codec.ProtocolCodecFactory;
-import org.apache.mina.filter.codec.ProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolEncoder;
-
-
-public class DhcpProtocolCodecFactory implements ProtocolCodecFactory
-{
-    // Codec factory is also usually a singleton.
-    private static DhcpProtocolCodecFactory INSTANCE =
-        new DhcpProtocolCodecFactory();
-    
-    public static DhcpProtocolCodecFactory getInstance()
-    {
-        return INSTANCE;
-    }
-
-    public ProtocolEncoder getEncoder()
-    {
-        // Create a new encoder.
-        return new DhcpEncoder();
-    }
-
-    public ProtocolDecoder getDecoder()
-    {
-        // Create a new decoder.
-        return new DhcpDecoder();
-    }
-}
-
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package org.apache.directory.server.dhcp.protocol;
+
+
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+
+
+public class DhcpProtocolCodecFactory implements ProtocolCodecFactory
+{
+    // Codec factory is also usually a singleton.
+    private static DhcpProtocolCodecFactory INSTANCE = new DhcpProtocolCodecFactory();
+
+
+    public static DhcpProtocolCodecFactory getInstance()
+    {
+        return INSTANCE;
+    }
+
+
+    public ProtocolEncoder getEncoder()
+    {
+        // Create a new encoder.
+        return new DhcpEncoder();
+    }
+
+
+    public ProtocolDecoder getDecoder()
+    {
+        // Create a new decoder.
+        return new DhcpDecoder();
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolCodecFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java Sun Feb 19 19:57:02 2006
@@ -1,95 +1,100 @@
-/*
- *   Copyright 2005 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-package org.apache.directory.server.dhcp.protocol;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-
-import org.apache.directory.server.dhcp.DhcpService;
-import org.apache.directory.server.dhcp.messages.DhcpMessage;
-import org.apache.directory.server.dhcp.service.DhcpServiceImpl;
-import org.apache.mina.common.ConnectFuture;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoConnector;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.transport.socket.nio.DatagramConnector;
-
-
-public class DhcpProtocolHandler implements IoHandler
-{
-    public void sessionCreated( IoSession session ) throws Exception
-    {
-        System.out.println( session.getRemoteAddress() + " CREATED" );
-        session.getFilterChain().addFirst(
-                "codec",
-                new ProtocolCodecFilter( new DhcpProtocolCodecFactory() ) );
-    }
-
-    public void sessionOpened( IoSession session )
-    {
-        System.out.println( session.getRemoteAddress() + " OPENED" );
-    }
-
-    public void sessionClosed( IoSession session )
-    {
-        System.out.println( session.getRemoteAddress() + " CLOSED" );
-    }
-
-    public void sessionIdle( IoSession session, IdleStatus status )
-    {
-        System.out.println( session.getRemoteAddress() + " IDLE(" + status + ")" );
-    }
-
-    public void exceptionCaught( IoSession session, Throwable cause )
-    {
-        System.out.println( session.getRemoteAddress() + " EXCEPTION" );
-        cause.printStackTrace( System.out );
-
-        session.close();
-    }
-
-    public void messageReceived( IoSession session, Object message ) throws Exception
-    {
-        System.out.println( session.getRemoteAddress() + " RCVD: " + message );
-        
-        DhcpMessage request = (DhcpMessage)message;
-        
-        if ( request.getOpCode() == 1 )
-        {
-            DhcpService dhcpService = new DhcpServiceImpl();
-            DhcpMessage reply = dhcpService.getReplyFor( request );
-            
-        	int PORT = 68;
-            IoConnector connector = new DatagramConnector();
-            InetAddress broadcast = InetAddress.getByName( null );
-            ConnectFuture future = connector.connect( new InetSocketAddress( broadcast, PORT ), new DhcpProtocolHandler() );
-            future.join();
-            IoSession replySession = future.getSession();
-            replySession.write( reply ).join();
-            replySession.close();
-        }
-    }
-
-    public void messageSent( IoSession session, Object message )
-    {
-        System.out.println( session.getRemoteAddress() + " SENT: " + message );
-    }
-}
-
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package org.apache.directory.server.dhcp.protocol;
+
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+
+import org.apache.directory.server.dhcp.DhcpService;
+import org.apache.directory.server.dhcp.messages.DhcpMessage;
+import org.apache.directory.server.dhcp.service.DhcpServiceImpl;
+import org.apache.mina.common.ConnectFuture;
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoConnector;
+import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.transport.socket.nio.DatagramConnector;
+
+
+public class DhcpProtocolHandler implements IoHandler
+{
+    public void sessionCreated( IoSession session ) throws Exception
+    {
+        System.out.println( session.getRemoteAddress() + " CREATED" );
+        session.getFilterChain().addFirst( "codec", new ProtocolCodecFilter( new DhcpProtocolCodecFactory() ) );
+    }
+
+
+    public void sessionOpened( IoSession session )
+    {
+        System.out.println( session.getRemoteAddress() + " OPENED" );
+    }
+
+
+    public void sessionClosed( IoSession session )
+    {
+        System.out.println( session.getRemoteAddress() + " CLOSED" );
+    }
+
+
+    public void sessionIdle( IoSession session, IdleStatus status )
+    {
+        System.out.println( session.getRemoteAddress() + " IDLE(" + status + ")" );
+    }
+
+
+    public void exceptionCaught( IoSession session, Throwable cause )
+    {
+        System.out.println( session.getRemoteAddress() + " EXCEPTION" );
+        cause.printStackTrace( System.out );
+
+        session.close();
+    }
+
+
+    public void messageReceived( IoSession session, Object message ) throws Exception
+    {
+        System.out.println( session.getRemoteAddress() + " RCVD: " + message );
+
+        DhcpMessage request = ( DhcpMessage ) message;
+
+        if ( request.getOpCode() == 1 )
+        {
+            DhcpService dhcpService = new DhcpServiceImpl();
+            DhcpMessage reply = dhcpService.getReplyFor( request );
+
+            int PORT = 68;
+            IoConnector connector = new DatagramConnector();
+            InetAddress broadcast = InetAddress.getByName( null );
+            ConnectFuture future = connector.connect( new InetSocketAddress( broadcast, PORT ),
+                new DhcpProtocolHandler() );
+            future.join();
+            IoSession replySession = future.getSession();
+            replySession.write( reply ).join();
+            replySession.close();
+        }
+    }
+
+
+    public void messageSent( IoSession session, Object message )
+    {
+        System.out.println( session.getRemoteAddress() + " SENT: " + message );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpServiceImpl.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpServiceImpl.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpServiceImpl.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpServiceImpl.java Sun Feb 19 19:57:02 2006
@@ -17,46 +17,50 @@
 
 package org.apache.directory.server.dhcp.service;
 
+
 import org.apache.directory.server.dhcp.DhcpService;
 import org.apache.directory.server.dhcp.messages.DhcpMessage;
 import org.apache.directory.server.dhcp.messages.DhcpMessageModifier;
 import org.apache.directory.server.dhcp.messages.MessageType;
 
+
 /**
  * DHCP Protocol (RFC 2131, RFC 2132)
  */
 public class DhcpServiceImpl implements DhcpService
 {
-	public DhcpMessage getReplyFor( DhcpMessage request )
+    public DhcpMessage getReplyFor( DhcpMessage request )
     {
-		DhcpMessageModifier modifier = new DhcpMessageModifier();
-		
-		modifier.setMessageType( MessageType.DHCPOFFER );
-		modifier.setOpCode( (byte)0x02 );
-		modifier.setHardwareAddressType( (byte)0x00 );
-		modifier.setHardwareAddressLength( (byte)0xFF );
-		modifier.setHardwareOptions( (byte)0x00 );
-		modifier.setTransactionId( request.getTransactionId() );
-		modifier.setSeconds( (short)0 );
-		modifier.setFlags( (short)0 );
-		
-		byte[] actual = { (byte)0, (byte)0, (byte)0, (byte)0 };
-		modifier.setActualClientAddress( actual );
-		
-		byte[] assigned = { (byte)192, (byte)168, (byte)0, (byte)20 };
-		modifier.setAssignedClientAddress( assigned );
-		
-		byte[] unused = { (byte)0, (byte)0, (byte)0, (byte)0 };
-		modifier.setNextServerAddress( unused );
-		modifier.setRelayAgentAddress( unused );
-		
-		modifier.setClientHardwareAddress( request.getClientHardwareAddress() );
-		modifier.setServerHostname( request.getServerHostname() );
-		modifier.setBootFileName( request.getBootFileName() );
-		
-		DhcpMessage reply = modifier.getDhcpMessage();
-		
-		return reply;
-	}
-}
+        DhcpMessageModifier modifier = new DhcpMessageModifier();
+
+        modifier.setMessageType( MessageType.DHCPOFFER );
+        modifier.setOpCode( ( byte ) 0x02 );
+        modifier.setHardwareAddressType( ( byte ) 0x00 );
+        modifier.setHardwareAddressLength( ( byte ) 0xFF );
+        modifier.setHardwareOptions( ( byte ) 0x00 );
+        modifier.setTransactionId( request.getTransactionId() );
+        modifier.setSeconds( ( short ) 0 );
+        modifier.setFlags( ( short ) 0 );
+
+        byte[] actual =
+            { ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0 };
+        modifier.setActualClientAddress( actual );
 
+        byte[] assigned =
+            { ( byte ) 192, ( byte ) 168, ( byte ) 0, ( byte ) 20 };
+        modifier.setAssignedClientAddress( assigned );
+
+        byte[] unused =
+            { ( byte ) 0, ( byte ) 0, ( byte ) 0, ( byte ) 0 };
+        modifier.setNextServerAddress( unused );
+        modifier.setRelayAgentAddress( unused );
+
+        modifier.setClientHardwareAddress( request.getClientHardwareAddress() );
+        modifier.setServerHostname( request.getServerHostname() );
+        modifier.setBootFileName( request.getBootFileName() );
+
+        DhcpMessage reply = modifier.getDhcpMessage();
+
+        return reply;
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpServiceImpl.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/AbstractDhcpTestCase.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/AbstractDhcpTestCase.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/AbstractDhcpTestCase.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/AbstractDhcpTestCase.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.dhcp;
 
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -24,45 +25,61 @@
 import junit.framework.TestCase;
 
 import org.apache.directory.server.dhcp.messages.DhcpMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public abstract class AbstractDhcpTestCase extends TestCase
 {
-	protected static final int MINIMUM_DHCP_DATAGRAM_SIZE = 576;
-	
-	protected void print( DhcpMessage message )
-	{
-		System.out.println( message.getMessageType() );
-		System.out.println( message.getHardwareAddressType() );
-		System.out.println( message.getHardwareAddressLength() );
-		System.out.println( message.getHardwareOptions() );
-		System.out.println( message.getTransactionId() );
-		System.out.println( message.getSeconds() );
-		System.out.println( message.getFlags() );
-		System.out.println( message.getActualClientAddress() );
-		System.out.println( message.getAssignedClientAddress() );
-		System.out.println( message.getNextServerAddress() );
-		System.out.println( message.getRelayAgentAddress() );
-		System.out.println( message.getClientHardwareAddress() );
-		System.out.println( message.getServerHostname() );
-		System.out.println( message.getBootFileName() );
-	}
-	
+    protected static final int MINIMUM_DHCP_DATAGRAM_SIZE = 576;
+    protected final Logger log;
+
+
+    public AbstractDhcpTestCase()
+    {
+        log = LoggerFactory.getLogger( AbstractDhcpTestCase.class );
+    }
+
+
+    public AbstractDhcpTestCase(Class subclass)
+    {
+        log = LoggerFactory.getLogger( subclass );
+    }
+
+
+    protected void print( DhcpMessage message )
+    {
+        log.debug( String.valueOf( message.getMessageType() ) );
+        log.debug( String.valueOf( message.getHardwareAddressType() ) );
+        log.debug( String.valueOf( message.getHardwareAddressLength() ) );
+        log.debug( String.valueOf( message.getHardwareOptions() ) );
+        log.debug( String.valueOf( message.getTransactionId() ) );
+        log.debug( String.valueOf( message.getSeconds() ) );
+        log.debug( String.valueOf( message.getFlags() ) );
+        log.debug( String.valueOf( message.getActualClientAddress() ) );
+        log.debug( String.valueOf( message.getAssignedClientAddress() ) );
+        log.debug( String.valueOf( message.getNextServerAddress() ) );
+        log.debug( String.valueOf( message.getRelayAgentAddress() ) );
+        log.debug( String.valueOf( message.getClientHardwareAddress() ) );
+        log.debug( String.valueOf( message.getServerHostname() ) );
+        log.debug( String.valueOf( message.getBootFileName() ) );
+    }
+
+
     protected ByteBuffer getByteBufferFromFile( String file ) throws IOException
-	{
+    {
         InputStream is = getClass().getResourceAsStream( file );
-    
-        byte[] bytes = new byte[ MINIMUM_DHCP_DATAGRAM_SIZE ];
-    
+
+        byte[] bytes = new byte[MINIMUM_DHCP_DATAGRAM_SIZE];
+
         int offset = 0;
         int numRead = 0;
-        while ( offset < bytes.length && ( numRead=is.read( bytes, offset, bytes.length-offset ) ) >= 0 )
+        while ( offset < bytes.length && ( numRead = is.read( bytes, offset, bytes.length - offset ) ) >= 0 )
         {
             offset += numRead;
         }
-        
+
         is.close();
         return ByteBuffer.wrap( bytes );
     }
 }
-

Propchange: directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/AbstractDhcpTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/AbstractDhcpTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java (original)
+++ directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.dhcp;
 
+
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.dhcp.io.DhcpMessageDecoder;
@@ -25,26 +26,33 @@
 
 public class DhcpMessageDecoderTest extends AbstractDhcpTestCase
 {
-	private ByteBuffer requestByteBuffer;
-	
-	public void testParseDiscover() throws Exception
-	{
-		requestByteBuffer = getByteBufferFromFile( "DHCPDISCOVER.pdu" );
-		
-		DhcpMessageDecoder decoder = new DhcpMessageDecoder();
-		DhcpMessage dhcpRequest = decoder.decode( requestByteBuffer );
-		
-		print( dhcpRequest );
-	}
-	
-	public void testParseOffer() throws Exception
-	{
-		requestByteBuffer = getByteBufferFromFile( "DHCPOFFER.pdu" );
-		
-		DhcpMessageDecoder decoder = new DhcpMessageDecoder();
-		DhcpMessage dhcpRequest = decoder.decode( requestByteBuffer );
-		
-		print( dhcpRequest );
-	}
-}
+    private ByteBuffer requestByteBuffer;
+
+
+    public DhcpMessageDecoderTest()
+    {
+        super( DhcpMessageDecoderTest.class );
+    }
+
+
+    public void testParseDiscover() throws Exception
+    {
+        requestByteBuffer = getByteBufferFromFile( "DHCPDISCOVER.pdu" );
 
+        DhcpMessageDecoder decoder = new DhcpMessageDecoder();
+        DhcpMessage dhcpRequest = decoder.decode( requestByteBuffer );
+
+        print( dhcpRequest );
+    }
+
+
+    public void testParseOffer() throws Exception
+    {
+        requestByteBuffer = getByteBufferFromFile( "DHCPOFFER.pdu" );
+
+        DhcpMessageDecoder decoder = new DhcpMessageDecoder();
+        DhcpMessage dhcpRequest = decoder.decode( requestByteBuffer );
+
+        print( dhcpRequest );
+    }
+}

Propchange: directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dns/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dns/pom.xml?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dns/pom.xml (original)
+++ directory/trunks/apacheds/protocol-dns/pom.xml Sun Feb 19 19:57:02 2006
@@ -4,11 +4,13 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.0-RC1-SNAPSHOT</version>
+    <version>1.0-RC1</version>
   </parent>
-  <version>0.3-SNAPSHOT</version>
   <artifactId>apacheds-protocol-dns</artifactId>
   <name>ApacheDS Protocol Dns</name>
+  <description>
+    The DNS protocol provider for ApacheDS
+  </description>
   <packaging>jar</packaging>  
   <dependencies>
     <dependency>
@@ -25,7 +27,7 @@
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-shared</artifactId>
-      <version>0.7.1-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java (original)
+++ directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.dns;
 
+
 import java.util.Dictionary;
 import java.util.HashMap;
 import java.util.Map;
@@ -25,6 +26,7 @@
 import org.apache.directory.server.protocol.shared.LoadStrategy;
 import org.apache.directory.server.protocol.shared.ServiceConfiguration;
 
+
 public class DnsConfiguration extends ServiceConfiguration
 {
     private static final long serialVersionUID = 6943138644427163149L;
@@ -41,6 +43,7 @@
     /** the default prefix */
     private static final String DEFAULT_PREFIX = "dns.";
 
+
     /**
      * Creates a new instance with default settings.
      */
@@ -49,22 +52,25 @@
         this( getDefaultConfig(), LoadStrategy.LDAP );
     }
 
+
     /**
      * Creates a new instance with default settings that operates on the
      * {@link DirectoryService} with the specified ID.
      */
-    public DnsConfiguration( String instanceId )
+    public DnsConfiguration(String instanceId)
     {
         this( getDefaultConfig(), LoadStrategy.LDAP );
         setInstanceId( instanceId );
     }
 
-    public DnsConfiguration( Map properties )
+
+    public DnsConfiguration(Map properties)
     {
         this( properties, LoadStrategy.LDAP );
     }
 
-    public DnsConfiguration( Map properties, int strategy )
+
+    public DnsConfiguration(Map properties, int strategy)
     {
         if ( properties == null )
         {
@@ -83,6 +89,7 @@
         }
     }
 
+
     public static Map getDefaultConfig()
     {
         Map defaults = new HashMap();
@@ -93,11 +100,12 @@
         return defaults;
     }
 
+
     public boolean isDifferent( Dictionary config )
     {
         int port = getPort();
 
-        if ( port == Integer.parseInt( (String) config.get( IP_PORT_KEY ) ) )
+        if ( port == Integer.parseInt( ( String ) config.get( IP_PORT_KEY ) ) )
         {
             return false;
         }
@@ -105,11 +113,13 @@
         return true;
     }
 
+
     public String getName()
     {
         return DEFAULT_NAME;
     }
 
+
     public int getPort()
     {
         String key = IP_PORT_KEY;
@@ -121,6 +131,7 @@
 
         return Integer.parseInt( DEFAULT_IP_PORT );
     }
+
 
     public int getBufferSize()
     {

Propchange: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsConfiguration.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsException.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsException.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsException.java (original)
+++ directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsException.java Sun Feb 19 19:57:02 2006
@@ -17,8 +17,10 @@
 
 package org.apache.directory.server.dns;
 
+
 import org.apache.directory.server.dns.messages.ResponseCode;
 
+
 /**
  * The root of the DNS exception hierarchy.
  *
@@ -34,17 +36,19 @@
      */
     private final int responseCode;
 
+
     /**
      * Creates a DnsException with a response code.
      *
      * @param responseCode the response code associated with this DnsException
      */
-    public DnsException( ResponseCode responseCode )
+    public DnsException(ResponseCode responseCode)
     {
         super( responseCode.getMessage() );
 
         this.responseCode = responseCode.getOrdinal();
     }
+
 
     /**
      * Gets the protocol response code associated with this DnsException.

Propchange: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsException.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java (original)
+++ directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.dns;
 
+
 import java.io.IOException;
 import java.util.Dictionary;
 
@@ -29,6 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class DnsServer
 {
     /** the log for this class */
@@ -42,7 +44,8 @@
     private Service tcpService;
     private Service udpService;
 
-    public DnsServer( DnsConfiguration config, ServiceRegistry registry, RecordStore store )
+
+    public DnsServer(DnsConfiguration config, ServiceRegistry registry, RecordStore store)
     {
         this.config = config;
         this.registry = registry;
@@ -69,10 +72,12 @@
         }
     }
 
+
     public boolean isDifferent( Dictionary newConfig )
     {
         return config.isDifferent( newConfig );
     }
+
 
     public void destroy()
     {

Propchange: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/Decoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/Decoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/Decoder.java (original)
+++ directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/Decoder.java Sun Feb 19 19:57:02 2006
@@ -17,8 +17,10 @@
 
 package org.apache.directory.server.dns.io.decoder;
 
+
 import java.io.IOException;
 import java.util.Map;
+
 
 public interface Decoder
 {

Propchange: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/Decoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/ResourceRecordDecoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/ResourceRecordDecoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/ResourceRecordDecoder.java (original)
+++ directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/ResourceRecordDecoder.java Sun Feb 19 19:57:02 2006
@@ -17,34 +17,41 @@
 
 package org.apache.directory.server.dns.io.decoder;
 
+
 import java.nio.ByteBuffer;
 
+
 public class ResourceRecordDecoder
 {
     protected short getUnsignedByte( ByteBuffer byteBuffer )
     {
-        return ( (short) ( byteBuffer.get() & 0xff ) );
+        return ( ( short ) ( byteBuffer.get() & 0xff ) );
     }
 
+
     protected short getUnsignedByte( ByteBuffer byteBuffer, int position )
     {
-        return ( (short) ( byteBuffer.get( position ) & (short) 0xff ) );
+        return ( ( short ) ( byteBuffer.get( position ) & ( short ) 0xff ) );
     }
 
+
     protected int getUnsignedShort( ByteBuffer byteBuffer )
     {
         return ( byteBuffer.getShort() & 0xffff );
     }
 
+
     protected int getUnsignedShort( ByteBuffer byteBuffer, int position )
     {
         return ( byteBuffer.getShort( position ) & 0xffff );
     }
 
+
     protected long getUnsignedInt( ByteBuffer byteBuffer )
     {
         return ( byteBuffer.getInt() & 0xffffffffL );
     }
+
 
     protected long getUnsignedInt( ByteBuffer byteBuffer, int position )
     {

Propchange: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/ResourceRecordDecoder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/ResourceRecordDecoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/A6RecordEncoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/A6RecordEncoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/A6RecordEncoder.java (original)
+++ directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/A6RecordEncoder.java Sun Feb 19 19:57:02 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.dns.io.encoder;
 
+
 /**
  * 3.1.1.  Format
  * 

Propchange: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/A6RecordEncoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoder.java (original)
+++ directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoder.java Sun Feb 19 19:57:02 2006
@@ -17,11 +17,13 @@
 
 package org.apache.directory.server.dns.io.encoder;
 
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
 import org.apache.directory.server.dns.messages.ResourceRecord;
 import org.apache.directory.server.dns.store.DnsAttribute;
+
 
 /**
  * 3.4.1. A RDATA format

Propchange: directory/trunks/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id



Mime
View raw message