[maven-release-plugin] copy for tag 2.0.0-M16
git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/tags/2.0.0-M16@1575878 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
index 6b6a4cf..7a5fb70 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
@@ -30,6 +30,7 @@
import javax.security.auth.kerberos.KerberosPrincipal;
import org.apache.directory.api.asn1.EncoderException;
+import org.apache.directory.api.ldap.model.constants.Loggers;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.kerberos.KerberosConfig;
import org.apache.directory.server.kerberos.kdc.KdcContext;
@@ -83,7 +84,7 @@
{
/** the log for this class */
- private static final Logger LOG = LoggerFactory.getLogger( TicketGrantingService.class );
+ private static final Logger LOG_KRB = LoggerFactory.getLogger( Loggers.KERBEROS_LOG.getName() );
private static final CipherTextHandler cipherTextHandler = new CipherTextHandler();
@@ -94,7 +95,7 @@
public static void execute( TicketGrantingContext tgsContext ) throws Exception
{
- if ( LOG.isDebugEnabled() )
+ if ( LOG_KRB.isDebugEnabled() )
{
monitorRequest( tgsContext );
}
@@ -150,12 +151,12 @@
sb.append( "\n\t" + "renew-till time: " + request.getKdcReqBody().getRTime() );
sb.append( "\n\t" + "hostAddresses: " + request.getKdcReqBody().getAddresses() );
- LOG.debug( sb.toString() );
+ LOG_KRB.debug( sb.toString() );
}
catch ( Exception e )
{
// This is a monitor. No exceptions should bubble up.
- LOG.error( I18n.err( I18n.ERR_153 ), e );
+ LOG_KRB.error( I18n.err( I18n.ERR_153 ), e );
}
}
@@ -169,7 +170,7 @@
EncryptionType bestType = KerberosUtils.getBestEncryptionType( requestedTypes, config.getEncryptionTypes() );
- LOG.debug( "Session will use encryption type {}.", bestType );
+ LOG_KRB.debug( "Session will use encryption type {}.", bestType );
if ( bestType == null )
{
@@ -320,7 +321,7 @@
throw new KerberosException( ErrorType.KRB_AP_ERR_INAPP_CKSUM );
}
- LOG.debug( "Verifying body checksum type '{}'.", authenticatorChecksum.getChecksumType() );
+ LOG_KRB.debug( "Verifying body checksum type '{}'.", authenticatorChecksum.getChecksumType() );
checksumHandler.verifyChecksum( authenticatorChecksum, bodyBytes, sessionKey.getKeyValue(),
KeyUsage.TGS_REQ_PA_TGS_REQ_PADATA_AP_REQ_AUTHNT_CKSUM_TGS_SESS_KEY );
@@ -460,7 +461,7 @@
encKdcRepPart.setRenewTill( newTicket.getEncTicketPart().getRenewTill() );
}
- if ( LOG.isDebugEnabled() )
+ if ( LOG_KRB.isDebugEnabled() )
{
monitorContext( tgsContext );
monitorReply( reply, encKdcRepPart );
@@ -549,12 +550,12 @@
sb.append( "\n\t" + "Ticket key type " + encryptionType );
sb.append( "\n\t" + "Service key version " + keyVersion );
- LOG.debug( sb.toString() );
+ LOG_KRB.debug( sb.toString() );
}
catch ( Exception e )
{
// This is a monitor. No exceptions should bubble up.
- LOG.error( I18n.err( I18n.ERR_154 ), e );
+ LOG_KRB.error( I18n.err( I18n.ERR_154 ), e );
}
}
@@ -579,12 +580,12 @@
sb.append( "\n\t" + "renew-till time: " + part.getRenewTill() );
sb.append( "\n\t" + "hostAddresses: " + part.getClientAddresses() );
- LOG.debug( sb.toString() );
+ LOG_KRB.debug( sb.toString() );
}
catch ( Exception e )
{
// This is a monitor. No exceptions should bubble up.
- LOG.error( I18n.err( I18n.ERR_155 ), e );
+ LOG_KRB.error( I18n.err( I18n.ERR_155 ), e );
}
}
diff --git a/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java b/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
index b15c1d2..3e1f155 100644
--- a/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
+++ b/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
@@ -345,7 +345,7 @@
kdcReqBody.setTill( requestedEndTime );
HostAddress[] address =
- { new HostAddress( InetAddress.getLocalHost() ) };
+ { new HostAddress( InetAddress.getByName( "127.0.0.1" ) ) };
HostAddresses addresses = new HostAddresses( address );
kdcReqBody.setAddresses( addresses );
diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
index 95909af..61b5a80 100644
--- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
+++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -140,7 +139,8 @@
SchemaConstants.CREATE_TIMESTAMP_AT,
SchemaConstants.CREATORS_NAME_AT,
SchemaConstants.ENTRY_PARENT_ID_AT,
- SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT
+ SchemaConstants.COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT,
+ SchemaConstants.CONTEXT_CSN_AT
};
/** the cookie that was saved last time */
diff --git a/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java b/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
index 9f5471b..83d0b38 100644
--- a/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
+++ b/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
@@ -1103,6 +1103,11 @@
for ( ReplConsumerBean replBean : replConsumerBeans )
{
+ if ( replBean.isDisabled() )
+ {
+ continue;
+ }
+
String className = replBean.getReplConsumerImpl();
ReplicationConsumer consumer = null;
