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 2015/09/17 15:20:06 UTC
svn commit: r1703614 [1/2] - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/api/
core-integ/src/main/java/org/apache/directory/server/core/integ/
core-integ/src/test/java/org/apache/directory/server/core/api/ inte...
Author: elecharny
Date: Thu Sep 17 13:20:02 2015
New Revision: 1703614
URL: http://svn.apache.org/r1703614
Log:
o Added the loadSchemaRelaxed() method in LdapCoreSessionConnection
o Used InetAddress.getLocalHost().getHostName() instead of "localhost" or "127.0.0.1"
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java
directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java
directory/apacheds/trunk/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConfig.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java
directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredInfoDecoderTest.java
directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosKRBProtocolTest.java
directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTcpITest.java
directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java
directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosUdpITest.java
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LightweightLdapConnectionPoolTest.java
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ConcurrentSearchAndUnbindTest.java
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java
directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoderTest.java
directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoderTest.java
directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/AbstractTransport.java
directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
directory/apacheds/trunk/server-integ/src/test/java/MultiThreadedReadWriteTest.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/dsml/engine/Dsmlv2EngineIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddPerfIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/BindIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthOverSslIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/DelegatedAuthOverTlsIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/AddIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/BindIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/ldapsdk/CompareIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SortedSearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ppolicy/PasswordPolicyIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientInitialRefreshIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/StaleEventLogDetectionIT.java
directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/UberjarMain.java
directory/apacheds/trunk/service/src/test/java/org/apache/directory/server/UberJarMainTest.java
directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapConnectionPoolRule.java
directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestCreateLdapServerRule.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/LdapCoreSessionConnection.java Thu Sep 17 13:20:02 2015
@@ -470,6 +470,16 @@ public class LdapCoreSessionConnection e
/**
* {@inheritDoc}
*/
+ @Override
+ public void loadSchemaRelaxed() throws LdapException
+ {
+ // do nothing, cause we already have SchemaManager in the session's DirectoryService
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
public Entry lookup( Dn dn, String... attributes ) throws LdapException
{
return lookup( dn, null, attributes );
Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Thu Sep 17 13:20:02 2015
@@ -21,6 +21,7 @@ package org.apache.directory.server.core
import java.io.File;
import java.io.IOException;
+import java.net.InetAddress;
import java.util.ArrayList;
import java.util.List;
@@ -441,7 +442,7 @@ public class IntegrationUtils
*/
public static LdapConnection getAnonymousNetworkConnection( LdapServer ldapServer ) throws Exception
{
- LdapConnection connection = getAnonymousNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapConnection connection = getAnonymousNetworkConnection( InetAddress.getLocalHost().getHostName(), ldapServer.getPort() );
return connection;
}
@@ -474,7 +475,7 @@ public class IntegrationUtils
*/
public static LdapConnection getAdminNetworkConnection( LdapServer ldapServer ) throws Exception
{
- LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapConnection connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), ldapServer.getPort() );
connection.setTimeOut( 0 );
connection.bind( ServerDNConstants.ADMIN_SYSTEM_DN, "secret" );
@@ -498,7 +499,7 @@ public class IntegrationUtils
public static LdapConnection getNetworkConnectionAs( LdapServer ldapServer, String userDn, String password )
throws Exception
{
- return getNetworkConnectionAs( "localhost", ldapServer.getPort(), userDn, password );
+ return getNetworkConnectionAs( InetAddress.getLocalHost().getHostName(), ldapServer.getPort(), userDn, password );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/api/LdapCoreSessionConnectionTest.java Thu Sep 17 13:20:02 2015
@@ -22,6 +22,9 @@ package org.apache.directory.server.core
import static org.junit.Assert.assertNotNull;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicy;
@@ -105,7 +108,7 @@ public class LdapCoreSessionConnectionTe
LdapNetworkConnection connection = null;
try
{
- connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
BindRequest bindRequest = new BindRequestImpl();
bindRequest.setDn( new Dn( "cn=user,ou=system" ) );
@@ -118,6 +121,10 @@ public class LdapCoreSessionConnectionTe
PasswordPolicy passwordPolicy = ( ( PasswordPolicyDecorator ) responseControl ).getDecorated();
assertNotNull( passwordPolicy );
}
+ catch ( UnknownHostException uhe )
+ {
+ // Nothing we can do
+ }
finally
{
safeClose( connection );
Modified: directory/apacheds/trunk/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java (original)
+++ directory/apacheds/trunk/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java Thu Sep 17 13:20:02 2015
@@ -78,7 +78,7 @@ public class RelatedUserClassFilterTest
public static void init() throws Exception
{
schemaManager = new DefaultSchemaManager();
- SUBTREE_EVALUATOR = new SubtreeEvaluator( new DefaultSchemaManager( null ) );
+ SUBTREE_EVALUATOR = new SubtreeEvaluator( new DefaultSchemaManager() );
filter = new RelatedUserClassFilter( SUBTREE_EVALUATOR );
try
Modified: directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConfig.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConfig.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConfig.java (original)
+++ directory/apacheds/trunk/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConfig.java Thu Sep 17 13:20:02 2015
@@ -24,8 +24,9 @@ import static org.apache.directory.share
import static org.apache.directory.shared.kerberos.codec.types.EncryptionType.AES256_CTS_HMAC_SHA1_96;
import static org.apache.directory.shared.kerberos.codec.types.EncryptionType.DES3_CBC_SHA1_KD;
import static org.apache.directory.shared.kerberos.codec.types.EncryptionType.DES_CBC_MD5;
-import static org.apache.directory.shared.kerberos.codec.types.EncryptionType.RC4_HMAC;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@ import org.apache.directory.shared.kerbe
public class KdcConfig
{
/** host name of the Kerberos server */
- private String hostName = "localhost";
+ private String hostName;// = "localhost";
/** port on which the Kerberos server is listening */
private int kdcPort = 88;
@@ -77,6 +78,15 @@ public class KdcConfig
//encryptionTypes.add( RC4_HMAC_EXP );
encryptionTypes = KerberosUtils.orderEtypesByStrength( encryptionTypes );
+
+ try
+ {
+ hostName = InetAddress.getLocalHost().getHostName();
+ }
+ catch ( UnknownHostException uhe )
+ {
+ hostName = "localhost";
+ }
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java Thu Sep 17 13:20:02 2015
@@ -178,7 +178,7 @@ public class AdAndOr implements Asn1Obje
{
LOG.error( I18n.err( I18n.ERR_139, 1 + TLV.getNbBytes( adAndOrSeqLength )
+ adAndOrSeqLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java Thu Sep 17 13:20:02 2015
@@ -263,7 +263,7 @@ public class AdKdcIssued implements Asn1
{
LOG.error( I18n.err( I18n.ERR_139, 1 + TLV.getNbBytes( adKdcIssuedSeqLength )
+ adKdcIssuedSeqLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java Thu Sep 17 13:20:02 2015
@@ -166,7 +166,7 @@ public class AuthorizationData implement
{
LOG.error( I18n.err( I18n.ERR_139, 1 + TLV.getNbBytes( authorizationDataSeqSeqLen )
+ authorizationDataSeqSeqLen, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java Thu Sep 17 13:20:02 2015
@@ -261,7 +261,7 @@ public class Checksum implements Asn1Obj
{
log.error( I18n.err( I18n.ERR_140, 1 + TLV.getNbBytes( checksumLength ) + checksumLength,
buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java Thu Sep 17 13:20:02 2015
@@ -255,7 +255,7 @@ public class ETypeInfo implements Asn1Ob
{
LOG.error( I18n.err( I18n.ERR_144, 1 + TLV.getNbBytes( etypeInfoLength )
+ etypeInfoLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java Thu Sep 17 13:20:02 2015
@@ -255,7 +255,7 @@ public class ETypeInfo2 implements Asn1O
{
LOG.error( I18n.err( I18n.ERR_144, 1 + TLV.getNbBytes( etypeInfo2Length )
+ etypeInfo2Length, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java Thu Sep 17 13:20:02 2015
@@ -262,7 +262,7 @@ public class ETypeInfo2Entry implements
{
LOG.error( I18n.err( I18n.ERR_145, 1 + TLV.getNbBytes( etypeInfo2EntrySeqLength )
+ etypeInfo2EntrySeqLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java Thu Sep 17 13:20:02 2015
@@ -214,7 +214,7 @@ public class ETypeInfoEntry implements A
{
LOG.error( I18n.err( I18n.ERR_145, 1 + TLV.getNbBytes( etypeInfoEntrySeqLength )
+ etypeInfoEntrySeqLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java Thu Sep 17 13:20:02 2015
@@ -616,7 +616,7 @@ public class EncKdcRepPart implements As
{
log.error( I18n.err( I18n.ERR_140, 1 + TLV.getNbBytes( 0 ) + 0,
buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java Thu Sep 17 13:20:02 2015
@@ -259,7 +259,7 @@ public class EncKrbCredPart implements A
{
log.error( I18n.err( I18n.ERR_740_CANNOT_ENCODE_ENC_KRB_CRED_PART, 1 + TLV.getNbBytes( encKrbCredPartLen )
+ encKrbCredPartLen, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java Thu Sep 17 13:20:02 2015
@@ -354,7 +354,7 @@ public class EncKrbPrivPart implements A
{
log.error( I18n.err( I18n.ERR_735_CANNOT_ENCODE_KRBSAFEBODY, 1 + TLV.getNbBytes( encKrbPrivPartLen )
+ encKrbPrivPartLen, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java Thu Sep 17 13:20:02 2015
@@ -328,7 +328,7 @@ public class EncTicketPart implements As
{
log.error( I18n.err( I18n.ERR_742_CANNOT_ENCODE_ENC_TICKET_PART, 1 + TLV.getNbBytes( encTikcetPartLen )
+ encTikcetPartLen, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java Thu Sep 17 13:20:02 2015
@@ -304,7 +304,7 @@ public class EncryptedData implements As
{
log.error( I18n.err( I18n.ERR_141, 1 + TLV.getNbBytes( encryptedDataSeqLength )
+ encryptedDataSeqLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java Thu Sep 17 13:20:02 2015
@@ -309,7 +309,7 @@ public class EncryptionKey implements As
{
log.error( I18n.err( I18n.ERR_142, 1 + TLV.getNbBytes( encryptionKeyLength )
+ encryptionKeyLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java Thu Sep 17 13:20:02 2015
@@ -294,7 +294,7 @@ public class HostAddress implements Asn1
{
LOG.error( I18n.err( I18n.ERR_143, 1 + TLV.getNbBytes( hostAddressLength )
+ hostAddressLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java Thu Sep 17 13:20:02 2015
@@ -258,7 +258,7 @@ public class HostAddresses implements As
{
LOG.error( I18n.err( I18n.ERR_144, 1 + TLV.getNbBytes( addressesLength )
+ addressesLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java Thu Sep 17 13:20:02 2015
@@ -368,7 +368,7 @@ public class KrbCredInfo implements Asn1
{
log.error( I18n.err( I18n.ERR_739_CANNOT_ENCODE_KRB_CRED_INFO, 1 + TLV.getNbBytes( krbKredInfoSeqLen )
+ krbKredInfoSeqLen, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java Thu Sep 17 13:20:02 2015
@@ -351,7 +351,7 @@ public class KrbSafeBody implements Asn1
{
log.error( I18n.err( I18n.ERR_735_CANNOT_ENCODE_KRBSAFEBODY, 1 + TLV.getNbBytes( krbSafeBodySeqLen )
+ krbSafeBodySeqLen, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java Thu Sep 17 13:20:02 2015
@@ -256,7 +256,7 @@ public class LastReq implements Asn1Obje
{
LOG.error( I18n.err( I18n.ERR_139, 1 + TLV.getNbBytes( lastReqSeqSeqLen )
+ lastReqSeqSeqLen, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ) , boe);
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java Thu Sep 17 13:20:02 2015
@@ -236,7 +236,7 @@ public class MethodData implements Asn1O
{
LOG.error( I18n.err( I18n.ERR_144, 1 + TLV.getNbBytes( methodDataLength )
+ methodDataLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java Thu Sep 17 13:20:02 2015
@@ -232,7 +232,7 @@ public class PaData implements Asn1Objec
{
log.error( I18n.err( I18n.ERR_145, 1 + TLV.getNbBytes( preAuthenticationDataSeqLength )
+ preAuthenticationDataSeqLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java Thu Sep 17 13:20:02 2015
@@ -217,7 +217,7 @@ public class PaEncTsEnc implements Asn1O
{
log.error( I18n.err( I18n.ERR_140, 1 + TLV.getNbBytes( paEncTsEncLength ) + paEncTsEncLength,
buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java Thu Sep 17 13:20:02 2015
@@ -486,7 +486,7 @@ public class PrincipalName implements As
{
LOG.error( I18n.err( I18n.ERR_146, 1 + TLV.getNbBytes( principalNameSeqLength )
+ principalNameSeqLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java Thu Sep 17 13:20:02 2015
@@ -216,7 +216,7 @@ public class TransitedEncoding implement
{
log.error( I18n.err( I18n.ERR_147, 1 + TLV.getNbBytes( transitedEncodingLength )
+ transitedEncodingLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java Thu Sep 17 13:20:02 2015
@@ -248,7 +248,7 @@ public class TypedData implements Asn1Ob
{
LOG.error( I18n.err( I18n.ERR_743_CANNOT_ENCODE_TYPED_DATA, 1 + TLV.getNbBytes( typedDataSeqSeqLength )
+ typedDataSeqSeqLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java Thu Sep 17 13:20:02 2015
@@ -196,7 +196,7 @@ public class ApRep extends KerberosMessa
{
LOG.error( I18n.err( I18n.ERR_137, 1 + TLV.getNbBytes( apRepLength ) + apRepLength,
buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java Thu Sep 17 13:20:02 2015
@@ -317,7 +317,7 @@ public class ApReq extends KerberosMessa
{
LOG.error( I18n.err( I18n.ERR_137, 1 + TLV.getNbBytes( apReqLength ) + apReqLength,
buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java Thu Sep 17 13:20:02 2015
@@ -521,7 +521,7 @@ public class Authenticator extends Kerbe
{
LOG.error( I18n.err( I18n.ERR_139, 1 + TLV.getNbBytes( 0 )
+ 0, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java Thu Sep 17 13:20:02 2015
@@ -298,7 +298,7 @@ public class EncApRepPart extends Kerber
{
LOG.error( I18n.err( I18n.ERR_139, 1 + TLV.getNbBytes( encApRepPartLength )
+ encApRepPartLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java Thu Sep 17 13:20:02 2015
@@ -185,7 +185,7 @@ public class KrbCred extends KerberosMes
{
log.error( I18n.err( I18n.ERR_741_CANNOT_ENCODE_KRB_CRED, 1 + TLV.getNbBytes( krbCredLen )
+ krbCredLen, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java Thu Sep 17 13:20:02 2015
@@ -642,7 +642,7 @@ public class KrbError extends KerberosMe
{
log.error( I18n.err( I18n.ERR_734_CANNOT_ENCODE_KRBERROR, 1 + TLV.getNbBytes( krbErrorLength )
+ krbErrorLength, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java Thu Sep 17 13:20:02 2015
@@ -173,7 +173,7 @@ public class KrbPriv extends KerberosMes
{
log.error( I18n.err( I18n.ERR_738_CANNOT_ENCODE_KRB_PRIV, 1 + TLV.getNbBytes( krbPrivLen )
+ krbPrivLen, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java Thu Sep 17 13:20:02 2015
@@ -211,7 +211,7 @@ public class KrbSafe extends KerberosMes
{
log.error( I18n.err( I18n.ERR_736_CANNOT_ENCODE_KRBSAFE, 1 + TLV.getNbBytes( krbSafeLen )
+ krbSafeLen, buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java Thu Sep 17 13:20:02 2015
@@ -337,7 +337,7 @@ public class Ticket extends KerberosMess
{
LOG.error( I18n.err( I18n.ERR_137, 1 + TLV.getNbBytes( ticketLength ) + ticketLength,
buffer.capacity() ) );
- throw new EncoderException( I18n.err( I18n.ERR_138 ) );
+ throw new EncoderException( I18n.err( I18n.ERR_138 ), boe );
}
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java Thu Sep 17 13:20:02 2015
@@ -22,12 +22,14 @@ package org.apache.directory.server.kerb
import static org.junit.Assert.assertEquals;
+import java.net.InetAddress;
import java.util.List;
import javax.security.auth.kerberos.KerberosPrincipal;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,11 +46,11 @@ import org.apache.directory.shared.kerbe
public class KerberosUtilsTest
{
@BeforeClass
- public static void setUp()
+ public static void setUp() throws Exception
{
// First setup a default realm
System.setProperty( "java.security.krb5.realm", "APACHE.ORG" );
- System.setProperty( "java.security.krb5.kdc", "localhost" );
+ System.setProperty( "java.security.krb5.kdc", InetAddress.getLocalHost().getHostName() );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncKrbCredPartDecoderTest.java Thu Sep 17 13:20:02 2015
@@ -108,10 +108,10 @@ public class EncKrbCredPartDecoderTest
usec = 1;
optionalFieldValueList.add( new FieldValueHolder( "usec", usec ) );
- senderAddress = new HostAddress( InetAddress.getByName( "localhost" ) );
+ senderAddress = new HostAddress( InetAddress.getLocalHost() );
optionalFieldValueList.add( new FieldValueHolder( "senderAddress", senderAddress ) );
- recipientAddress = new HostAddress( InetAddress.getByName( "localhost" ) );
+ recipientAddress = new HostAddress( InetAddress.getLocalHost() );
optionalFieldValueList.add( new FieldValueHolder( "recipientAddress", recipientAddress ) );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTicketPartDecoderTest.java Thu Sep 17 13:20:02 2015
@@ -89,7 +89,7 @@ public class EncTicketPartDecoderTest
KerberosTime renewtill = new KerberosTime( time );
HostAddresses caddr = new HostAddresses( new HostAddress[]
- { new HostAddress( InetAddress.getByName( "localhost" ) ) } );
+ { new HostAddress( InetAddress.getLocalHost() ) } );
AuthorizationData authzData = new AuthorizationData();
authzData.createNewAD();
Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredInfoDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredInfoDecoderTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredInfoDecoderTest.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KrbCredInfoDecoderTest.java Thu Sep 17 13:20:02 2015
@@ -133,7 +133,7 @@ public class KrbCredInfoDecoderTest
optionalFieldValueList.add( new FieldValueHolder( "sName", sName ) );
clientAddresses = new HostAddresses( new HostAddress[]
- { new HostAddress( InetAddress.getByName( "localhost" ) ) } );
+ { new HostAddress( InetAddress.getLocalHost() ) } );
optionalFieldValueList.add( new FieldValueHolder( "clientAddresses", clientAddresses ) );
}
Modified: directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosKRBProtocolTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosKRBProtocolTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosKRBProtocolTest.java (original)
+++ directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosKRBProtocolTest.java Thu Sep 17 13:20:02 2015
@@ -61,7 +61,7 @@ import org.junit.runner.RunWith;
@CreateKdcServer(
transports =
{
- @CreateTransport(protocol = "KRB", address = "127.0.0.1")
+ @CreateTransport(protocol = "KRB", address = "localhost")
})
@ApplyLdifFiles("org/apache/directory/server/kerberos/kdc/KerberosIT.ldif")
public class KerberosKRBProtocolTest extends AbstractKerberosITest
Modified: directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTcpITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTcpITest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTcpITest.java (original)
+++ directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTcpITest.java Thu Sep 17 13:20:02 2015
@@ -69,7 +69,7 @@ Project</a>
@CreateKdcServer(
transports =
{
- @CreateTransport(protocol = "TCP", address = "127.0.0.1", port = 6086)
+ @CreateTransport(protocol = "TCP", address = "localhost", port = 6086)
})
@ApplyLdifFiles("org/apache/directory/server/kerberos/kdc/KerberosIT.ldif")
public class KerberosTcpITest extends AbstractKerberosITest
Modified: directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java (original)
+++ directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosTestUtils.java Thu Sep 17 13:20:02 2015
@@ -256,7 +256,7 @@ public class KerberosTestUtils
String hostName;
try
{
- InetAddress loopback = InetAddress.getByName( "127.0.0.1" );
+ InetAddress loopback = InetAddress.getLocalHost();
hostName = loopback.getHostName();
}
catch ( UnknownHostException e )
Modified: directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosUdpITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosUdpITest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosUdpITest.java (original)
+++ directory/apacheds/trunk/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/KerberosUdpITest.java Thu Sep 17 13:20:02 2015
@@ -68,8 +68,8 @@ import org.junit.runner.RunWith;
@CreateKdcServer(
transports =
{
- @CreateTransport(protocol = "TCP", address = "127.0.0.1", port = 6087),
- @CreateTransport(protocol = "UDP", address = "127.0.0.1", port = 6087)
+ @CreateTransport(protocol = "TCP", address = "localhost", port = 6087),
+ @CreateTransport(protocol = "UDP", address = "localhost", port = 6087)
})
@ApplyLdifFiles("org/apache/directory/server/kerberos/kdc/KerberosIT.ldif")
public class KerberosUdpITest extends AbstractKerberosITest
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Thu Sep 17 13:20:02 2015
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.net.InetAddress;
import java.util.HashMap;
import java.util.List;
@@ -97,7 +98,7 @@ public class LdapConnectionTest extends
@Test
public void testBindRequest() throws Exception
{
- LdapConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ LdapConnection connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
try
{
connection.bind( ADMIN_DN, "secret" );
@@ -226,7 +227,7 @@ public void testLookup() throws Exceptio
{
// test with a local connection using a local BinaryAttributeDetector
LdapConnectionConfig config = new LdapConnectionConfig();
- config.setLdapHost( "localhost" );
+ config.setLdapHost( InetAddress.getLocalHost().getHostName() );
config.setLdapPort( ldapServer.getPort() );
config.setName( ServerDNConstants.ADMIN_SYSTEM_DN );
config.setCredentials( "secret" );
@@ -299,7 +300,7 @@ public void testLookup() throws Exceptio
public void testAnonBind() throws Exception
{
getLdapServer().getDirectoryService().setAllowAnonymousAccess( true );
- LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ LdapNetworkConnection connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
connection.bind();
assertTrue( connection.isAuthenticated() );
@@ -315,7 +316,7 @@ public void testLookup() throws Exceptio
public void testNoSchemaConnectionWithBinaryDetector() throws Exception
{
LdapConnectionConfig config = new LdapConnectionConfig();
- config.setLdapHost( "localhost" );
+ config.setLdapHost( InetAddress.getLocalHost().getHostName() );
config.setLdapPort( ldapServer.getPort() );
config.setBinaryAttributeDetector( new DefaultConfigurableBinaryAttributeDetector() );
@@ -344,7 +345,7 @@ public void testLookup() throws Exceptio
@Test(expected = InvalidConnectionException.class)
public void testConnectionWrongPort() throws LdapException, IOException
{
- LdapConnection connection = new LdapNetworkConnection( "localhost", 123 );
+ LdapConnection connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), 123 );
connection.connect();
connection.close();
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Thu Sep 17 13:20:02 2015
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.net.InetAddress;
import java.util.List;
import org.apache.directory.api.ldap.codec.api.SchemaBinaryAttributeDetector;
@@ -220,7 +221,7 @@ public class LdapSSLConnectionTest exten
public void testStallingSsl() throws Exception
{
LdapConnectionConfig sslConfig = new LdapConnectionConfig();
- sslConfig.setLdapHost( "localhost" );
+ sslConfig.setLdapHost( InetAddress.getLocalHost().getHostName() );
sslConfig.setUseSsl( true );
sslConfig.setLdapPort( getLdapServer().getPortSSL() );
//sslConfig.setTrustManagers( new NoVerificationTrustManager() );
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LightweightLdapConnectionPoolTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LightweightLdapConnectionPoolTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LightweightLdapConnectionPoolTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LightweightLdapConnectionPoolTest.java Thu Sep 17 13:20:02 2015
@@ -23,6 +23,8 @@ package org.apache.directory.shared.clie
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -54,7 +56,7 @@ import org.junit.runner.RunWith;
*/
@RunWith(FrameworkRunner.class)
@CreateLdapServer(transports =
- { @CreateTransport(protocol = "LDAP", address = "127.0.0.1", port = 10389) })
+ { @CreateTransport(protocol = "LDAP", address = "localhost", port = 10389) })
public class LightweightLdapConnectionPoolTest extends AbstractLdapTestUnit
{
/** The connection pool */
@@ -154,7 +156,16 @@ public class LightweightLdapConnectionPo
{
int i = 0;
LdapConnectionConfig config = new LdapConnectionConfig();
- config.setLdapHost( "127.0.0.1" );
+
+ try
+ {
+ config.setLdapHost( InetAddress.getLocalHost().getHostName() );
+ }
+ catch ( UnknownHostException e1 )
+ {
+ e1.printStackTrace();
+ }
+
config.setLdapPort( 10389 );
config.setName( DEFAULT_ADMIN );
config.setCredentials( DEFAULT_PASSWORD );
@@ -212,7 +223,7 @@ public class LightweightLdapConnectionPo
int port = getLdapServer().getPort();
LdapConnectionConfig config = new LdapConnectionConfig();
- config.setLdapHost( "127.0.0.1" );
+ config.setLdapHost( InetAddress.getLocalHost().getHostName() );
config.setLdapPort( port );
config.setName( DEFAULT_ADMIN );
config.setCredentials( DEFAULT_PASSWORD );
@@ -245,7 +256,7 @@ public class LightweightLdapConnectionPo
int port = getLdapServer().getPort();
LdapConnectionConfig config = new LdapConnectionConfig();
- config.setLdapHost( "127.0.0.1" );
+ config.setLdapHost( InetAddress.getLocalHost().getHostName() );
config.setLdapPort( port );
config.setName( DEFAULT_ADMIN );
config.setCredentials( DEFAULT_PASSWORD );
@@ -296,7 +307,7 @@ public class LightweightLdapConnectionPo
int port = getLdapServer().getPort();
LdapConnectionConfig config = new LdapConnectionConfig();
- config.setLdapHost( "127.0.0.1" );
+ config.setLdapHost( InetAddress.getLocalHost().getHostName() );
config.setLdapPort( port );
config.setName( DEFAULT_ADMIN );
config.setCredentials( DEFAULT_PASSWORD );
@@ -520,7 +531,7 @@ public class LightweightLdapConnectionPo
public void testSmallPool() throws Exception
{
LdapConnectionConfig config = new LdapConnectionConfig();
- config.setLdapHost( "localHost" );
+ config.setLdapHost( InetAddress.getLocalHost().getHostName() );
config.setLdapPort( getLdapServer().getPort() );
config.setName( DEFAULT_ADMIN );
config.setCredentials( DEFAULT_PASSWORD );
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Thu Sep 17 13:20:02 2015
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.net.InetAddress;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -221,7 +222,7 @@ public void testModifyEntryUUIDAndEntryC
modResp = connection.modify( modifyRequest );
assertEquals( ResultCodeEnum.SUCCESS, modResp.getLdapResult().getResultCode() );
- LdapNetworkConnection nonAdminConnection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ LdapNetworkConnection nonAdminConnection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
Dn bindDn = new Dn( "uid=billyd,ou=users,ou=system" );
nonAdminConnection.bind( bindDn.getName(), "secret" );
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ConcurrentSearchAndUnbindTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ConcurrentSearchAndUnbindTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ConcurrentSearchAndUnbindTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ConcurrentSearchAndUnbindTest.java Thu Sep 17 13:20:02 2015
@@ -24,6 +24,7 @@ package org.apache.directory.shared.clie
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import java.net.InetAddress;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -64,7 +65,7 @@ public class ConcurrentSearchAndUnbindTe
@Ignore
public void testConcurrentSearchAndUnbind() throws Exception
{
- final LdapConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ final LdapConnection connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
ExecutorService pool = Executors.newFixedThreadPool( 2 );
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Thu Sep 17 13:20:02 2015
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.net.InetAddress;
import java.util.concurrent.TimeUnit;
import org.apache.directory.api.ldap.model.cursor.EntryCursor;
@@ -104,7 +105,7 @@ public class SimpleBindRequestTest exten
@Before
public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
connection.setTimeOut( 0L );
}
@@ -259,7 +260,7 @@ public class SimpleBindRequestTest exten
getLdapServer().getDirectoryService().setAllowAnonymousAccess( true );
//System.out.println( "------------------Create connection" + i + "-------------" );
- LdapConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ LdapConnection connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
//System.out.println( "------------------Bind" + i + "-------------" );
// Try with no parameters
@@ -273,7 +274,7 @@ public class SimpleBindRequestTest exten
connection.close();
// Try with empty strings
- connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
connection.bind( "", "" );
assertTrue( connection.isAuthenticated() );
@@ -283,7 +284,7 @@ public class SimpleBindRequestTest exten
connection.close();
// Try with null parameters
- connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
connection.bind( ( String ) null, ( String ) null );
assertTrue( connection.isAuthenticated() );
@@ -293,7 +294,7 @@ public class SimpleBindRequestTest exten
assertFalse( connection.isConnected() );
connection.close();
- connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
//System.out.println( "----------------Unbind done" + i + "-------------" );
assertFalse( connection.isConnected() );
@@ -310,7 +311,7 @@ public class SimpleBindRequestTest exten
public void testDIRAPI47() throws Exception
{
LdapConnectionConfig config = new LdapConnectionConfig();
- config.setLdapHost( "localhost" );
+ config.setLdapHost( InetAddress.getLocalHost().getHostName() );
config.setLdapPort( getLdapServer().getPort() );
config.setName( "uid=nonexisting,dc=example,dc=com" );
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java Thu Sep 17 13:20:02 2015
@@ -20,6 +20,7 @@
package org.apache.directory.shared.client.api.perf;
+import java.net.InetAddress;
import java.util.Hashtable;
import javax.naming.Context;
@@ -87,7 +88,7 @@ public class TestClientApiPerf extends A
long t1 = System.currentTimeMillis();
// Create connection
- LdapConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ LdapConnection connection = new LdapNetworkConnection( InetAddress.getLocalHost().getHostName(), getLdapServer().getPort() );
connection.bind( "uid=admin,ou=system", "secret" );
long t2 = System.currentTimeMillis();
Modified: directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoderTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoderTest.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/decoder/AddressRecordDecoderTest.java Thu Sep 17 13:20:02 2015
@@ -49,7 +49,7 @@ public class AddressRecordDecoderTest
@Before
public void setUp() throws Exception
{
- address = InetAddress.getByName( "127.0.0.1" );
+ address = InetAddress.getLocalHost();
inputBuffer = IoBuffer.allocate( address.getAddress().length );
inputBuffer.put( address.getAddress() );
inputBuffer.flip();
Modified: directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoderTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoderTest.java (original)
+++ directory/apacheds/trunk/protocol-dns/src/test/java/org/apache/directory/server/dns/io/encoder/AddressRecordEncoderTest.java Thu Sep 17 13:20:02 2015
@@ -45,7 +45,7 @@ public class AddressRecordEncoderTest ex
{
try
{
- address = InetAddress.getByName( "127.0.0.1" );
+ address = InetAddress.getLocalHost();
}
catch ( UnknownHostException e )
{
Modified: directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java (original)
+++ directory/apacheds/trunk/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java Thu Sep 17 13:20:02 2015
@@ -345,7 +345,7 @@ public class TicketGrantingPolicyTest ex
kdcReqBody.setTill( requestedEndTime );
HostAddress[] address =
- { new HostAddress( InetAddress.getByName( "127.0.0.1" ) ) };
+ { new HostAddress( InetAddress.getLocalHost() ) };
HostAddresses addresses = new HostAddresses( address );
kdcReqBody.setAddresses( addresses );
Modified: directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/AbstractTransport.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/AbstractTransport.java?rev=1703614&r1=1703613&r2=1703614&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/AbstractTransport.java (original)
+++ directory/apacheds/trunk/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/transport/AbstractTransport.java Thu Sep 17 13:20:02 2015
@@ -19,6 +19,9 @@
package org.apache.directory.server.protocol.shared.transport;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
import org.apache.mina.core.service.IoAcceptor;
@@ -72,7 +75,15 @@ public abstract class AbstractTransport
*/
public AbstractTransport( int port )
{
- this.address = "localhost";
+ try
+ {
+ this.address = InetAddress.getLocalHost().getHostAddress();
+ }
+ catch ( UnknownHostException e )
+ {
+ this.address = "localhost";
+ }
+
this.port = port;
}
@@ -86,7 +97,15 @@ public abstract class AbstractTransport
*/
public AbstractTransport( int port, int nbThreads )
{
- this.address = "localhost";
+ try
+ {
+ this.address = InetAddress.getLocalHost().getHostAddress();
+ }
+ catch ( UnknownHostException e )
+ {
+ this.address = "localhost";
+ }
+
this.port = port;
this.nbThreads = nbThreads;
}