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/06/07 09:48:20 UTC
svn commit: r664295 [3/5] - in /directory/apacheds/branches/bigbang: ./
apacheds-jdbm/src/examples/ apacheds-jdbm/src/main/java/jdbm/
apacheds-jdbm/src/main/java/jdbm/btree/
bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/p...
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Sat Jun 7 00:48:16 2008
@@ -375,21 +375,21 @@
}
else
{
- // Feed the contextEntry with the mandatory ObjectClass values, if they are missing.
- if ( !objectClassAttr.contains( SchemaConstants.TOP_OC ) )
- {
- objectClassAttr.add( SchemaConstants.TOP_OC );
- }
-
- if ( !objectClassAttr.contains( SchemaConstants.ORGANIZATIONAL_UNIT_OC ) )
- {
- objectClassAttr.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
- }
-
- if ( !objectClassAttr.contains( SchemaConstants.EXTENSIBLE_OBJECT_OC ) )
- {
- objectClassAttr.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
- }
+ // Feed the contextEntry with the mandatory ObjectClass values, if they are missing.
+ if ( !objectClassAttr.contains( SchemaConstants.TOP_OC ) )
+ {
+ objectClassAttr.add( SchemaConstants.TOP_OC );
+ }
+
+ if ( !objectClassAttr.contains( SchemaConstants.ORGANIZATIONAL_UNIT_OC ) )
+ {
+ objectClassAttr.add( SchemaConstants.ORGANIZATIONAL_UNIT_OC );
+ }
+
+ if ( !objectClassAttr.contains( SchemaConstants.EXTENSIBLE_OBJECT_OC ) )
+ {
+ objectClassAttr.add( SchemaConstants.EXTENSIBLE_OBJECT_OC );
+ }
}
systemEntry.put( SchemaConstants.CREATORS_NAME_AT, ServerDNConstants.ADMIN_SYSTEM_DN );
@@ -662,35 +662,35 @@
synchronized ( partitionLookupTree )
{
- LdapDN partitionSuffix = partition.getSuffixDn();
-
- if ( partitionSuffix == null )
- {
- throw new ConfigurationException( "The current partition does not have any suffix: " + partition.getId() );
- }
-
+ LdapDN partitionSuffix = partition.getSuffixDn();
+
+ if ( partitionSuffix == null )
+ {
+ throw new ConfigurationException( "The current partition does not have any suffix: " + partition.getId() );
+ }
+
partitions.put( partitionSuffix.toString(), partition );
partitionLookupTree.recursivelyAddPartition( partitionLookupTree, partition.getSuffixDn(), 0, partition );
EntryAttribute namingContexts = rootDSE.get( SchemaConstants.NAMING_CONTEXTS_AT );
- LdapDN partitionUpSuffix = partition.getUpSuffixDn();
-
- if ( partitionUpSuffix == null )
- {
- throw new ConfigurationException( "The current partition does not have any user provided suffix: " + partition.getId() );
- }
-
- if ( namingContexts == null )
- {
- namingContexts = new DefaultServerAttribute(
- registries.getAttributeTypeRegistry().lookup( SchemaConstants.NAMING_CONTEXTS_AT ), partitionUpSuffix.getUpName() );
- rootDSE.put( namingContexts );
- }
- else
- {
- namingContexts.add( partitionUpSuffix.getUpName() );
- }
+ LdapDN partitionUpSuffix = partition.getUpSuffixDn();
+
+ if ( partitionUpSuffix == null )
+ {
+ throw new ConfigurationException( "The current partition does not have any user provided suffix: " + partition.getId() );
+ }
+
+ if ( namingContexts == null )
+ {
+ namingContexts = new DefaultServerAttribute(
+ registries.getAttributeTypeRegistry().lookup( SchemaConstants.NAMING_CONTEXTS_AT ), partitionUpSuffix.getUpName() );
+ rootDSE.put( namingContexts );
+ }
+ else
+ {
+ namingContexts.add( partitionUpSuffix.getUpName() );
+ }
}
}
@@ -920,7 +920,7 @@
// -----------------------------------------------------------
if ( ( ids == null ) || ( ids.length == 0 ) )
{
- ServerEntry rootDSE = (ServerEntry)getRootDSE( null ).clone();
+ ServerEntry rootDSE = (ServerEntry)getRootDSE( null ).clone();
return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( rootDSE ), opContext );
}
@@ -966,14 +966,14 @@
// return nothing
if ( containsOneDotOne )
{
- ServerEntry serverEntry = new DefaultServerEntry( registries, base );
+ ServerEntry serverEntry = new DefaultServerEntry( registries, base );
return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( serverEntry ), opContext );
}
// return everything
if ( containsAsterisk && containsPlus )
{
- ServerEntry rootDSE = (ServerEntry)getRootDSE( null ).clone();
+ ServerEntry rootDSE = (ServerEntry)getRootDSE( null ).clone();
return new BaseEntryFilteringCursor( new SingletonCursor<ServerEntry>( rootDSE ), opContext );
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java Sat Jun 7 00:48:16 2008
@@ -83,15 +83,15 @@
try
{
- Map<String, OidNormalizer> oidsMap = new HashMap<String, OidNormalizer>();
-
- oidsMap.put( SchemaConstants.UID_AT, new OidNormalizer( SchemaConstants.UID_AT_OID, new NoOpNormalizer() ) );
- oidsMap.put( SchemaConstants.USER_ID_AT, new OidNormalizer( SchemaConstants.UID_AT_OID, new NoOpNormalizer() ) );
- oidsMap.put( SchemaConstants.UID_AT_OID, new OidNormalizer( SchemaConstants.UID_AT_OID, new NoOpNormalizer() ) );
-
- oidsMap.put( SchemaConstants.OU_AT, new OidNormalizer( SchemaConstants.OU_AT_OID, new NoOpNormalizer() ) );
- oidsMap.put( SchemaConstants.ORGANIZATIONAL_UNIT_NAME_AT, new OidNormalizer( SchemaConstants.OU_AT_OID, new NoOpNormalizer() ) );
- oidsMap.put( SchemaConstants.OU_AT_OID, new OidNormalizer( SchemaConstants.OU_AT_OID, new NoOpNormalizer() ) );
+ Map<String, OidNormalizer> oidsMap = new HashMap<String, OidNormalizer>();
+
+ oidsMap.put( SchemaConstants.UID_AT, new OidNormalizer( SchemaConstants.UID_AT_OID, new NoOpNormalizer() ) );
+ oidsMap.put( SchemaConstants.USER_ID_AT, new OidNormalizer( SchemaConstants.UID_AT_OID, new NoOpNormalizer() ) );
+ oidsMap.put( SchemaConstants.UID_AT_OID, new OidNormalizer( SchemaConstants.UID_AT_OID, new NoOpNormalizer() ) );
+
+ oidsMap.put( SchemaConstants.OU_AT, new OidNormalizer( SchemaConstants.OU_AT_OID, new NoOpNormalizer() ) );
+ oidsMap.put( SchemaConstants.ORGANIZATIONAL_UNIT_NAME_AT, new OidNormalizer( SchemaConstants.OU_AT_OID, new NoOpNormalizer() ) );
+ oidsMap.put( SchemaConstants.OU_AT_OID, new OidNormalizer( SchemaConstants.OU_AT_OID, new NoOpNormalizer() ) );
adminDn.normalize( oidsMap );
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Sat Jun 7 00:48:16 2008
@@ -235,8 +235,8 @@
public void delete( DeleteOperationContext opContext ) throws Exception
{
- LdapDN dn = opContext.getDn();
-
+ LdapDN dn = opContext.getDn();
+
Long id = getEntryId( dn.getNormName() );
// don't continue if id is null
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java Sat Jun 7 00:48:16 2008
@@ -208,7 +208,10 @@
public Object getCellEditorValue()
{
if ( log.isDebugEnabled() )
+ {
log.debug( "Editor returning '" + l_textField.getText() + "'" );
+ }
+
return l_textField.getText();
}
};
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Sat Jun 7 00:48:16 2008
@@ -324,8 +324,7 @@
{
public void actionPerformed( ActionEvent an_event )
{
- if ( LOG.isDebugEnabled() )
- LOG.debug( "action command = " + an_event.getActionCommand() );
+ LOG.debug( "action command = {}", an_event.getActionCommand() );
try
{
@@ -463,11 +462,9 @@
try
{
in = new FileReader( selected );
- Iterator list = new LdifReader( in );
- while ( list.hasNext() )
+ for ( LdifEntry entry:new LdifReader( in ) )
{
- LdifEntry entry = ( LdifEntry ) list.next();
String updn = entry.getDn();
LdapDN ndn = new LdapDN( StringTools.deepTrimToLower( updn ) );
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/AbstractSchemaChangeHandler.java Sat Jun 7 00:48:16 2008
@@ -162,11 +162,11 @@
protected void registerOids( SchemaObject obj ) throws Exception
{
- String[] names = obj.getNames();
+ String[] names = obj.getNamesRef();
if ( names != null )
{
- for ( String name: names )
+ for ( String name:names )
{
targetRegistries.getOidRegistry().register( name, obj.getOid() );
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java Sat Jun 7 00:48:16 2008
@@ -205,19 +205,19 @@
public boolean isStructural()
{
- return objectClassType == ObjectClassTypeEnum.STRUCTURAL;
+ return objectClassType == ObjectClassTypeEnum.STRUCTURAL;
}
public boolean isAbstract()
{
- return objectClassType == ObjectClassTypeEnum.ABSTRACT;
+ return objectClassType == ObjectClassTypeEnum.ABSTRACT;
}
public boolean isAuxiliary()
{
- return objectClassType == ObjectClassTypeEnum.AUXILIARY;
+ return objectClassType == ObjectClassTypeEnum.AUXILIARY;
}
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/PartitionSchemaLoader.java Sat Jun 7 00:48:16 2008
@@ -528,7 +528,7 @@
while ( list.next() )
{
- ServerEntry result = list.get();
+ ServerEntry result = list.get();
LdapDN resultDN = result.getDn();
resultDN.normalize( atRegistry.getNormalizerMapping() );
ServerEntry attrs = lookupPartition( resultDN );
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java Sat Jun 7 00:48:16 2008
@@ -674,9 +674,11 @@
or.addNode( new EqualityNode<String>( M_EQUALITY_OID, new ClientStringValue( mr.getOid() ) ) );
filter.addNode( or );
- if ( mr.getNames() != null || mr.getNames().length > 0 )
+ String[] names = mr.getNamesRef();
+
+ if ( ( names != null ) || ( names.length > 0 ) )
{
- for ( String name : mr.getNames() )
+ for ( String name : names )
{
or.addNode( new EqualityNode<String>( M_ORDERING_OID, new ClientStringValue( name.toLowerCase() ) ) );
or.addNode( new EqualityNode<String>( M_SUBSTRING_OID, new ClientStringValue( name.toLowerCase() ) ) );
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/subtree/RefinementEvaluator.java Sat Jun 7 00:48:16 2008
@@ -102,7 +102,7 @@
}
return true;
-
+
}
else if ( node instanceof NotNode )
{
@@ -112,7 +112,7 @@
}
throw new IllegalArgumentException( "Negation has no child: " + node );
-
+
}
else
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java Sat Jun 7 00:48:16 2008
@@ -17,9 +17,9 @@
* under the License.
*
*/
-
package org.apache.directory.server.core.trigger;
+
import org.apache.directory.server.core.interceptor.context.OperationContext;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.Rdn;
@@ -39,32 +39,33 @@
private LdapDN oldDN;
private LdapDN newDN;
- public ModifyDNStoredProcedureParameterInjector( OperationContext opContext, boolean deleteOldRn,
+
+ public ModifyDNStoredProcedureParameterInjector( OperationContext opContext, boolean deleteOldRn,
LdapDN oldRDN, Rdn newRDN, LdapDN oldSuperiorDN, LdapDN newSuperiorDN, LdapDN oldDN, LdapDN newDN)
{
super( opContext );
this.deleteOldRn = deleteOldRn;
- this.oldRDN = oldRDN;
- this.newRDN = newRDN;
- this.oldSuperiorDN = oldSuperiorDN;
- this.newSuperiorDN = newSuperiorDN;
- this.oldDN = oldDN;
- this.newDN = newDN;
-
- Map<Class<?>, MicroInjector> injectors = super.getInjectors();
- injectors.put( StoredProcedureParameter.ModifyDN_ENTRY.class, $entryInjector );
- injectors.put( StoredProcedureParameter.ModifyDN_NEW_RDN.class, $newrdnInjector );
- injectors.put( StoredProcedureParameter.ModifyDN_DELETE_OLD_RDN.class, $deleteoldrdnInjector );
- injectors.put( StoredProcedureParameter.ModifyDN_NEW_SUPERIOR.class, $newSuperiorInjector );
- injectors.put( StoredProcedureParameter.ModifyDN_OLD_RDN.class, $oldRDNInjector );
- injectors.put( StoredProcedureParameter.ModifyDN_OLD_SUPERIOR_DN.class, $oldSuperiorDNInjector );
- injectors.put( StoredProcedureParameter.ModifyDN_NEW_DN.class, $newDNInjector );
-
+ this.oldRDN = oldRDN;
+ this.newRDN = newRDN;
+ this.oldSuperiorDN = oldSuperiorDN;
+ this.newSuperiorDN = newSuperiorDN;
+ this.oldDN = oldDN;
+ this.newDN = newDN;
+
+ Map<Class<?>, MicroInjector> injectors = super.getInjectors();
+ injectors.put( StoredProcedureParameter.ModifyDN_ENTRY.class, $entryInjector );
+ injectors.put( StoredProcedureParameter.ModifyDN_NEW_RDN.class, $newrdnInjector );
+ injectors.put( StoredProcedureParameter.ModifyDN_DELETE_OLD_RDN.class, $deleteoldrdnInjector );
+ injectors.put( StoredProcedureParameter.ModifyDN_NEW_SUPERIOR.class, $newSuperiorInjector );
+ injectors.put( StoredProcedureParameter.ModifyDN_OLD_RDN.class, $oldRDNInjector );
+ injectors.put( StoredProcedureParameter.ModifyDN_OLD_SUPERIOR_DN.class, $oldSuperiorDNInjector );
+ injectors.put( StoredProcedureParameter.ModifyDN_NEW_DN.class, $newDNInjector );
+
}
- /**
- * Injector for 'entry' parameter of ModifyDNRequest as in RFC4511.
- */
- MicroInjector $entryInjector = new MicroInjector()
+ /**
+ * Injector for 'entry' parameter of ModifyDNRequest as in RFC4511.
+ */
+ MicroInjector $entryInjector = new MicroInjector()
{
public Object inject( OperationContext opContext, StoredProcedureParameter param ) throws NamingException
{
Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Sat Jun 7 00:48:16 2008
@@ -255,9 +255,9 @@
public void add( NextInterceptor next, AddOperationContext addContext ) throws Exception
{
- LdapDN name = addContext.getDn();
- ServerEntry entry = addContext.getEntry();
-
+ LdapDN name = addContext.getDn();
+ ServerEntry entry = addContext.getEntry();
+
// Bypass trigger handling if the service is disabled.
if ( !enabled )
{
@@ -290,8 +290,8 @@
public void delete( NextInterceptor next, DeleteOperationContext deleteContext ) throws Exception
{
- LdapDN name = deleteContext.getDn();
-
+ LdapDN name = deleteContext.getDn();
+
// Bypass trigger handling if the service is disabled.
if ( !enabled )
{
@@ -579,16 +579,16 @@
private Object executeTrigger( OperationContext opContext, TriggerSpecification tsec,
StoredProcedureParameterInjector injector ) throws Exception
{
- List<Object> returnValues = new ArrayList<Object>();
- List<SPSpec> spSpecs = tsec.getSPSpecs();
+ List<Object> returnValues = new ArrayList<Object>();
+ List<SPSpec> spSpecs = tsec.getSPSpecs();
for ( SPSpec spSpec : spSpecs )
{
- List<Object> arguments = new ArrayList<Object>();
- arguments.addAll( injector.getArgumentsToInject( opContext, spSpec.getParameters() ) );
+ List<Object> arguments = new ArrayList<Object>();
+ arguments.addAll( injector.getArgumentsToInject( opContext, spSpec.getParameters() ) );
Object[] values = arguments.toArray();
Object returnValue = executeProcedure( opContext, spSpec.getName(), values );
returnValues.add( returnValue );
- }
+ }
return returnValues;
}
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/DummyAttributeTypeRegistry.java Sat Jun 7 00:48:16 2008
@@ -148,7 +148,7 @@
return null;
}
- public String[] getNames()
+ public String[] getNamesRef()
{
return null;
}
@@ -211,7 +211,7 @@
}
- public String[] getNames()
+ public String[] getNamesRef()
{
return new String[]
{ id };
@@ -304,7 +304,7 @@
return null;
}
- public String[] getNames()
+ public String[] getNamesRef()
{
return null;
}
@@ -370,7 +370,7 @@
return null;
}
- public String[] getNames()
+ public String[] getNamesRef()
{
return null;
}
@@ -424,7 +424,7 @@
return null;
}
- public String[] getNames()
+ public String[] getNamesRef()
{
return null;
}
@@ -487,7 +487,7 @@
}
- public String[] getNames()
+ public String[] getNamesRef()
{
return new String[]
{ id };
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java Sat Jun 7 00:48:16 2008
@@ -53,19 +53,19 @@
private static final Collection<String> EMPTY_STRING_COLLECTION = Collections.unmodifiableCollection( new ArrayList<String>() );
private static final Collection<Attribute> EMPTY_ATTRIBUTE_COLLECTION =
- Collections.unmodifiableCollection( new ArrayList<Attribute>() );
+ Collections.unmodifiableCollection( new ArrayList<Attribute>() );
private static final Collection<UserClass> EMPTY_USER_CLASS_COLLECTION =
- Collections.unmodifiableCollection( new ArrayList<UserClass>() );
+ Collections.unmodifiableCollection( new ArrayList<UserClass>() );
private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION =
- Collections.unmodifiableCollection( new ArrayList<ACITuple>() );
+ Collections.unmodifiableCollection( new ArrayList<ACITuple>() );
private static final Collection<ProtectedItem> EMPTY_PROTECTED_ITEM_COLLECTION =
- Collections.unmodifiableCollection( new ArrayList<ProtectedItem>() );
+ Collections.unmodifiableCollection( new ArrayList<ProtectedItem>() );
private static final Set<MicroOperation> EMPTY_MICRO_OPERATION_SET =
- Collections.unmodifiableSet( new HashSet<MicroOperation>() );
+ Collections.unmodifiableSet( new HashSet<MicroOperation>() );
private static final List<ACITuple> TUPLES_A = new ArrayList<ACITuple>();
private static final List<ACITuple> TUPLES_B = new ArrayList<ACITuple>();
@@ -98,13 +98,13 @@
allAttributeValues, EMPTY_MICRO_OPERATION_SET, true, 0 );
ACITuple selfValueTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, selfValue,
- EMPTY_MICRO_OPERATION_SET, true, 0 );
+ EMPTY_MICRO_OPERATION_SET, true, 0 );
ACITuple attributeValueTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, attributeValue,
- EMPTY_MICRO_OPERATION_SET, true, 0 );
+ EMPTY_MICRO_OPERATION_SET, true, 0 );
ACITuple rangeOfValuesTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE, rangeOfValues,
- EMPTY_MICRO_OPERATION_SET, true, 0 );
+ EMPTY_MICRO_OPERATION_SET, true, 0 );
ACITuple allUserAttributeTypesTuple = new ACITuple( EMPTY_USER_CLASS_COLLECTION, AuthenticationLevel.NONE,
allUserAttributeTypes, EMPTY_MICRO_OPERATION_SET, true, 0 );
Modified: directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java (original)
+++ directory/apacheds/branches/bigbang/core/src/test/java/org/apache/directory/server/core/referral/ReferralLutTest.java Sat Jun 7 00:48:16 2008
@@ -22,11 +22,10 @@
import javax.naming.NamingException;
-import org.apache.directory.server.core.referral.ReferralLut;
-import org.apache.directory.shared.ldap.name.LdapDN;
-
import junit.framework.TestCase;
+import org.apache.directory.shared.ldap.name.LdapDN;
+
/**
* Unit tests for ReferralLut.
Modified: directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java Sat Jun 7 00:48:16 2008
@@ -121,20 +121,20 @@
{
if ( log.isDebugEnabled() )
{
- switch ( mod.getOperation() )
- {
- case ADD_ATTRIBUTE:
- operation = "Adding";
- break;
-
- case REMOVE_ATTRIBUTE:
- operation = "Removing";
- break;
-
- case REPLACE_ATTRIBUTE:
- operation = "Replacing";
- break;
- }
+ switch ( mod.getOperation() )
+ {
+ case ADD_ATTRIBUTE:
+ operation = "Adding";
+ break;
+
+ case REMOVE_ATTRIBUTE:
+ operation = "Removing";
+ break;
+
+ case REPLACE_ATTRIBUTE:
+ operation = "Replacing";
+ break;
+ }
}
ServerAttribute attr = (ServerAttribute)mod.getAttribute();
@@ -181,7 +181,7 @@
if ( log.isDebugEnabled() )
{
- log.debug( operation + " for entry '" + name.getUpName() + "' the attribute " + mod.getAttribute() );
+ log.debug( operation + " for entry '" + name.getUpName() + "' the attribute " + mod.getAttribute() );
}
}
Modified: directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java (original)
+++ directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoEqMatchAttribute.java Sat Jun 7 00:48:16 2008
@@ -148,4 +148,10 @@
{
//To change body of implemented methods use File | Settings | File Templates.
}
+
+
+ public String[] getNamesRef()
+ {
+ return null;
+ }
}
Modified: directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags/TicketFlags.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags/TicketFlags.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags/TicketFlags.java (original)
+++ directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags/TicketFlags.java Sat Jun 7 00:48:16 2008
@@ -29,7 +29,7 @@
*/
public class TicketFlags extends AbstractKerberosFlags
{
- public static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/CSNVector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/CSNVector.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/CSNVector.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/CSNVector.java Sat Jun 7 00:48:16 2008
@@ -150,6 +150,7 @@
/**
* Returns the hash code of this vector, calculated from each {@link CSN}
* element.
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultUUID.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultUUID.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultUUID.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/DefaultUUID.java Sat Jun 7 00:48:16 2008
@@ -59,6 +59,10 @@
}
+ /**
+ *Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return uuid.hashCode();
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/Replica.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/Replica.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/Replica.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/common/Replica.java Sat Jun 7 00:48:16 2008
@@ -148,6 +148,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return id.hashCode();
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/configuration/ReplicationConfiguration.java Sat Jun 7 00:48:16 2008
@@ -141,8 +141,8 @@
* @return <tt>0</tt> if automatic replication is disabled
*/
public int getReplicationInterval() {
- return replicationInterval;
- }
+ return replicationInterval;
+ }
/**
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/handler/ReplicationProtocolHandler.java Sat Jun 7 00:48:16 2008
@@ -64,7 +64,7 @@
}
public ReplicationContextHandler getContextHandler() {
- return contextHandler;
+ return contextHandler;
}
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BaseMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BaseMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BaseMessage.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BaseMessage.java Sat Jun 7 00:48:16 2008
@@ -58,6 +58,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return new HashCodeBuilder( -1364566505, -1158072471 ).append( this.sequence ).toHashCode();
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesAckMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesAckMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesAckMessage.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesAckMessage.java Sat Jun 7 00:48:16 2008
@@ -94,6 +94,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesMessage.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/BeginLogEntriesMessage.java Sat Jun 7 00:48:16 2008
@@ -51,6 +51,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return new HashCodeBuilder( -1480829129, 951761287 ).appendSuper( super.hashCode() ).toHashCode();
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesAckMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesAckMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesAckMessage.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesAckMessage.java Sat Jun 7 00:48:16 2008
@@ -51,6 +51,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return new HashCodeBuilder( 247639103, -470023671 ).appendSuper( super.hashCode() ).toHashCode();
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesMessage.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/EndLogEntriesMessage.java Sat Jun 7 00:48:16 2008
@@ -51,6 +51,10 @@
}
+ /**
+ * Compute the instance's hash code
+ * @return the instance's hashcode
+ */
public int hashCode()
{
return new HashCodeBuilder( 1892305163, -1367551105 ).appendSuper( super.hashCode() ).toHashCode();
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryAckMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryAckMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryAckMessage.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryAckMessage.java Sat Jun 7 00:48:16 2008
@@ -60,6 +60,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryMessage.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LogEntryMessage.java Sat Jun 7 00:48:16 2008
@@ -74,6 +74,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginAckMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginAckMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginAckMessage.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginAckMessage.java Sat Jun 7 00:48:16 2008
@@ -74,6 +74,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginMessage.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/LoginMessage.java Sat Jun 7 00:48:16 2008
@@ -70,6 +70,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/ResponseMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/ResponseMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/ResponseMessage.java (original)
+++ directory/apacheds/branches/bigbang/mitosis/src/main/java/org/apache/directory/mitosis/service/protocol/message/ResponseMessage.java Sat Jun 7 00:48:16 2008
@@ -67,6 +67,7 @@
/**
* @see java.lang.Object#hashCode()
+ * @return the instance's hashcode
*/
public int hashCode()
{
Modified: directory/apacheds/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/pom.xml?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/pom.xml (original)
+++ directory/apacheds/branches/bigbang/pom.xml Sat Jun 7 00:48:16 2008
@@ -532,9 +532,9 @@
</reporting>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/directory/apacheds/branches/bigbang</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/apacheds/branches/bigbang</developerConnection>
- <url>http://svn.apache.org/viewvc/directory/project/tags/10/apacheds-parent</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/directory/apacheds/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/apacheds/trunk</developerConnection>
+ <url>http://svn.apache.org/viewvc/directory/apacheds/trunk</url>
</scm>
<repositories>
Modified: directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/DhcpMessage.java Sat Jun 7 00:48:16 2008
@@ -32,265 +32,265 @@
* @version $Rev$, $Date$
*/
public class DhcpMessage {
- /**
- * Flag value: request broadcast answer.
- */
- public static final int FLAG_BROADCAST = 0x01;
-
- /**
- * [yiaddr] 'your' (client) IP address.
- */
- private InetAddress assignedClientAddress;
-
- /**
- * [file] Boot file name, null terminated string; "generic" name or null in
- * DHCPDISCOVER, fully qualified directory-path name in DHCPOFFER.
- */
- private String bootFileName;
-
- /**
- * [ciaddr] Current client IP address; only filled in if client is in BOUND,
- * RENEW or REBINDING state and can respond to ARP requests.
- */
- private InetAddress currentClientAddress;
-
- /**
- * [flags] Flags. (LSB is broadcast flag)
- */
- private short flags;
-
- /**
- * [hops] Client sets to zero, optionally used by relay agents when booting
- * via a relay agent.
- */
- private short hopCount;
-
- /**
- * [op] Message op code. 1 = BOOTREQUEST, 2 = BOOTREPLY, ...
- */
- private byte op;
-
- /**
- * Operation constant: boot request (client to server).
- *
- * @see #op
- */
- public static final byte OP_BOOTREQUEST = 1;
-
- /**
- * Operation constant: boot reply (server to client).
- *
- * @see #op
- */
- public static final byte OP_BOOTREPLY = 2;
-
- /**
- * [siaddr] IP address of next server to use in bootstrap; returned in
- * DHCPOFFER, DHCPACK by server.
- */
- private InetAddress nextServerAddress;
-
- /**
- * [options] Optional parameters field. See the options documents for a list
- * of defined options.
- */
- private OptionsField options = new OptionsField();
-
- /**
- * [giaddr] Relay agent IP address, used in booting via a relay agent.
- */
- private InetAddress relayAgentAddress;
-
- /**
- * [secs] Filled in by client, seconds elapsed since client began address
- * acquisition or renewal process.
- */
- private int seconds;
-
- /**
- * [sname] Optional server host name, null terminated string.
- */
- private String serverHostname;
-
- /**
- * [xid] Transaction ID, a random number chosen by the client, used by the
- * client and server to associate messages and responses between a client and
- * a server.
- */
- private int transactionId;
-
- /**
- * The DHCP message type option.
- */
- private MessageType messageType;
-
- private HardwareAddress hardwareAddress;
-
- /**
- * Create a default dhcp message.
- */
- public DhcpMessage() {
-
- }
-
- /**
- * Create a DHCP message based on the supplied values.
- *
- * @param messageType
- * @param op
- * @param hardwareAddress
- * @param hops
- * @param transactionId
- * @param seconds
- * @param flags
- * @param currentClientAddress
- * @param assignedClientAddress
- * @param nextServerAddress
- * @param relayAgentAddress
- * @param serverHostname
- * @param bootFileName
- * @param options
- */
- public DhcpMessage(MessageType messageType, byte op,
- HardwareAddress hardwareAddress, short hops, int transactionId,
- int seconds, short flags, InetAddress currentClientAddress,
- InetAddress assignedClientAddress, InetAddress nextServerAddress,
- InetAddress relayAgentAddress, String serverHostname,
- String bootFileName, OptionsField options) {
- this.messageType = messageType;
- this.op = op;
- this.hardwareAddress = hardwareAddress;
- this.hopCount = hops;
- this.transactionId = transactionId;
- this.seconds = seconds;
- this.flags = flags;
- this.currentClientAddress = currentClientAddress;
- this.assignedClientAddress = assignedClientAddress;
- this.nextServerAddress = nextServerAddress;
- this.relayAgentAddress = relayAgentAddress;
- this.serverHostname = serverHostname;
- this.bootFileName = bootFileName;
- this.options = options;
- }
-
- public InetAddress getAssignedClientAddress() {
- return assignedClientAddress;
- }
-
- public String getBootFileName() {
- return bootFileName;
- }
-
- public InetAddress getCurrentClientAddress() {
- return currentClientAddress;
- }
-
- public short getFlags() {
- return flags;
- }
-
- public short getHopCount() {
- return hopCount;
- }
-
- public MessageType getMessageType() {
- return messageType;
- }
-
- public InetAddress getNextServerAddress() {
- return nextServerAddress;
- }
-
- public OptionsField getOptions() {
- return options;
- }
-
- public InetAddress getRelayAgentAddress() {
- return relayAgentAddress;
- }
-
- public int getSeconds() {
- return seconds;
- }
-
- public String getServerHostname() {
- return serverHostname;
- }
-
- public int getTransactionId() {
- return transactionId;
- }
-
- public void setAssignedClientAddress(InetAddress assignedClientAddress) {
- this.assignedClientAddress = assignedClientAddress;
- }
-
- public void setBootFileName(String bootFileName) {
- this.bootFileName = bootFileName;
- }
-
- public void setCurrentClientAddress(InetAddress currentClientAddress) {
- this.currentClientAddress = currentClientAddress;
- }
-
- public void setFlags(short flags) {
- this.flags = flags;
- }
-
- public void setHopCount(short hopCount) {
- this.hopCount = hopCount;
- }
-
- public void setMessageType(MessageType messageType) {
- this.messageType = messageType;
- }
-
- public void setNextServerAddress(InetAddress nextServerAddress) {
- this.nextServerAddress = nextServerAddress;
- }
-
- public void setOptions(OptionsField options) {
- this.options = options;
- }
-
- public void setRelayAgentAddress(InetAddress relayAgentAddress) {
- this.relayAgentAddress = relayAgentAddress;
- }
-
- public void setSeconds(int seconds) {
- this.seconds = seconds;
- }
-
- public void setServerHostname(String serverHostname) {
- this.serverHostname = serverHostname;
- }
-
- public void setTransactionId(int transactionId) {
- this.transactionId = transactionId;
- }
-
- public byte getOp() {
- return op;
- }
-
- public void setOp(byte op) {
- this.op = op;
- }
-
- public HardwareAddress getHardwareAddress() {
- return hardwareAddress;
- }
-
- public void setHardwareAddress(HardwareAddress hardwareAddress) {
- this.hardwareAddress = hardwareAddress;
- }
-
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(messageType).append(": hwAddress=").append(hardwareAddress)
- .append(", tx=").append(transactionId).append(", options=").append(
- options);
+ /**
+ * Flag value: request broadcast answer.
+ */
+ public static final int FLAG_BROADCAST = 0x01;
+
+ /**
+ * [yiaddr] 'your' (client) IP address.
+ */
+ private InetAddress assignedClientAddress;
+
+ /**
+ * [file] Boot file name, null terminated string; "generic" name or null in
+ * DHCPDISCOVER, fully qualified directory-path name in DHCPOFFER.
+ */
+ private String bootFileName;
+
+ /**
+ * [ciaddr] Current client IP address; only filled in if client is in BOUND,
+ * RENEW or REBINDING state and can respond to ARP requests.
+ */
+ private InetAddress currentClientAddress;
+
+ /**
+ * [flags] Flags. (LSB is broadcast flag)
+ */
+ private short flags;
+
+ /**
+ * [hops] Client sets to zero, optionally used by relay agents when booting
+ * via a relay agent.
+ */
+ private short hopCount;
+
+ /**
+ * [op] Message op code. 1 = BOOTREQUEST, 2 = BOOTREPLY, ...
+ */
+ private byte op;
+
+ /**
+ * Operation constant: boot request (client to server).
+ *
+ * @see #op
+ */
+ public static final byte OP_BOOTREQUEST = 1;
+
+ /**
+ * Operation constant: boot reply (server to client).
+ *
+ * @see #op
+ */
+ public static final byte OP_BOOTREPLY = 2;
+
+ /**
+ * [siaddr] IP address of next server to use in bootstrap; returned in
+ * DHCPOFFER, DHCPACK by server.
+ */
+ private InetAddress nextServerAddress;
+
+ /**
+ * [options] Optional parameters field. See the options documents for a list
+ * of defined options.
+ */
+ private OptionsField options = new OptionsField();
+
+ /**
+ * [giaddr] Relay agent IP address, used in booting via a relay agent.
+ */
+ private InetAddress relayAgentAddress;
+
+ /**
+ * [secs] Filled in by client, seconds elapsed since client began address
+ * acquisition or renewal process.
+ */
+ private int seconds;
+
+ /**
+ * [sname] Optional server host name, null terminated string.
+ */
+ private String serverHostname;
+
+ /**
+ * [xid] Transaction ID, a random number chosen by the client, used by the
+ * client and server to associate messages and responses between a client and
+ * a server.
+ */
+ private int transactionId;
+
+ /**
+ * The DHCP message type option.
+ */
+ private MessageType messageType;
+
+ private HardwareAddress hardwareAddress;
+
+ /**
+ * Create a default dhcp message.
+ */
+ public DhcpMessage() {
+
+ }
+
+ /**
+ * Create a DHCP message based on the supplied values.
+ *
+ * @param messageType
+ * @param op
+ * @param hardwareAddress
+ * @param hops
+ * @param transactionId
+ * @param seconds
+ * @param flags
+ * @param currentClientAddress
+ * @param assignedClientAddress
+ * @param nextServerAddress
+ * @param relayAgentAddress
+ * @param serverHostname
+ * @param bootFileName
+ * @param options
+ */
+ public DhcpMessage(MessageType messageType, byte op,
+ HardwareAddress hardwareAddress, short hops, int transactionId,
+ int seconds, short flags, InetAddress currentClientAddress,
+ InetAddress assignedClientAddress, InetAddress nextServerAddress,
+ InetAddress relayAgentAddress, String serverHostname,
+ String bootFileName, OptionsField options) {
+ this.messageType = messageType;
+ this.op = op;
+ this.hardwareAddress = hardwareAddress;
+ this.hopCount = hops;
+ this.transactionId = transactionId;
+ this.seconds = seconds;
+ this.flags = flags;
+ this.currentClientAddress = currentClientAddress;
+ this.assignedClientAddress = assignedClientAddress;
+ this.nextServerAddress = nextServerAddress;
+ this.relayAgentAddress = relayAgentAddress;
+ this.serverHostname = serverHostname;
+ this.bootFileName = bootFileName;
+ this.options = options;
+ }
+
+ public InetAddress getAssignedClientAddress() {
+ return assignedClientAddress;
+ }
+
+ public String getBootFileName() {
+ return bootFileName;
+ }
+
+ public InetAddress getCurrentClientAddress() {
+ return currentClientAddress;
+ }
+
+ public short getFlags() {
+ return flags;
+ }
+
+ public short getHopCount() {
+ return hopCount;
+ }
+
+ public MessageType getMessageType() {
+ return messageType;
+ }
+
+ public InetAddress getNextServerAddress() {
+ return nextServerAddress;
+ }
+
+ public OptionsField getOptions() {
+ return options;
+ }
+
+ public InetAddress getRelayAgentAddress() {
+ return relayAgentAddress;
+ }
+
+ public int getSeconds() {
+ return seconds;
+ }
+
+ public String getServerHostname() {
+ return serverHostname;
+ }
+
+ public int getTransactionId() {
+ return transactionId;
+ }
+
+ public void setAssignedClientAddress(InetAddress assignedClientAddress) {
+ this.assignedClientAddress = assignedClientAddress;
+ }
+
+ public void setBootFileName(String bootFileName) {
+ this.bootFileName = bootFileName;
+ }
+
+ public void setCurrentClientAddress(InetAddress currentClientAddress) {
+ this.currentClientAddress = currentClientAddress;
+ }
+
+ public void setFlags(short flags) {
+ this.flags = flags;
+ }
+
+ public void setHopCount(short hopCount) {
+ this.hopCount = hopCount;
+ }
+
+ public void setMessageType(MessageType messageType) {
+ this.messageType = messageType;
+ }
+
+ public void setNextServerAddress(InetAddress nextServerAddress) {
+ this.nextServerAddress = nextServerAddress;
+ }
+
+ public void setOptions(OptionsField options) {
+ this.options = options;
+ }
+
+ public void setRelayAgentAddress(InetAddress relayAgentAddress) {
+ this.relayAgentAddress = relayAgentAddress;
+ }
+
+ public void setSeconds(int seconds) {
+ this.seconds = seconds;
+ }
+
+ public void setServerHostname(String serverHostname) {
+ this.serverHostname = serverHostname;
+ }
+
+ public void setTransactionId(int transactionId) {
+ this.transactionId = transactionId;
+ }
+
+ public byte getOp() {
+ return op;
+ }
+
+ public void setOp(byte op) {
+ this.op = op;
+ }
+
+ public HardwareAddress getHardwareAddress() {
+ return hardwareAddress;
+ }
+
+ public void setHardwareAddress(HardwareAddress hardwareAddress) {
+ this.hardwareAddress = hardwareAddress;
+ }
+
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(messageType).append(": hwAddress=").append(hardwareAddress)
+ .append(", tx=").append(transactionId).append(", options=").append(
+ options);
- return sb.toString();
- }
+ return sb.toString();
+ }
}
Modified: directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java Sat Jun 7 00:48:16 2008
@@ -82,8 +82,9 @@
}
- /*
+ /**
* @see java.lang.Object#hashCode()
+ * @return the instance's hash code
*/
public int hashCode()
{
Modified: directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ByteOption.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ByteOption.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ByteOption.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ByteOption.java Sat Jun 7 00:48:16 2008
@@ -35,30 +35,30 @@
*
*/
public abstract class ByteOption extends DhcpOption {
- /**
- * The byte value (represented as a short because of the unsignedness).
- */
- private short byteValue;
+ /**
+ * The byte value (represented as a short because of the unsignedness).
+ */
+ private short byteValue;
- /*
- * @see org.apache.directory.server.dhcp.options.DhcpOption#setData(byte[])
- */
- public void setData(byte[] data) {
- byteValue = (short) (data[0] & 0xff);
- }
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#setData(byte[])
+ */
+ public void setData(byte[] data) {
+ byteValue = (short) (data[0] & 0xff);
+ }
- /*
- * @see org.apache.directory.server.dhcp.options.DhcpOption#getData()
- */
- public byte[] getData() {
- return new byte[]{(byte) (byteValue & 0xff)};
- }
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getData()
+ */
+ public byte[] getData() {
+ return new byte[]{(byte) (byteValue & 0xff)};
+ }
- public short getByteValue() {
- return byteValue;
- }
+ public short getByteValue() {
+ return byteValue;
+ }
- public void setShortValue(short shortValue) {
- this.byteValue = shortValue;
- }
+ public void setShortValue(short shortValue) {
+ this.byteValue = shortValue;
+ }
}
Modified: directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/IntOption.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/IntOption.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/IntOption.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/IntOption.java Sat Jun 7 00:48:16 2008
@@ -31,33 +31,33 @@
* @version $Rev: 551805 $, $Date: 2007-06-29 00:57:04 -0500 (Fr, 29 Jun 2007) $
*/
public abstract class IntOption extends DhcpOption {
- /**
- * The int value (represented as a long because of the unsignedness).
- */
- private long intValue;
+ /**
+ * The int value (represented as a long because of the unsignedness).
+ */
+ private long intValue;
- /*
- * @see org.apache.directory.server.dhcp.options.DhcpOption#setData(byte[])
- */
- public void setData(byte[] data) {
- intValue = (data[0] & 0xff) << 24 | (data[1] & 0xff) << 16
- | (data[2] & 0xff) << 8 | (data[3] & 0xff);
- }
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#setData(byte[])
+ */
+ public void setData(byte[] data) {
+ intValue = (data[0] & 0xff) << 24 | (data[1] & 0xff) << 16
+ | (data[2] & 0xff) << 8 | (data[3] & 0xff);
+ }
- /*
- * @see org.apache.directory.server.dhcp.options.DhcpOption#getData()
- */
- public byte[] getData() {
- return new byte[]{(byte) (intValue >> 24 & 0xff),
- (byte) (intValue >> 16 & 0xff), (byte) (intValue >> 8 & 0xff),
- (byte) (intValue & 0xff)};
- }
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getData()
+ */
+ public byte[] getData() {
+ return new byte[]{(byte) (intValue >> 24 & 0xff),
+ (byte) (intValue >> 16 & 0xff), (byte) (intValue >> 8 & 0xff),
+ (byte) (intValue & 0xff)};
+ }
- public long getIntValue() {
- return intValue;
- }
+ public long getIntValue() {
+ return intValue;
+ }
- public void setIntValue(long intValue) {
- this.intValue = intValue;
- }
+ public void setIntValue(long intValue) {
+ this.intValue = intValue;
+ }
}
Modified: directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ShortOption.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ShortOption.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ShortOption.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/ShortOption.java Sat Jun 7 00:48:16 2008
@@ -34,31 +34,31 @@
* @version $Rev: 551805 $, $Date: 2007-06-29 00:57:04 -0500 (Fr, 29 Jun 2007) $
*/
public abstract class ShortOption extends DhcpOption {
- /**
- * The short value (represented as an int because of the unsignedness).
- */
- private int shortValue;
+ /**
+ * The short value (represented as an int because of the unsignedness).
+ */
+ private int shortValue;
- /*
- * @see org.apache.directory.server.dhcp.options.DhcpOption#setData(byte[])
- */
- public void setData(byte[] data) {
- shortValue = (data[0] & 0xff) << 8 | (data[1] & 0xff);
- }
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#setData(byte[])
+ */
+ public void setData(byte[] data) {
+ shortValue = (data[0] & 0xff) << 8 | (data[1] & 0xff);
+ }
- /*
- * @see org.apache.directory.server.dhcp.options.DhcpOption#getData()
- */
- public byte[] getData() {
- return new byte[]{(byte) (shortValue >> 8 & 0xff),
- (byte) (shortValue & 0xff)};
- }
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getData()
+ */
+ public byte[] getData() {
+ return new byte[]{(byte) (shortValue >> 8 & 0xff),
+ (byte) (shortValue & 0xff)};
+ }
- public int getShortValue() {
- return shortValue;
- }
+ public int getShortValue() {
+ return shortValue;
+ }
- public void setShortValue(int shortValue) {
- this.shortValue = shortValue;
- }
+ public void setShortValue(int shortValue) {
+ this.shortValue = shortValue;
+ }
}
Modified: directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/UnrecognizedOption.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/UnrecognizedOption.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/UnrecognizedOption.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/options/dhcp/UnrecognizedOption.java Sat Jun 7 00:48:16 2008
@@ -30,20 +30,20 @@
* @version $Rev: 552077 $, $Date: 2007-06-29 21:23:39 -0500 (Fr, 29 Jun 2007) $
*/
public class UnrecognizedOption extends DhcpOption {
- private final byte tag;
+ private final byte tag;
- public UnrecognizedOption() {
- tag = -1;
- }
+ public UnrecognizedOption() {
+ tag = -1;
+ }
- /*
- * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
- */
- public byte getTag() {
- return tag;
- }
+ /*
+ * @see org.apache.directory.server.dhcp.options.DhcpOption#getTag()
+ */
+ public byte getTag() {
+ return tag;
+ }
- public UnrecognizedOption(byte tag) {
- this.tag = tag;
- }
+ public UnrecognizedOption(byte tag) {
+ this.tag = tag;
+ }
}
Modified: directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java?rev=664295&r1=664294&r2=664295&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java (original)
+++ directory/apacheds/branches/bigbang/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java Sat Jun 7 00:48:16 2008
@@ -43,132 +43,132 @@
* @version $Rev$, $Date$
*/
public class DhcpProtocolHandler implements IoHandler {
- private static final Logger logger = LoggerFactory
- .getLogger(DhcpProtocolHandler.class);
+ private static final Logger logger = LoggerFactory
+ .getLogger(DhcpProtocolHandler.class);
- /**
- * Default DHCP client port
- */
- public static final int CLIENT_PORT = 68;
-
- /**
- * Default DHCP server port
- */
- public static final int SERVER_PORT = 67;
-
- /**
- * The DHCP service implementation. The implementation is supposed to be
- * thread-safe.
- */
- private final DhcpService dhcpService;
-
- /**
- *
- */
- public DhcpProtocolHandler(DhcpService service) {
- this.dhcpService = service;
- }
-
- public void sessionCreated(IoSession session) throws Exception {
- logger.debug("{} CREATED", session.getLocalAddress());
- session.getFilterChain().addFirst("codec",
- new ProtocolCodecFilter(new DhcpProtocolCodecFactory()));
- }
-
- public void sessionOpened(IoSession session) {
- logger.debug("{} -> {} OPENED", session.getRemoteAddress(), session
- .getLocalAddress());
- }
-
- public void sessionClosed(IoSession session) {
- logger.debug("{} -> {} CLOSED", session.getRemoteAddress(), session
- .getLocalAddress());
- }
-
- public void sessionIdle(IoSession session, IdleStatus status) {
- // ignore
- }
-
- public void exceptionCaught(IoSession session, Throwable cause) {
- logger.error("EXCEPTION CAUGHT ", cause);
- cause.printStackTrace(System.out);
-
- session.close();
- }
-
- public void messageReceived(IoSession session, Object message)
- throws Exception {
- if (logger.isDebugEnabled())
- logger.debug("{} -> {} RCVD: {} " + message, session.getRemoteAddress(),
- session.getLocalAddress());
-
- final DhcpMessage request = (DhcpMessage) message;
-
- final DhcpMessage reply = dhcpService.getReplyFor(
- (InetSocketAddress) session.getServiceAddress(),
- (InetSocketAddress) session.getRemoteAddress(), request);
-
- if (null != reply) {
- final InetSocketAddress isa = determineMessageDestination(request, reply);
- ((BroadcastIoSession) session).write(reply, isa);
- }
- }
-
- /**
- * Determine where to send the message: <br>
- * If the 'giaddr' field in a DHCP message from a client is non-zero, the
- * server sends any return messages to the 'DHCP server' port on the BOOTP
- * relay agent whose address appears in 'giaddr'. If the 'giaddr' field is
- * zero and the 'ciaddr' field is nonzero, then the server unicasts DHCPOFFER
- * and DHCPACK messages to the address in 'ciaddr'. If 'giaddr' is zero and
- * 'ciaddr' is zero, and the broadcast bit is set, then the server broadcasts
- * DHCPOFFER and DHCPACK messages to 0xffffffff. If the broadcast bit is not
- * set and 'giaddr' is zero and 'ciaddr' is zero, then the server unicasts
- * DHCPOFFER and DHCPACK messages to the client's hardware address and
- * 'yiaddr' address. In all cases, when 'giaddr' is zero, the server
- * broadcasts any DHCPNAK messages to 0xffffffff.
- *
- * @param request
- * @param reply
- * @return
- */
- private InetSocketAddress determineMessageDestination(DhcpMessage request,
- DhcpMessage reply) {
-
- final MessageType mt = reply.getMessageType();
- if (!isNullAddress(request.getRelayAgentAddress()))
- // send to agent, if received via agent.
- return new InetSocketAddress(request.getRelayAgentAddress(), SERVER_PORT);
- else if (null != mt && mt == MessageType.DHCPNAK)
- // force broadcast for DHCPNAKs
- return new InetSocketAddress("255.255.255.255", 68);
- else // not a NAK...
- if (!isNullAddress(request.getCurrentClientAddress()))
- // have a current address? unicast to it.
- return new InetSocketAddress(request.getCurrentClientAddress(),
- CLIENT_PORT);
- else
- return new InetSocketAddress("255.255.255.255", 68);
- }
-
- /**
- * Determine, whether the given address ist actually the null address
- * "0.0.0.0".
- *
- * @param relayAgentAddress
- * @return
- */
- private boolean isNullAddress(InetAddress addr) {
- final byte a[] = addr.getAddress();
- for (int i = 0; i < a.length; i++)
- if (a[i] != 0)
- return false;
- return true;
- }
-
- public void messageSent(IoSession session, Object message) {
- if (logger.isDebugEnabled())
- logger.debug("{} -> {} SENT: " + message, session.getRemoteAddress(),
- session.getLocalAddress());
- }
+ /**
+ * Default DHCP client port
+ */
+ public static final int CLIENT_PORT = 68;
+
+ /**
+ * Default DHCP server port
+ */
+ public static final int SERVER_PORT = 67;
+
+ /**
+ * The DHCP service implementation. The implementation is supposed to be
+ * thread-safe.
+ */
+ private final DhcpService dhcpService;
+
+ /**
+ *
+ */
+ public DhcpProtocolHandler(DhcpService service) {
+ this.dhcpService = service;
+ }
+
+ public void sessionCreated(IoSession session) throws Exception {
+ logger.debug("{} CREATED", session.getLocalAddress());
+ session.getFilterChain().addFirst("codec",
+ new ProtocolCodecFilter(new DhcpProtocolCodecFactory()));
+ }
+
+ public void sessionOpened(IoSession session) {
+ logger.debug("{} -> {} OPENED", session.getRemoteAddress(), session
+ .getLocalAddress());
+ }
+
+ public void sessionClosed(IoSession session) {
+ logger.debug("{} -> {} CLOSED", session.getRemoteAddress(), session
+ .getLocalAddress());
+ }
+
+ public void sessionIdle(IoSession session, IdleStatus status) {
+ // ignore
+ }
+
+ public void exceptionCaught(IoSession session, Throwable cause) {
+ logger.error("EXCEPTION CAUGHT ", cause);
+ cause.printStackTrace(System.out);
+
+ session.close();
+ }
+
+ public void messageReceived(IoSession session, Object message)
+ throws Exception {
+ if (logger.isDebugEnabled())
+ logger.debug("{} -> {} RCVD: {} " + message, session.getRemoteAddress(),
+ session.getLocalAddress());
+
+ final DhcpMessage request = (DhcpMessage) message;
+
+ final DhcpMessage reply = dhcpService.getReplyFor(
+ (InetSocketAddress) session.getServiceAddress(),
+ (InetSocketAddress) session.getRemoteAddress(), request);
+
+ if (null != reply) {
+ final InetSocketAddress isa = determineMessageDestination(request, reply);
+ ((BroadcastIoSession) session).write(reply, isa);
+ }
+ }
+
+ /**
+ * Determine where to send the message: <br>
+ * If the 'giaddr' field in a DHCP message from a client is non-zero, the
+ * server sends any return messages to the 'DHCP server' port on the BOOTP
+ * relay agent whose address appears in 'giaddr'. If the 'giaddr' field is
+ * zero and the 'ciaddr' field is nonzero, then the server unicasts DHCPOFFER
+ * and DHCPACK messages to the address in 'ciaddr'. If 'giaddr' is zero and
+ * 'ciaddr' is zero, and the broadcast bit is set, then the server broadcasts
+ * DHCPOFFER and DHCPACK messages to 0xffffffff. If the broadcast bit is not
+ * set and 'giaddr' is zero and 'ciaddr' is zero, then the server unicasts
+ * DHCPOFFER and DHCPACK messages to the client's hardware address and
+ * 'yiaddr' address. In all cases, when 'giaddr' is zero, the server
+ * broadcasts any DHCPNAK messages to 0xffffffff.
+ *
+ * @param request
+ * @param reply
+ * @return
+ */
+ private InetSocketAddress determineMessageDestination(DhcpMessage request,
+ DhcpMessage reply) {
+
+ final MessageType mt = reply.getMessageType();
+ if (!isNullAddress(request.getRelayAgentAddress()))
+ // send to agent, if received via agent.
+ return new InetSocketAddress(request.getRelayAgentAddress(), SERVER_PORT);
+ else if (null != mt && mt == MessageType.DHCPNAK)
+ // force broadcast for DHCPNAKs
+ return new InetSocketAddress("255.255.255.255", 68);
+ else // not a NAK...
+ if (!isNullAddress(request.getCurrentClientAddress()))
+ // have a current address? unicast to it.
+ return new InetSocketAddress(request.getCurrentClientAddress(),
+ CLIENT_PORT);
+ else
+ return new InetSocketAddress("255.255.255.255", 68);
+ }
+
+ /**
+ * Determine, whether the given address ist actually the null address
+ * "0.0.0.0".
+ *
+ * @param relayAgentAddress
+ * @return
+ */
+ private boolean isNullAddress(InetAddress addr) {
+ final byte a[] = addr.getAddress();
+ for (int i = 0; i < a.length; i++)
+ if (a[i] != 0)
+ return false;
+ return true;
+ }
+
+ public void messageSent(IoSession session, Object message) {
+ if (logger.isDebugEnabled())
+ logger.debug("{} -> {} SENT: " + message, session.getRemoteAddress(),
+ session.getLocalAddress());
+ }
}