You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2013/05/24 14:55:07 UTC
svn commit: r1486041 [2/2] - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/api/
core-api/src/main/java/org/apache/directory/server/core/api/authn/ppolicy/
core-api/src/main/java/org/apache/directory/server/core/a...
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java Fri May 24 12:55:06 2013
@@ -114,8 +114,10 @@ public class DhcpProtocolHandler impleme
throws Exception
{
if ( logger.isDebugEnabled() )
+ {
logger.debug( "{} -> {} RCVD: {} " + message, session.getRemoteAddress(),
session.getLocalAddress() );
+ }
final DhcpMessage request = ( DhcpMessage ) message;
@@ -156,19 +158,31 @@ public class DhcpProtocolHandler impleme
{
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 );
+ {
+ // 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 );
+ }
+ }
}
@@ -182,9 +196,15 @@ public class DhcpProtocolHandler impleme
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;
}
@@ -192,7 +212,9 @@ public class DhcpProtocolHandler impleme
public void messageSent( IoSession session, Object message )
{
if ( logger.isDebugEnabled() )
+ {
logger.debug( "{} -> {} SENT: " + message, session.getRemoteAddress(),
session.getLocalAddress() );
+ }
}
}
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/AbstractDhcpService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/AbstractDhcpService.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/AbstractDhcpService.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/AbstractDhcpService.java Fri May 24 12:55:06 2013
@@ -57,14 +57,17 @@ public abstract class AbstractDhcpServic
throws DhcpException
{
// ignore messages with an op != REQUEST/REPLY
- if ( request.getOp() != DhcpMessage.OP_BOOTREQUEST
- && request.getOp() != DhcpMessage.OP_BOOTREPLY )
+ if ( ( request.getOp() != DhcpMessage.OP_BOOTREQUEST )
+ && ( request.getOp() != DhcpMessage.OP_BOOTREPLY ) )
+ {
return null;
+ }
// message type option MUST be set - we don't support plain BOOTP.
if ( null == request.getMessageType() )
{
logger.warn( "Missing message type option - plain BOOTP not supported." );
+
return null;
}
@@ -74,10 +77,13 @@ public abstract class AbstractDhcpServic
// client-to-server messages
case DHCPDISCOVER:
return handleDISCOVER( localAddress, clientAddress, request );
+
case DHCPREQUEST:
return handleREQUEST( localAddress, clientAddress, request );
+
case DHCPRELEASE:
return handleRELEASE( localAddress, clientAddress, request );
+
case DHCPINFORM:
return handleINFORM( localAddress, clientAddress, request );
@@ -109,8 +115,10 @@ public abstract class AbstractDhcpServic
DhcpMessage request )
{
if ( logger.isWarnEnabled() )
- logger.warn( "Got unknkown DHCP message: " + request + " from: "
- + clientAddress );
+ {
+ logger.warn( "Got unknkown DHCP message: {} from: {}", request, clientAddress );
+ }
+
return null;
}
@@ -129,8 +137,10 @@ public abstract class AbstractDhcpServic
throws DhcpException
{
if ( logger.isDebugEnabled() )
- logger.debug( "Got INFORM message: " + request + " from: "
- + clientAddress );
+ {
+ logger.debug( "Got INFORM message: {} from: {}", request, clientAddress );
+ }
+
return null;
}
@@ -149,8 +159,7 @@ public abstract class AbstractDhcpServic
throws DhcpException
{
if ( logger.isDebugEnabled() )
- logger.debug( "Got RELEASE message: " + request + " from: "
- + clientAddress );
+ logger.debug( "Got RELEASE message: {} from: {}", request, clientAddress );
return null;
}
@@ -169,8 +178,10 @@ public abstract class AbstractDhcpServic
throws DhcpException
{
if ( logger.isDebugEnabled() )
- logger.debug( "Got REQUEST message: " + request + " from: "
- + clientAddress );
+ {
+ logger.debug( "Got REQUEST message: {} from: {}", request, clientAddress );
+ }
+
return null;
}
@@ -190,8 +201,10 @@ public abstract class AbstractDhcpServic
throws DhcpException
{
if ( logger.isDebugEnabled() )
- logger.debug( "Got DISCOVER message: " + request + " from: "
- + clientAddress );
+ {
+ logger.debug( "Got DISCOVER message: {} from: {}", request, clientAddress );
+ }
+
return null;
}
@@ -211,8 +224,10 @@ public abstract class AbstractDhcpServic
throws DhcpException
{
if ( logger.isDebugEnabled() )
- logger
- .debug( "Got OFFER message: " + request + " from: " + clientAddress );
+ {
+ logger.debug( "Got OFFER message: {} from: {}", request, clientAddress );
+ }
+
return null;
}
@@ -236,7 +251,7 @@ public abstract class AbstractDhcpServic
protected final DhcpMessage initGeneralReply( InetSocketAddress localAddress,
DhcpMessage request )
{
- final DhcpMessage reply = new DhcpMessage();
+ DhcpMessage reply = new DhcpMessage();
reply.setOp( DhcpMessage.OP_BOOTREPLY );
@@ -264,8 +279,13 @@ public abstract class AbstractDhcpServic
private boolean isZeroAddress( byte[] addr )
{
for ( int i = 0; i < addr.length; i++ )
+ {
if ( addr[i] != 0 )
+ {
return false;
+ }
+ }
+
return true;
}
@@ -289,7 +309,9 @@ public abstract class AbstractDhcpServic
// if the relay agent address is set, we use it as the selection base
if ( !isZeroAddress( request.getRelayAgentAddress().getAddress() ) )
+ {
return request.getRelayAgentAddress();
+ }
return clientAddress.getAddress();
}
@@ -305,18 +327,32 @@ public abstract class AbstractDhcpServic
protected final void stripUnwantedOptions( DhcpMessage request,
OptionsField options )
{
- final ParameterRequestList prl = ( ParameterRequestList ) request
+ ParameterRequestList prl = ( ParameterRequestList ) request
.getOptions().get( ParameterRequestList.class );
+
if ( null != prl )
{
- final byte[] list = prl.getData();
- for ( final Iterator i = options.iterator(); i.hasNext(); )
+ byte[] list = prl.getData();
+
+ for ( Iterator i = options.iterator(); i.hasNext(); )
{
- final DhcpOption o = ( DhcpOption ) i.next();
+ DhcpOption o = ( DhcpOption ) i.next();
+
+ boolean found = false;
+
for ( int j = 0; j < list.length; j++ )
+ {
if ( list[j] == o.getTag() )
- continue;
- i.remove();
+ {
+ found = true;
+ break;
+ }
+ }
+
+ if ( !found )
+ {
+ i.remove();
+ }
}
}
}
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpService.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpService.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/DhcpService.java Fri May 24 12:55:06 2013
@@ -44,6 +44,6 @@ public interface DhcpService
* @return DhcpMessage
* @throws DhcpException
*/
- public DhcpMessage getReplyFor( InetSocketAddress localAddress, InetSocketAddress clientAddress, DhcpMessage request )
+ DhcpMessage getReplyFor( InetSocketAddress localAddress, InetSocketAddress clientAddress, DhcpMessage request )
throws DhcpException;
}
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/StoreBasedDhcpService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/StoreBasedDhcpService.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/StoreBasedDhcpService.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/service/StoreBasedDhcpService.java Fri May 24 12:55:06 2013
@@ -76,10 +76,16 @@ public class StoreBasedDhcpService exten
// try to get the lease (address) requested by the client
InetAddress requestedAddress = null;
AddressOption requestedAddressOption = ( AddressOption ) request.getOptions().get( RequestedIpAddress.class );
+
if ( null != requestedAddressOption )
+ {
requestedAddress = requestedAddressOption.getAddress();
+ }
+
if ( null == requestedAddress )
+ {
requestedAddress = request.getCurrentClientAddress();
+ }
InetAddress selectionBase = determineSelectionBase( clientAddress, request );
@@ -87,7 +93,9 @@ public class StoreBasedDhcpService exten
requestedLeaseTime, request.getOptions() );
if ( null == lease )
+ {
return null;
+ }
return lease;
}
@@ -130,8 +138,11 @@ public class StoreBasedDhcpService exten
// try to get the lease (address) requested by the client
InetAddress requestedAddress = null;
AddressOption requestedAddressOption = ( AddressOption ) request.getOptions().get( RequestedIpAddress.class );
+
if ( null != requestedAddressOption )
+ {
requestedAddress = requestedAddressOption.getAddress();
+ }
InetAddress selectionBase = determineSelectionBase( clientAddress, request );
@@ -152,8 +163,11 @@ public class StoreBasedDhcpService exten
{
// check server ident
AddressOption serverIdentOption = ( AddressOption ) request.getOptions().get( ServerIdentifier.class );
+
if ( null != serverIdentOption && serverIdentOption.getAddress().isAnyLocalAddress() )
+ {
return null; // not me?! FIXME: handle authoritative server case
+ }
Lease lease = getExistingLease( clientAddress, request );
@@ -193,6 +207,7 @@ public class StoreBasedDhcpService exten
stripUnwantedOptions( request, options );
}
+
return reply;
}
@@ -209,7 +224,9 @@ public class StoreBasedDhcpService exten
// null lease? don't offer one.
if ( null == lease )
+ {
return null;
+ }
DhcpMessage reply = initGeneralReply( localAddress, request );
@@ -247,8 +264,11 @@ public class StoreBasedDhcpService exten
{
// check server ident
AddressOption serverIdentOption = ( AddressOption ) request.getOptions().get( ServerIdentifier.class );
+
if ( null != serverIdentOption && serverIdentOption.getAddress().isAnyLocalAddress() )
+ {
return null; // not me?! FIXME: handle authoritative server case
+ }
Lease lease = getExistingLease( clientAddress, request );
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/AbstractDhcpStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/AbstractDhcpStore.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/AbstractDhcpStore.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/AbstractDhcpStore.java Fri May 24 12:55:06 2013
@@ -52,6 +52,7 @@ public abstract class AbstractDhcpStore
InetAddress selectionBase, long requestedLeaseTime, OptionsField options ) throws DhcpException
{
Subnet subnet = findSubnet( selectionBase );
+
if ( null == subnet )
{
logger.warn( "Don't know anything about the sbnet containing " + selectionBase );
@@ -61,11 +62,15 @@ public abstract class AbstractDhcpStore
// try to find existing lease
Lease lease = null;
lease = findExistingLease( hardwareAddress, lease );
+
if ( null != lease )
+ {
return lease;
+ }
Host host = null;
host = findDesignatedHost( hardwareAddress );
+
if ( null != host )
{
// make sure that the host is actually within the subnet. Depending
@@ -138,8 +143,11 @@ public abstract class AbstractDhcpStore
// hardware address, we send a NAK.
Lease lease = null;
lease = findExistingLease( hardwareAddress, lease );
+
if ( null == lease )
+ {
return null;
+ }
// check whether the notions of the client address match
if ( !lease.getClientAddress().equals( requestedAddress ) )
@@ -151,16 +159,19 @@ public abstract class AbstractDhcpStore
// check whether addresses and subnet match
Subnet subnet = findSubnet( selectionBase );
+
if ( null == subnet )
{
logger.warn( "No subnet found for existing lease " + lease );
return null;
}
+
if ( !subnet.contains( lease.getClientAddress() ) )
{
logger.warn( "Client with existing lease " + lease + " is on wrong subnet " + subnet );
return null;
}
+
if ( !subnet.isInRange( lease.getClientAddress() ) )
{
logger.warn( "Client with existing lease " + lease + " is out of valid range for subnet " + subnet );
@@ -232,11 +243,19 @@ public abstract class AbstractDhcpStore
// built-in default
long leaseTime = 1000L * 3600;
Integer propMaxLeaseTime = ( Integer ) properties.get( DhcpConfigElement.PROPERTY_MAX_LEASE_TIME );
+
if ( null != propMaxLeaseTime )
+ {
if ( requestedLeaseTime > 0 )
+ {
leaseTime = Math.min( propMaxLeaseTime.intValue() * 1000L, requestedLeaseTime );
+ }
else
+ {
leaseTime = propMaxLeaseTime.intValue() * 1000L;
+ }
+ }
+
return leaseTime;
}
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/SimpleDhcpStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/SimpleDhcpStore.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/SimpleDhcpStore.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/SimpleDhcpStore.java Fri May 24 12:55:06 2013
@@ -99,7 +99,10 @@ public class SimpleDhcpStore extends Abs
protected Lease findExistingLease( HardwareAddress hardwareAddress, Lease existingLease )
{
if ( leases.containsKey( hardwareAddress ) )
+ {
existingLease = ( Lease ) leases.get( hardwareAddress );
+ }
+
return existingLease;
}
@@ -169,9 +172,13 @@ public class SimpleDhcpStore extends Abs
for ( Iterator i = subnets.iterator(); i.hasNext(); )
{
Subnet subnet = ( Subnet ) i.next();
+
if ( subnet.contains( clientAddress ) )
+ {
return subnet;
+ }
}
+
return null;
}
Modified: directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/Subnet.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/Subnet.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/Subnet.java (original)
+++ directory/apacheds/trunk/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/Subnet.java Fri May 24 12:55:06 2013
@@ -52,10 +52,14 @@ public class Subnet extends DhcpConfigEl
// mask address to match subnet
byte masked[] = netmask.getAddress();
byte addrBytes[] = netmask.getAddress();
+
for ( int i = 0; i < addrBytes.length; i++ )
+ {
masked[i] &= addrBytes[i];
+ }
if ( !Arrays.equals( masked, addrBytes ) )
+ {
try
{
address = InetAddress.getByAddress( masked );
@@ -64,6 +68,7 @@ public class Subnet extends DhcpConfigEl
{
// ignore - doesn't happen.
}
+ }
this.address = address;
this.netmask = netmask;
@@ -119,12 +124,17 @@ public class Subnet extends DhcpConfigEl
{
// check address type
if ( !clientAddress.getClass().equals( address.getClass() ) )
+ {
return false;
+ }
byte client[] = clientAddress.getAddress();
byte masked[] = netmask.getAddress();
+
for ( int i = 0; i < masked.length; i++ )
+ {
masked[i] &= client[i];
+ }
return Arrays.equals( masked, address.getAddress() );
}
@@ -140,14 +150,21 @@ public class Subnet extends DhcpConfigEl
{
byte client[] = clientAddress.getAddress();
byte masked[] = netmask.getAddress();
+
for ( int i = 0; i < masked.length; i++ )
+ {
masked[i] &= client[i];
+ }
if ( null != rangeMin && arrayComp( masked, rangeMin.getAddress() ) < 0 )
+ {
return false;
+ }
if ( null != rangeMin && arrayComp( masked, rangeMax.getAddress() ) > 0 )
+ {
return false;
+ }
return true;
}
@@ -158,7 +175,9 @@ public class Subnet extends DhcpConfigEl
for ( int i = 0; i < a1.length && i < a2.length; i++ )
{
if ( a1[i] != a2[i] )
+ {
return ( a1[i] & 0xff ) - ( a2[i] & 0xff );
+ }
}
return a1.length - a2.length;
Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/decoder/RecordDecoder.java Fri May 24 12:55:06 2013
@@ -41,5 +41,5 @@ public interface RecordDecoder
* @return The map of attributes.
* @throws IOException
*/
- public Map<String, Object> decode( IoBuffer byteBuffer, short length ) throws IOException;
+ Map<String, Object> decode( IoBuffer byteBuffer, short length ) throws IOException;
}
Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/RecordEncoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/RecordEncoder.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/RecordEncoder.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/io/encoder/RecordEncoder.java Fri May 24 12:55:06 2013
@@ -39,5 +39,5 @@ public interface RecordEncoder
* @param record
* @throws IOException
*/
- public void put( IoBuffer buffer, ResourceRecord record ) throws IOException;
+ void put( IoBuffer buffer, ResourceRecord record ) throws IOException;
}
Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecord.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecord.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecord.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/messages/ResourceRecord.java Fri May 24 12:55:06 2013
@@ -29,30 +29,30 @@ public interface ResourceRecord
/**
* @return Returns the domainName.
*/
- public String getDomainName();
+ String getDomainName();
/**
* @return Returns the recordType.
*/
- public RecordType getRecordType();
+ RecordType getRecordType();
/**
* @return Returns the recordClass.
*/
- public RecordClass getRecordClass();
+ RecordClass getRecordClass();
/**
* @return Returns the timeToLive.
*/
- public int getTimeToLive();
+ int getTimeToLive();
/**
* @param id
* @return Returns the value for an id.
*/
- public String get( String id );
+ String get( String id );
}
Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java Fri May 24 12:55:06 2013
@@ -41,5 +41,5 @@ public interface RecordStore
* @return The set of {@link ResourceRecord}s.
* @throws DnsException
*/
- public Set<ResourceRecord> getRecords( QuestionRecord question ) throws DnsException;
+ Set<ResourceRecord> getRecords( QuestionRecord question ) throws DnsException;
}
Modified: directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java Fri May 24 12:55:06 2013
@@ -43,5 +43,5 @@ public interface DnsOperation
* @return Set<ResourceRecord> The result returned by the command
* @throws Exception The exception thrown by the command
*/
- public Set<ResourceRecord> execute( DirContext ctx, Name baseDn ) throws Exception;
+ Set<ResourceRecord> execute( DirContext ctx, Name baseDn ) throws Exception;
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolConstants.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolConstants.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolConstants.java Fri May 24 12:55:06 2013
@@ -40,7 +40,7 @@ public final class LdapProtocolConstants
{
}
- public final static Control[] EMPTY_CONTROLS = new Control[0];
- public final static String OUTSTANDING_KEY = "outstandingRequestsKey";
- public final static String CORE_SESSION_KEY = "coreSessionKey";
+ public static final Control[] EMPTY_CONTROLS = new Control[0];
+ public static final String OUTSTANDING_KEY = "outstandingRequestsKey";
+ public static final String CORE_SESSION_KEY = "coreSessionKey";
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/MechanismHandler.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/MechanismHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/sasl/MechanismHandler.java Fri May 24 12:55:06 2013
@@ -43,7 +43,7 @@ public interface MechanismHandler
* @return The {@link SaslServer} to use for the duration of the bound session.
* @throws Exception
*/
- public SaslServer handleMechanism( LdapSession session, BindRequest bindRequest ) throws Exception;
+ SaslServer handleMechanism( LdapSession session, BindRequest bindRequest ) throws Exception;
/**
@@ -51,7 +51,7 @@ public interface MechanismHandler
*
* @param ldapSession the Ldapsession instance
*/
- public void init( LdapSession ldapSession );
+ void init( LdapSession ldapSession );
/**
@@ -59,5 +59,5 @@ public interface MechanismHandler
*
* @param ldapSession the Ldapsession instance
*/
- public void cleanup( LdapSession ldapSession );
+ void cleanup( LdapSession ldapSession );
}
Modified: directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpService.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpService.java (original)
+++ directory/apacheds/trunk/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpService.java Fri May 24 12:55:06 2013
@@ -37,5 +37,5 @@ public interface NtpService
* @param request
* @return The {@link NtpMessage} reply.
*/
- public NtpMessage getReplyFor( NtpMessage request );
+ NtpMessage getReplyFor( NtpMessage request );
}
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java Fri May 24 12:55:06 2013
@@ -34,5 +34,5 @@ public interface Catalog
* @param name
* @return The base Dn for searches.
*/
- public String getBaseDn( String name );
+ String getBaseDn( String name );
}
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java Fri May 24 12:55:06 2013
@@ -39,5 +39,5 @@ public interface DirectoryServiceOperati
* @return Object The result returned by the command
* @throws Exception The exception thrown by the command
*/
- public Object execute( CoreSession session, Dn baseDn ) throws Exception;
+ Object execute( CoreSession session, Dn baseDn ) throws Exception;
}
Modified: directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java (original)
+++ directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java Fri May 24 12:55:06 2013
@@ -37,17 +37,17 @@ public final class ExitCodes
{
}
- public final static int CLASS_LOOKUP = 1;
- public final static int INSTANTIATION = 2;
- public final static int METHOD_LOOKUP = 3;
- public final static int INITIALIZATION = 4;
- public final static int START = 5;
- public final static int STOP = 6;
- public final static int PROPLOAD = 7;
- public final static int VERIFICATION = 8;
- public final static int DESTROY = 9;
- public final static int BAD_ARGUMENTS = 10;
- public final static int BAD_COMMAND = 11;
- public final static int UNKNOWN = 12;
- public final static int INVOCATION = 13;
+ public static final int CLASS_LOOKUP = 1;
+ public static final int INSTANTIATION = 2;
+ public static final int METHOD_LOOKUP = 3;
+ public static final int INITIALIZATION = 4;
+ public static final int START = 5;
+ public static final int STOP = 6;
+ public static final int PROPLOAD = 7;
+ public static final int VERIFICATION = 8;
+ public static final int DESTROY = 9;
+ public static final int BAD_ARGUMENTS = 10;
+ public static final int BAD_COMMAND = 11;
+ public static final int UNKNOWN = 12;
+ public static final int INVOCATION = 13;
}
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Fri May 24 12:55:06 2013
@@ -750,7 +750,7 @@ public abstract class AbstractBTreeParti
}
// Add the parentId in the entry
- entry.put( SchemaConstants.ENTRY_PARENT_ID_AT, parentId.toString() );
+ entry.put( SchemaConstants.ENTRY_PARENT_ID_AT, parentId );
lockWrite();
@@ -1663,7 +1663,7 @@ public abstract class AbstractBTreeParti
}
// Update the master table with the modified entry
- modifiedEntry.put( SchemaConstants.ENTRY_PARENT_ID_AT, newParentId.toString() );
+ modifiedEntry.put( SchemaConstants.ENTRY_PARENT_ID_AT, newParentId );
// Remove the EntryDN
modifiedEntry.removeAttributes( ENTRY_DN_AT );
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1486041&r1=1486040&r2=1486041&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Fri May 24 12:55:06 2013
@@ -89,7 +89,7 @@ public interface Store
* Partition (store with search capabilities) when it just needs a simple
* store and it's indices to conduct search operations.
*/
- public static final String[] SYS_INDEX_OID_ARRAY =
+ static final String[] SYS_INDEX_OID_ARRAY =
{
ApacheSchemaConstants.APACHE_PRESENCE_AT_OID,
ApacheSchemaConstants.APACHE_RDN_AT_OID,
@@ -101,7 +101,7 @@ public interface Store
SchemaConstants.ADMINISTRATIVE_ROLE_AT_OID
};
- public static final Set<String> SYS_INDEX_OIDS = Collections.unmodifiableSet( new HashSet<String>( Arrays
+ static final Set<String> SYS_INDEX_OIDS = Collections.unmodifiableSet( new HashSet<String>( Arrays
.asList( SYS_INDEX_OID_ARRAY ) ) );