You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/03/18 07:13:18 UTC
svn commit: r638228 [18/20] - in
/directory/sandbox/akarasulu/bigbang/apacheds: ./
apacheds-xbean-spring/src/site/ benchmarks/src/site/
bootstrap-extract/src/site/ bootstrap-partition/src/site/
bootstrap-plugin/src/main/java/org/apache/directory/server...
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/TftpServerName.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/TftpServerName.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/TftpServerName.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/TftpServerName.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.dhcp;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.StringOption;
/**
@@ -35,25 +33,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class TftpServerName extends DhcpOption
+public class TftpServerName extends StringOption
{
- private byte[] tftpServerName;
-
-
- /**
- * Creates a new instance of TftpServerName.
- *
- * @param tftpServerName
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public TftpServerName( byte[] tftpServerName )
- {
- super( 66, 1 );
- this.tftpServerName = tftpServerName;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( tftpServerName );
+ return 66;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/VendorClassIdentifier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/VendorClassIdentifier.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/VendorClassIdentifier.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/VendorClassIdentifier.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.dhcp;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.StringOption;
/**
@@ -44,25 +42,14 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class VendorClassIdentifier extends DhcpOption
+public class VendorClassIdentifier extends StringOption
{
- private byte[] vendorClassIdentifier;
-
-
- /**
- * Creates a new instance of VendorClassIdentifier.
- *
- * @param vendorClassIdentifier
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public VendorClassIdentifier( byte[] vendorClassIdentifier )
+ public byte getTag()
{
- super( 60, 1 );
- this.vendorClassIdentifier = vendorClassIdentifier;
+ return 60;
}
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( vendorClassIdentifier );
- }
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/ArpCacheTimeout.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/ArpCacheTimeout.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/ArpCacheTimeout.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/ArpCacheTimeout.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.linklayer;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.IntOption;
/**
@@ -35,25 +33,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class ArpCacheTimeout extends DhcpOption
+public class ArpCacheTimeout extends IntOption
{
- private byte[] arpCacheTimeout;
-
-
- /**
- * Creates a new instance of ArpCacheTimeout.
- *
- * @param arpCacheTimeout
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public ArpCacheTimeout( byte[] arpCacheTimeout )
- {
- super( 35, 4 );
- this.arpCacheTimeout = arpCacheTimeout;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( arpCacheTimeout );
+ return 35;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/EthernetEncapsulation.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/EthernetEncapsulation.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/EthernetEncapsulation.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/EthernetEncapsulation.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.linklayer;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ByteOption;
/**
@@ -38,25 +36,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class EthernetEncapsulation extends DhcpOption
+public class EthernetEncapsulation extends ByteOption
{
- private byte[] ethernetEncapsulation;
-
-
- /**
- * Creates a new instance of EthernetEncapsulation.
- *
- * @param ethernetEncapsulation
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public EthernetEncapsulation( byte[] ethernetEncapsulation )
- {
- super( 36, 1 );
- this.ethernetEncapsulation = ethernetEncapsulation;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( ethernetEncapsulation );
+ return 36;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/TrailerEncapsulation.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/TrailerEncapsulation.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/TrailerEncapsulation.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/linklayer/TrailerEncapsulation.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.linklayer;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ByteOption;
/**
@@ -37,25 +35,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class TrailerEncapsulation extends DhcpOption
+public class TrailerEncapsulation extends ByteOption
{
- private byte[] trailerEncapsulation;
-
-
- /**
- * Creates a new instance of TrailerEncapsulation.
- *
- * @param trailerEncapsulation
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public TrailerEncapsulation( byte[] trailerEncapsulation )
- {
- super( 34, 1 );
- this.trailerEncapsulation = trailerEncapsulation;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( trailerEncapsulation );
+ return 34;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultFingerServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultFingerServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultFingerServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultFingerServers.java Mon Mar 17 23:12:41 2008
@@ -37,13 +37,11 @@
*/
public class DefaultFingerServers extends AddressListOption
{
- /**
- * Creates a new instance of DefaultFingerServers.
- *
- * @param defaultFingerServer
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public DefaultFingerServers( byte[] defaultFingerServer )
+ public byte getTag()
{
- super( 73, defaultFingerServer );
+ return 73;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultIrcServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultIrcServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultIrcServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultIrcServers.java Mon Mar 17 23:12:41 2008
@@ -37,13 +37,11 @@
*/
public class DefaultIrcServers extends AddressListOption
{
- /**
- * Creates a new instance of DefaultIrcServers.
- *
- * @param defaultIrcServer
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public DefaultIrcServers( byte[] defaultIrcServer )
+ public byte getTag()
{
- super( 74, defaultIrcServer );
+ return 74;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultWwwServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultWwwServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultWwwServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/DefaultWwwServers.java Mon Mar 17 23:12:41 2008
@@ -37,13 +37,11 @@
*/
public class DefaultWwwServers extends AddressListOption
{
- /**
- * Creates a new instance of DefaultWwwServers.
- *
- * @param defaultWwwServer
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public DefaultWwwServers( byte[] defaultWwwServer )
+ public byte getTag()
{
- super( 72, defaultWwwServer );
+ return 72;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/MobileIpHomeAgents.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/MobileIpHomeAgents.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/MobileIpHomeAgents.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/MobileIpHomeAgents.java Mon Mar 17 23:12:41 2008
@@ -39,13 +39,11 @@
*/
public class MobileIpHomeAgents extends AddressListOption
{
- /**
- * Creates a new instance of MobileIpHomeAgents.
- *
- * @param mobileIpHomeAgent
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public MobileIpHomeAgents( byte[] mobileIpHomeAgent )
+ public byte getTag()
{
- super( 68, mobileIpHomeAgent );
+ return 68;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NbddServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NbddServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NbddServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NbddServers.java Mon Mar 17 23:12:41 2008
@@ -35,13 +35,11 @@
*/
public class NbddServers extends AddressListOption
{
- /**
- * Creates a new instance of NbddServers.
- *
- * @param netbiosDatagramDistributionServer
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NbddServers( byte[] netbiosDatagramDistributionServer )
+ public byte getTag()
{
- super( 45, netbiosDatagramDistributionServer );
+ return 45;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosNameServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosNameServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosNameServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosNameServers.java Mon Mar 17 23:12:41 2008
@@ -36,13 +36,11 @@
*/
public class NetbiosNameServers extends AddressListOption
{
- /**
- * Creates a new instance of NetbiosNameServers.
- *
- * @param netbiosNameServer
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NetbiosNameServers( byte[] netbiosNameServer )
+ public byte getTag()
{
- super( 44, netbiosNameServer );
+ return 44;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosNodeType.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosNodeType.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosNodeType.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosNodeType.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.misc;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ByteOption;
/**
@@ -40,33 +38,16 @@
* 0x8 H-node
*
* In the above chart, the notation '0x' indicates a number in base-16
- * (hexadecimal).
- *
- * The code for this option is 46. The length of this option is always
- * 1.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev$, $Date$
+ * (hexadecimal). The code for this option is 46. The length of this option is
+ * always 1.
*/
-public class NetbiosNodeType extends DhcpOption
+public class NetbiosNodeType extends ByteOption
{
- private byte[] netbiosNodeType;
-
-
- /**
- * Creates a new instance of NetbiosNodeType.
- *
- * @param netbiosNodeType
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NetbiosNodeType( byte[] netbiosNodeType )
- {
- super( 46, 1 );
- this.netbiosNodeType = netbiosNodeType;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( netbiosNodeType );
+ return 46;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosScope.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosScope.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosScope.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NetbiosScope.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.misc;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.StringOption;
/**
@@ -36,25 +34,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class NetbiosScope extends DhcpOption
+public class NetbiosScope extends StringOption
{
- private byte[] netbiosScope;
-
-
- /**
- * Creates a new instance of NetbiosScope.
- *
- * @param netbiosScope
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NetbiosScope( byte[] netbiosScope )
- {
- super( 47, 1 );
- this.netbiosScope = netbiosScope;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( netbiosScope );
+ return 47;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisDomain.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisDomain.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisDomain.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisDomain.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.misc;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.StringOption;
/**
@@ -36,25 +34,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class NisDomain extends DhcpOption
+public class NisDomain extends StringOption
{
- private byte[] nisDomain;
-
-
- /**
- * Creates a new instance of NisDomain.
- *
- * @param nisDomain
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NisDomain( byte[] nisDomain )
- {
- super( 40, 1 );
- this.nisDomain = nisDomain;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( nisDomain );
+ return 40;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisPlusDomain.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisPlusDomain.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisPlusDomain.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisPlusDomain.java Mon Mar 17 23:12:41 2008
@@ -21,8 +21,6 @@
package org.apache.directory.server.dhcp.options.misc;
-import java.nio.ByteBuffer;
-
import org.apache.directory.server.dhcp.options.DhcpOption;
@@ -38,23 +36,11 @@
*/
public class NisPlusDomain extends DhcpOption
{
- private byte[] nisPlusDomain;
-
-
- /**
- * Creates a new instance of NisPlusDomain.
- *
- * @param nisPlusDomain
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NisPlusDomain( byte[] nisPlusDomain )
- {
- super( 64, 1 );
- this.nisPlusDomain = nisPlusDomain;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( nisPlusDomain );
+ return 64;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisPlusServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisPlusServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisPlusServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisPlusServers.java Mon Mar 17 23:12:41 2008
@@ -37,13 +37,11 @@
*/
public class NisPlusServers extends AddressListOption
{
- /**
- * Creates a new instance of NisPlusServers.
- *
- * @param nisPlusServers
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NisPlusServers( byte[] nisPlusServers )
+ public byte getTag()
{
- super( 65, nisPlusServers );
+ return 65;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NisServers.java Mon Mar 17 23:12:41 2008
@@ -37,13 +37,11 @@
*/
public class NisServers extends AddressListOption
{
- /**
- * Creates a new instance of NisServers.
- *
- * @param nisServers
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NisServers( byte[] nisServers )
+ public byte getTag()
{
- super( 41, nisServers );
+ return 41;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NntpServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NntpServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NntpServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NntpServers.java Mon Mar 17 23:12:41 2008
@@ -37,13 +37,11 @@
*/
public class NntpServers extends AddressListOption
{
- /**
- * Creates a new instance of NntpServers.
- *
- * @param nntpServer
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NntpServers( byte[] nntpServer )
+ public byte getTag()
{
- super( 71, nntpServer );
+ return 71;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NtpServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NtpServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NtpServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/NtpServers.java Mon Mar 17 23:12:41 2008
@@ -37,13 +37,11 @@
*/
public class NtpServers extends AddressListOption
{
- /**
- * Creates a new instance of NtpServers.
- *
- * @param ntpServers
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NtpServers( byte[] ntpServers )
+ public byte getTag()
{
- super( 42, ntpServers );
+ return 42;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/Pop3Servers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/Pop3Servers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/Pop3Servers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/Pop3Servers.java Mon Mar 17 23:12:41 2008
@@ -37,13 +37,11 @@
*/
public class Pop3Servers extends AddressListOption
{
- /**
- * Creates a new instance of Pop3Servers.
- *
- * @param pop3Server
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public Pop3Servers( byte[] pop3Server )
+ public byte getTag()
{
- super( 70, pop3Server );
+ return 70;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/SmtpServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/SmtpServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/SmtpServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/SmtpServers.java Mon Mar 17 23:12:41 2008
@@ -37,13 +37,11 @@
*/
public class SmtpServers extends AddressListOption
{
- /**
- * Creates a new instance of SmtpServers.
- *
- * @param smtpServer
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public SmtpServers( byte[] smtpServer )
+ public byte getTag()
{
- super( 69, smtpServer );
+ return 69;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/StdaServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/StdaServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/StdaServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/StdaServers.java Mon Mar 17 23:12:41 2008
@@ -38,13 +38,11 @@
*/
public class StdaServers extends AddressListOption
{
- /**
- * Creates a new instance of StdaServers.
- *
- * @param stdaServer
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public StdaServers( byte[] stdaServer )
+ public byte getTag()
{
- super( 76, stdaServer );
+ return 76;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/StreetTalkServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/StreetTalkServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/StreetTalkServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/StreetTalkServers.java Mon Mar 17 23:12:41 2008
@@ -38,13 +38,11 @@
*/
public class StreetTalkServers extends AddressListOption
{
- /**
- * Creates a new instance of StreetTalkServers.
- *
- * @param streetTalkServer
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public StreetTalkServers( byte[] streetTalkServer )
+ public byte getTag()
{
- super( 75, streetTalkServer );
+ return 75;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/VendorSpecificInformation.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/VendorSpecificInformation.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/VendorSpecificInformation.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/VendorSpecificInformation.java Mon Mar 17 23:12:41 2008
@@ -21,8 +21,6 @@
package org.apache.directory.server.dhcp.options.misc;
-import java.nio.ByteBuffer;
-
import org.apache.directory.server.dhcp.options.DhcpOption;
@@ -65,23 +63,11 @@
*/
public class VendorSpecificInformation extends DhcpOption
{
- private byte[] vendorSpecificInformation;
-
-
- /**
- * Creates a new instance of VendorSpecificInformation.
- *
- * @param vendorSpecificInformation
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public VendorSpecificInformation( byte[] vendorSpecificInformation )
- {
- super( 43, 1 );
- this.vendorSpecificInformation = vendorSpecificInformation;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( vendorSpecificInformation );
+ return 43;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/XWindowDisplayManagers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/XWindowDisplayManagers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/XWindowDisplayManagers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/XWindowDisplayManagers.java Mon Mar 17 23:12:41 2008
@@ -39,13 +39,11 @@
*/
public class XWindowDisplayManagers extends AddressListOption
{
- /**
- * Creates a new instance of XWindowDisplayManagers.
- *
- * @param xWindowDisplayManager
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public XWindowDisplayManagers( byte[] xWindowDisplayManager )
+ public byte getTag()
{
- super( 49, xWindowDisplayManager );
+ return 49;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/XWindowFontServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/XWindowFontServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/XWindowFontServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/misc/XWindowFontServers.java Mon Mar 17 23:12:41 2008
@@ -37,13 +37,11 @@
*/
public class XWindowFontServers extends AddressListOption
{
- /**
- * Creates a new instance of XWindowFontServers.
- *
- * @param xWindowFontServer
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public XWindowFontServers( byte[] xWindowFontServer )
+ public byte getTag()
{
- super( 48, xWindowFontServer );
+ return 48;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/DefaultIpTimeToLive.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/DefaultIpTimeToLive.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/DefaultIpTimeToLive.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/DefaultIpTimeToLive.java Mon Mar 17 23:12:41 2008
@@ -18,44 +18,29 @@
*
*/
-/**
- * This option specifies the default time-to-live that the client should
- * use on outgoing datagrams. The TTL is specified as an octet with a
- * value between 1 and 255.
- *
- * The code for this option is 23, and its length is 1.
- */
package org.apache.directory.server.dhcp.options.perhost;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ByteOption;
/**
+ * This option specifies the default time-to-live that the client should
+ * use on outgoing datagrams. The TTL is specified as an octet with a
+ * value between 1 and 255.
+ *
+ * The code for this option is 23, and its length is 1.
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class DefaultIpTimeToLive extends DhcpOption
+public class DefaultIpTimeToLive extends ByteOption
{
- private byte[] defaultIpTimeToLive;
-
-
- /**
- * Creates a new instance of DefaultIpTimeToLive.
- *
- * @param defaultIpTimeToLive
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public DefaultIpTimeToLive( byte[] defaultIpTimeToLive )
- {
- super( 23, 1 );
- this.defaultIpTimeToLive = defaultIpTimeToLive;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( defaultIpTimeToLive );
+ return 23;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/IpForwarding.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/IpForwarding.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/IpForwarding.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/IpForwarding.java Mon Mar 17 23:12:41 2008
@@ -18,44 +18,29 @@
*
*/
-/**
- * This option specifies whether the client should configure its IP
- * layer for packet forwarding. A value of 0 means disable IP
- * forwarding, and a value of 1 means enable IP forwarding.
- *
- * The code for this option is 19, and its length is 1.
- */
package org.apache.directory.server.dhcp.options.perhost;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ByteOption;
/**
+ * This option specifies whether the client should configure its IP
+ * layer for packet forwarding. A value of 0 means disable IP
+ * forwarding, and a value of 1 means enable IP forwarding.
+ *
+ * The code for this option is 19, and its length is 1.
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class IpForwarding extends DhcpOption
+public class IpForwarding extends ByteOption
{
- private byte[] ipForwarding;
-
-
- /**
- * Creates a new instance of IpForwarding.
- *
- * @param ipForwarding
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public IpForwarding( byte[] ipForwarding )
- {
- super( 19, 1 );
- this.ipForwarding = ipForwarding;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( ipForwarding );
+ return 19;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/MaximumDatagramSize.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/MaximumDatagramSize.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/MaximumDatagramSize.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/MaximumDatagramSize.java Mon Mar 17 23:12:41 2008
@@ -18,44 +18,29 @@
*
*/
-/**
- * This option specifies the maximum size datagram that the client
- * should be prepared to reassemble. The size is specified as a 16-bit
- * unsigned integer. The minimum value legal value is 576.
- *
- * The code for this option is 22, and its length is 2.
- */
package org.apache.directory.server.dhcp.options.perhost;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ShortOption;
/**
+ * This option specifies the maximum size datagram that the client
+ * should be prepared to reassemble. The size is specified as a 16-bit
+ * unsigned integer. The minimum value legal value is 576.
+ *
+ * The code for this option is 22, and its length is 2.
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class MaximumDatagramSize extends DhcpOption
+public class MaximumDatagramSize extends ShortOption
{
- private byte[] maximumDatagramSize;
-
-
- /**
- * Creates a new instance of MaximumDatagramSize.
- *
- * @param maximumDatagramSize
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public MaximumDatagramSize( byte[] maximumDatagramSize )
- {
- super( 22, 2 );
- this.maximumDatagramSize = maximumDatagramSize;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( maximumDatagramSize );
+ return 22;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/NonLocalSourceRouting.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/NonLocalSourceRouting.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/NonLocalSourceRouting.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/NonLocalSourceRouting.java Mon Mar 17 23:12:41 2008
@@ -18,6 +18,12 @@
*
*/
+package org.apache.directory.server.dhcp.options.perhost;
+
+
+import org.apache.directory.server.dhcp.options.ByteOption;
+
+
/**
* This option specifies whether the client should configure its IP
* layer to allow forwarding of datagrams with non-local source routes.
@@ -25,38 +31,17 @@
* of 1 means allow forwarding.
*
* The code for this option is 20, and its length is 1.
- */
-package org.apache.directory.server.dhcp.options.perhost;
-
-
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
-
-
-/**
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class NonLocalSourceRouting extends DhcpOption
+public class NonLocalSourceRouting extends ByteOption
{
- private byte[] nonLocalSourceRouting;
-
-
- /**
- * Creates a new instance of NonLocalSourceRouting.
- *
- * @param nonLocalSourceRouting
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public NonLocalSourceRouting( byte[] nonLocalSourceRouting )
- {
- super( 20, 1 );
- this.nonLocalSourceRouting = nonLocalSourceRouting;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( nonLocalSourceRouting );
+ return 20;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuAgingTimeout.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuAgingTimeout.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuAgingTimeout.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuAgingTimeout.java Mon Mar 17 23:12:41 2008
@@ -18,44 +18,29 @@
*
*/
-/**
- * This option specifies the timeout (in seconds) to use when aging Path
- * MTU values discovered by the mechanism defined in RFC 1191. The
- * timeout is specified as a 32-bit unsigned integer.
- *
- * The code for this option is 24, and its length is 4.
- */
package org.apache.directory.server.dhcp.options.perhost;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.IntOption;
/**
+ * This option specifies the timeout (in seconds) to use when aging Path
+ * MTU values discovered by the mechanism defined in RFC 1191. The
+ * timeout is specified as a 32-bit unsigned integer.
+ *
+ * The code for this option is 24, and its length is 4.
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class PathMtuAgingTimeout extends DhcpOption
+public class PathMtuAgingTimeout extends IntOption
{
- private byte[] pathMtuAgingTimeout;
-
-
- /**
- * Creates a new instance of PathMtuAgingTimeout.
- *
- * @param pathMtuAgingTimeout
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public PathMtuAgingTimeout( byte[] pathMtuAgingTimeout )
- {
- super( 24, 4 );
- this.pathMtuAgingTimeout = pathMtuAgingTimeout;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( pathMtuAgingTimeout );
+ return 24;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuPlateauTable.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuPlateauTable.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuPlateauTable.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PathMtuPlateauTable.java Mon Mar 17 23:12:41 2008
@@ -18,6 +18,12 @@
*
*/
+package org.apache.directory.server.dhcp.options.perhost;
+
+
+import org.apache.directory.server.dhcp.options.DhcpOption;
+
+
/**
* This option specifies a table of MTU sizes to use when performing
* Path MTU Discovery as defined in RFC 1191. The table is formatted as
@@ -26,38 +32,17 @@
*
* The code for this option is 25. Its minimum length is 2, and the
* length MUST be a multiple of 2.
- */
-package org.apache.directory.server.dhcp.options.perhost;
-
-
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
-
-
-/**
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
public class PathMtuPlateauTable extends DhcpOption
{
- private byte[] pathMtuPlateauTable;
-
-
- /**
- * Creates a new instance of PathMtuPlateauTable.
- *
- * @param pathMtuPlateauTable
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public PathMtuPlateauTable( byte[] pathMtuPlateauTable )
- {
- super( 25, 2 );
- this.pathMtuPlateauTable = pathMtuPlateauTable;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( pathMtuPlateauTable );
+ return 25;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PolicyFilter.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PolicyFilter.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PolicyFilter.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perhost/PolicyFilter.java Mon Mar 17 23:12:41 2008
@@ -18,6 +18,12 @@
*
*/
+package org.apache.directory.server.dhcp.options.perhost;
+
+
+import org.apache.directory.server.dhcp.options.AddressListOption;
+
+
/**
* This option specifies policy filters for non-local source routing.
* The filters consist of a list of IP addresses and masks which specify
@@ -28,38 +34,17 @@
*
* The code for this option is 21. The minimum length of this option is
* 8, and the length MUST be a multiple of 8.
- */
-package org.apache.directory.server.dhcp.options.perhost;
-
-
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
-
-
-/**
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class PolicyFilter extends DhcpOption
+public class PolicyFilter extends AddressListOption
{
- private byte[] policyFilter;
-
-
- /**
- * Creates a new instance of PolicyFilter.
- *
- * @param policyFilter
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public PolicyFilter( byte[] policyFilter )
- {
- super( 21, 8 );
- this.policyFilter = policyFilter;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( policyFilter );
+ return 21;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/AllSubnetsAreLocal.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/AllSubnetsAreLocal.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/AllSubnetsAreLocal.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/AllSubnetsAreLocal.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.perinterface;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ByteOption;
/**
@@ -39,25 +37,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class AllSubnetsAreLocal extends DhcpOption
+public class AllSubnetsAreLocal extends ByteOption
{
- private byte[] allSubnetsAreLocal;
-
-
- /**
- * Creates a new instance of AllSubnetsAreLocal.
- *
- * @param allSubnetsAreLocal
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public AllSubnetsAreLocal( byte[] allSubnetsAreLocal )
- {
- super( 27, 1 );
- this.allSubnetsAreLocal = allSubnetsAreLocal;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( allSubnetsAreLocal );
+ return 27;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/BroadcastAddress.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/BroadcastAddress.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/BroadcastAddress.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/BroadcastAddress.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.perinterface;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.AddressOption;
/**
@@ -35,25 +33,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class BroadcastAddress extends DhcpOption
+public class BroadcastAddress extends AddressOption
{
- private byte[] broadcastAddress;
-
-
- /**
- * Creates a new instance of BroadcastAddress.
- *
- * @param broadcastAddress
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public BroadcastAddress( byte[] broadcastAddress )
- {
- super( 28, 4 );
- this.broadcastAddress = broadcastAddress;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( broadcastAddress );
+ return 28;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/InterfaceMtu.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/InterfaceMtu.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/InterfaceMtu.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/InterfaceMtu.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.perinterface;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ShortOption;
/**
@@ -36,25 +34,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class InterfaceMtu extends DhcpOption
+public class InterfaceMtu extends ShortOption
{
- private byte[] interfaceMtu;
-
-
- /**
- * Creates a new instance of InterfaceMtu.
- *
- * @param interfaceMtu
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public InterfaceMtu( byte[] interfaceMtu )
- {
- super( 26, 2 );
- this.interfaceMtu = interfaceMtu;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( interfaceMtu );
+ return 26;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/MaskSupplier.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/MaskSupplier.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/MaskSupplier.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/MaskSupplier.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.perinterface;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ByteOption;
/**
@@ -37,25 +35,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class MaskSupplier extends DhcpOption
+public class MaskSupplier extends ByteOption
{
- private byte[] maskSupplier;
-
-
- /**
- * Creates a new instance of MaskSupplier.
- *
- * @param maskSupplier
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public MaskSupplier( byte[] maskSupplier )
- {
- super( 30, 1 );
- this.maskSupplier = maskSupplier;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( maskSupplier );
+ return 30;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformMaskDiscovery.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformMaskDiscovery.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformMaskDiscovery.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformMaskDiscovery.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.perinterface;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ByteOption;
/**
@@ -37,25 +35,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class PerformMaskDiscovery extends DhcpOption
+public class PerformMaskDiscovery extends ByteOption
{
- private byte[] performMaskDiscovery;
-
-
- /**
- * Creates a new instance of PerformMaskDiscovery.
- *
- * @param performMaskDiscovery
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public PerformMaskDiscovery( byte[] performMaskDiscovery )
- {
- super( 29, 1 );
- this.performMaskDiscovery = performMaskDiscovery;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( performMaskDiscovery );
+ return 29;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformRouterDiscovery.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformRouterDiscovery.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformRouterDiscovery.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/PerformRouterDiscovery.java Mon Mar 17 23:12:41 2008
@@ -21,8 +21,6 @@
package org.apache.directory.server.dhcp.options.perinterface;
-import java.nio.ByteBuffer;
-
import org.apache.directory.server.dhcp.options.DhcpOption;
@@ -40,23 +38,11 @@
*/
public class PerformRouterDiscovery extends DhcpOption
{
- private byte[] performRouterDiscovery;
-
-
- /**
- * Creates a new instance of PerformRouterDiscovery.
- *
- * @param performRouterDiscovery
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public PerformRouterDiscovery( byte[] performRouterDiscovery )
- {
- super( 31, 1 );
- this.performRouterDiscovery = performRouterDiscovery;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( performRouterDiscovery );
+ return 31;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/RouterSolicitationAddress.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/RouterSolicitationAddress.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/RouterSolicitationAddress.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/RouterSolicitationAddress.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.perinterface;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.AddressOption;
/**
@@ -35,25 +33,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class RouterSolicitationAddress extends DhcpOption
+public class RouterSolicitationAddress extends AddressOption
{
- private byte[] routerSolicitationAddress;
-
-
- /**
- * Creates a new instance of RouterSolicitationAddress.
- *
- * @param routerSolicitationAddress
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public RouterSolicitationAddress( byte[] routerSolicitationAddress )
- {
- super( 32, 4 );
- this.routerSolicitationAddress = routerSolicitationAddress;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( routerSolicitationAddress );
+ return 32;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/StaticRoute.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/StaticRoute.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/StaticRoute.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/perinterface/StaticRoute.java Mon Mar 17 23:12:41 2008
@@ -21,8 +21,6 @@
package org.apache.directory.server.dhcp.options.perinterface;
-import java.nio.ByteBuffer;
-
import org.apache.directory.server.dhcp.options.DhcpOption;
@@ -47,23 +45,11 @@
*/
public class StaticRoute extends DhcpOption
{
- private byte[] staticRoute;
-
-
- /**
- * Creates a new instance of StaticRoute.
- *
- * @param staticRoute
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public StaticRoute( byte[] staticRoute )
- {
- super( 33, 8 );
- this.staticRoute = staticRoute;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( staticRoute );
+ return 33;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpDefaultTimeToLive.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.tcp;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ByteOption;
/**
@@ -36,25 +34,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class TcpDefaultTimeToLive extends DhcpOption
+public class TcpDefaultTimeToLive extends ByteOption
{
- private byte[] tcpDefaultTimeToLive;
-
-
- /**
- * Creates a new instance of TcpDefaultTimeToLive.
- *
- * @param tcpDefaultTimeToLive
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public TcpDefaultTimeToLive( byte[] tcpDefaultTimeToLive )
- {
- super( 37, 1 );
- this.tcpDefaultTimeToLive = tcpDefaultTimeToLive;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( tcpDefaultTimeToLive );
+ return 37;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveGarbage.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.tcp;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.IntOption;
/**
@@ -38,25 +36,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class TcpKeepaliveGarbage extends DhcpOption
+public class TcpKeepaliveGarbage extends IntOption
{
- private byte[] tcpKeepaliveGarbage;
-
-
- /**
- * Creates a new instance of TcpKeepaliveGarbage.
- *
- * @param tcpKeepaliveGarbage
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public TcpKeepaliveGarbage( byte[] tcpKeepaliveGarbage )
- {
- super( 38, 4 );
- this.tcpKeepaliveGarbage = tcpKeepaliveGarbage;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( tcpKeepaliveGarbage );
+ return 38;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/tcp/TcpKeepaliveInterval.java Mon Mar 17 23:12:41 2008
@@ -21,9 +21,7 @@
package org.apache.directory.server.dhcp.options.tcp;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ByteOption;
/**
@@ -38,25 +36,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class TcpKeepaliveInterval extends DhcpOption
+public class TcpKeepaliveInterval extends ByteOption
{
- private byte[] tcpKeepaliveInterval;
-
-
- /**
- * Creates a new instance of TcpKeepaliveInterval.
- *
- * @param tcpKeepaliveInterval
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public TcpKeepaliveInterval( byte[] tcpKeepaliveInterval )
- {
- super( 39, 1 );
- this.tcpKeepaliveInterval = tcpKeepaliveInterval;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( tcpKeepaliveInterval );
+ return 39;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/BootFileSize.java Mon Mar 17 23:12:41 2008
@@ -18,44 +18,29 @@
*
*/
-/**
- * This option specifies the length in 512-octet blocks of the default
- * boot image for the client. The file length is specified as an
- * unsigned 16-bit integer.
- *
- * The code for this option is 13, and its length is 2.
- */
package org.apache.directory.server.dhcp.options.vendor;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.ShortOption;
/**
+ * This option specifies the length in 512-octet blocks of the default
+ * boot image for the client. The file length is specified as an
+ * unsigned 16-bit integer.
+ *
+ * The code for this option is 13, and its length is 2.
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class BootFileSize extends DhcpOption
+public class BootFileSize extends ShortOption
{
- private byte[] bootFileSize;
-
-
- /**
- * Creates a new instance of BootFileSize.
- *
- * @param bootFileSize
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public BootFileSize( byte[] bootFileSize )
- {
- super( 13, 2 );
- this.bootFileSize = bootFileSize;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( bootFileSize );
+ return 21;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/CookieServers.java Mon Mar 17 23:12:41 2008
@@ -1,31 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.
- *
+ * 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.
+ *
*/
-/**
- * The cookie server option specifies a list of RFC 865 cookie
- * servers available to the client. Servers SHOULD be listed in order
- * of preference.
- *
- * The code for the log server option is 8. The minimum length for this
- * option is 4 octets, and the length MUST always be a multiple of 4.
- */
package org.apache.directory.server.dhcp.options.vendor;
@@ -33,18 +22,23 @@
/**
+ * The cookie server option specifies a list of RFC 865 cookie
+ * servers available to the client. Servers SHOULD be listed in order
+ * of preference.
+ *
+ * The code for the log server option is 8. The minimum length for this
+ * option is 4 octets, and the length MUST always be a multiple of 4.
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
public class CookieServers extends AddressListOption
{
- /**
- * Creates a new instance of CookieServers.
- *
- * @param cookieServers
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public CookieServers( byte[] cookieServers )
+ public byte getTag()
{
- super( 8, cookieServers );
+ return 8;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainName.java Mon Mar 17 23:12:41 2008
@@ -18,43 +18,29 @@
*
*/
-/**
- * This option specifies the domain name that client should use when
- * resolving hostnames via the Domain Name System.
- *
- * The code for this option is 15. Its minimum length is 1.
- */
package org.apache.directory.server.dhcp.options.vendor;
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
+import org.apache.directory.server.dhcp.options.StringOption;
/**
+ * This option specifies the domain name that client should use when
+ * resolving hostnames via the Domain Name System.
+ *
+ * The code for this option is 15. Its minimum length is 1.
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class DomainName extends DhcpOption
+public class DomainName extends StringOption
{
- private byte[] domainName;
-
-
- /**
- * Creates a new instance of DomainName.
- *
- * @param domainName
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public DomainName( byte[] domainName )
+ public byte getTag()
{
- super( 15, 1 );
- this.domainName = domainName;
+ return 15;
}
-
- protected void valueToByteBuffer( ByteBuffer out )
- {
- out.put( domainName );
- }
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/DomainNameServers.java Mon Mar 17 23:12:41 2008
@@ -18,6 +18,12 @@
*
*/
+package org.apache.directory.server.dhcp.options.vendor;
+
+
+import org.apache.directory.server.dhcp.options.AddressListOption;
+
+
/**
* The domain name server option specifies a list of Domain Name System
* (STD 13, RFC 1035 [8]) name servers available to the client. Servers
@@ -26,26 +32,17 @@
* The code for the domain name server option is 6. The minimum length
* for this option is 4 octets, and the length MUST always be a multiple
* of 4.
- */
-package org.apache.directory.server.dhcp.options.vendor;
-
-
-import org.apache.directory.server.dhcp.options.AddressListOption;
-
-
-/**
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
public class DomainNameServers extends AddressListOption
{
- /**
- * Creates a new instance of DomainNameServers.
- *
- * @param domainNameServers
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public DomainNameServers( byte[] domainNameServers )
+ public byte getTag()
{
- super( 6, domainNameServers );
+ return 6;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/ExtensionsPath.java Mon Mar 17 23:12:41 2008
@@ -18,6 +18,12 @@
*
*/
+package org.apache.directory.server.dhcp.options.vendor;
+
+
+import org.apache.directory.server.dhcp.options.StringOption;
+
+
/**
* A string to specify a file, retrievable via TFTP, which contains
* information which can be interpreted in the same way as the 64-octet
@@ -30,38 +36,17 @@
* ignored.
*
* The code for this option is 18. Its minimum length is 1.
- */
-package org.apache.directory.server.dhcp.options.vendor;
-
-
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
-
-
-/**
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class ExtensionsPath extends DhcpOption
+public class ExtensionsPath extends StringOption
{
- private byte[] extensionsPath;
-
-
- /**
- * Creates a new instance of ExtensionsPath.
- *
- * @param extensionsPath
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
*/
- public ExtensionsPath( byte[] extensionsPath )
- {
- super( 18, 1 );
- this.extensionsPath = extensionsPath;
- }
-
-
- protected void valueToByteBuffer( ByteBuffer out )
+ public byte getTag()
{
- out.put( extensionsPath );
+ return 18;
}
}
Modified: directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java?rev=638228&r1=638227&r2=638228&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/vendor/HostName.java Mon Mar 17 23:12:41 2008
@@ -18,6 +18,12 @@
*
*/
+package org.apache.directory.server.dhcp.options.vendor;
+
+
+import org.apache.directory.server.dhcp.options.StringOption;
+
+
/**
* This option specifies the name of the client. The name may or may
* not be qualified with the local domain name (see section 3.17 for the
@@ -25,38 +31,30 @@
* character set restrictions.
*
* The code for this option is 12, and its minimum length is 1.
- */
-package org.apache.directory.server.dhcp.options.vendor;
-
-
-import java.nio.ByteBuffer;
-
-import org.apache.directory.server.dhcp.options.DhcpOption;
-
-
-/**
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class HostName extends DhcpOption
+public class HostName extends StringOption
{
- private byte[] hostName;
-
-
+ public HostName()
+ {
+ }
+
/**
- * Creates a new instance of HostName.
- *
- * @param hostName
+ * @param string
*/
- public HostName( byte[] hostName )
+ public HostName(String name)
{
- super( 12, 1 );
- this.hostName = hostName;
+ setString( name );
}
- protected void valueToByteBuffer( ByteBuffer out )
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
+ */
+ public byte getTag()
{
- out.put( hostName );
+ return 12;
}
}