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 2011/11/13 00:55:25 UTC
svn commit: r1201360 [1/2] - in /directory/apacheds/branches/apacheds-osgi:
kerberos-codec/ kerberos-codec/src/main/java/org/apache/directory/server/
kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/
kerberos-codec/src/m...
Author: elecharny
Date: Sat Nov 12 23:55:24 2011
New Revision: 1201360
URL: http://svn.apache.org/viewvc?rev=1201360&view=rev
Log:
Merged trunk into the osgi branch
Modified:
directory/apacheds/branches/apacheds-osgi/kerberos-codec/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/test/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-test/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
directory/apacheds/branches/apacheds-osgi/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
directory/apacheds/branches/apacheds-osgi/ldap-client-test/ (props changed)
directory/apacheds/branches/apacheds-osgi/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
directory/apacheds/branches/apacheds-osgi/ldif-partition/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-dhcp/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-dns/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-kerberos/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-ldap/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-ntp/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-shared/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-annotations/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/src/main/resources/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed)
directory/apacheds/branches/apacheds-osgi/server-integ/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
directory/apacheds/branches/apacheds-osgi/server-jndi/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-replication/ (props changed)
directory/apacheds/branches/apacheds-osgi/service/ (props changed)
directory/apacheds/branches/apacheds-osgi/service-builder/ (props changed)
directory/apacheds/branches/apacheds-osgi/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
directory/apacheds/branches/apacheds-osgi/service-osgi/ (props changed)
directory/apacheds/branches/apacheds-osgi/service/pom.xml
directory/apacheds/branches/apacheds-osgi/test-framework/ (props changed)
directory/apacheds/branches/apacheds-osgi/xdbm-partition/ (props changed)
directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFlushManager.java
directory/apacheds/branches/apacheds-osgi/xdbm-tools/ (props changed)
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -0,0 +1,10 @@
+/directory/apacheds/branches/apacheds-codec-merge/kerberos-codec:982369-987590
+/directory/apacheds/branches/apacheds-config/kerberos-codec:1023442-1029077
+/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec:1040956-1043765
+/directory/apacheds/branches/apacheds-replication/kerberos-codec:749790-764110
+/directory/apacheds/branches/apacheds-schema/kerberos-codec:806623-896441
+/directory/apacheds/branches/apacheds-subtree/kerberos-codec:965203-965686
+/directory/apacheds/branches/milestones/kerberos-codec:1072812-1075328
+/directory/apacheds/branches/xdbm-refactoring/kerberos-codec:945827-946347
+/directory/apacheds/trunk/kerberos-codec:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/studio/trunk/kerberos-codec:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:980138-980936
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1072812-1075328
/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072800-1075329
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1185681-1201347
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -2,5 +2,5 @@
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:980138-980936
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java (original)
+++ directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java Sat Nov 12 23:55:24 2011
@@ -463,7 +463,7 @@ public class KdcReqBody extends Abstract
@Override
public int computeLength()
{
- reset();
+ reset();
// The KdcOptions length
kdcOptionsLength = 1 + 1 + kdcOptions.getBytes().length;
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java (original)
+++ directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java Sat Nov 12 23:55:24 2011
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.kerberos.messages;
@@ -200,11 +200,11 @@ public class ApReq extends KerberosMessa
* +--> 0xA1 0x03 msg-type tag
* | |
* | +--> 0x02 0x01 0x0E msg-type (14)
- * |
+ * |
* +--> 0xA2 0x03 APOptions tag
* | |
* | +--> 0x03 0x05 0x00 b1 b2 b3 b4 APOtions
- * |
+ * |
* +--> 0xA3 L3 ticket tag
* | |
* | +--> 0x61 L3-1 ticket
@@ -216,8 +216,8 @@ public class ApReq extends KerberosMessa
*/
public int computeLength()
{
- reset();
-
+ reset();
+
// Compute the PVNO length.
pvnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
@@ -234,10 +234,10 @@ public class ApReq extends KerberosMessa
authenticatorLength = authenticator.computeLength();
// Compute the sequence size
- apReqLength =
+ apReqLength =
1 + TLV.getNbBytes( pvnoLength ) + pvnoLength +
1 + TLV.getNbBytes( msgTypeLength ) + msgTypeLength +
- 1 + TLV.getNbBytes( apOptionsLength ) + apOptionsLength +
+ 1 + TLV.getNbBytes( apOptionsLength ) + apOptionsLength +
1 + TLV.getNbBytes( ticketLength ) + ticketLength +
1 + TLV.getNbBytes( authenticatorLength ) + authenticatorLength;
@@ -313,7 +313,7 @@ public class ApReq extends KerberosMessa
}
catch ( BufferOverflowException boe )
{
- LOG.error( I18n.err( I18n.ERR_137, 1 + TLV.getNbBytes( apReqLength ) + apReqLength,
+ LOG.error( I18n.err( I18n.ERR_137, 1 + TLV.getNbBytes( apReqLength ) + apReqLength,
buffer.capacity() ) );
throw new EncoderException( I18n.err( I18n.ERR_138 ) );
}
@@ -333,13 +333,13 @@ public class ApReq extends KerberosMessa
*/
private void reset()
{
- pvnoLength = 0;
+ pvnoLength = 0;
msgTypeLength = 0;
apOptionsLength = 0;
ticketLength = 0;
authenticatorLength = 0;
apReqLength = 0;
- apReqSeqLength = 0;
+ apReqSeqLength = 0;
}
Modified: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java (original)
+++ directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java Sat Nov 12 23:55:24 2011
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.kerberos.messages;
@@ -326,8 +326,8 @@ public class Authenticator extends Kerbe
@Override
public int computeLength()
{
- reset();
-
+ reset();
+
// Compute the Authenticator version length.
authenticatorVnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
authenticatorSeqLength = 1 + TLV.getNbBytes( authenticatorVnoLength ) + authenticatorVnoLength;
@@ -385,15 +385,15 @@ public class Authenticator extends Kerbe
/**
- * Encode the Authenticator message to a PDU.
+ * Encode the Authenticator message to a PDU.
* <pre>
* Authenticator :
*
* 0x62 LL
* 0x30 LL
- * 0xA0 0x03
- * 0x02 0x01 0x05 authenticator-vno
- * 0xA1 LL
+ * 0xA0 0x03
+ * 0x02 0x01 0x05 authenticator-vno
+ * 0xA1 LL
* 0x1B LL abcd crealm
* 0xA2 LL
* 0x30 LL abcd cname
@@ -481,7 +481,7 @@ public class Authenticator extends Kerbe
buffer.put( TLV.getBytes( ctimeLength ) );
// The value
- buffer.put( (byte)UniversalTag.GENERALIZED_TIME.getValue() );
+ buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
buffer.put( (byte)0x0F );
buffer.put( ctime.getBytes() );
@@ -537,7 +537,7 @@ public class Authenticator extends Kerbe
*/
private void reset()
{
- authenticatorVnoLength = 0;
+ authenticatorVnoLength = 0;
crealmLength = 0;
crealmBytes = null;
cnameLength = 0;
@@ -548,7 +548,7 @@ public class Authenticator extends Kerbe
seqNumberLength = 0;
authorizationDataLength = 0;
authenticatorSeqLength = 0;
- authenticatorLength = 0;
+ authenticatorLength = 0;
}
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:965203-965686
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:945827-946347
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java (original)
+++ directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java Sat Nov 12 23:55:24 2011
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.shared.kerberos.messages;
@@ -46,7 +46,7 @@ public class TgsReq extends KdcReq
/**
* Creates a new instance of TGS-REQ.
*/
- public TgsReq()
+ public TgsReq()
{
super( KerberosMessageType.TGS_REQ );
}
@@ -64,9 +64,9 @@ public class TgsReq extends KdcReq
*/
public int computeLength()
{
- kdcReqLength = 0;
- tgsReqLength = 0;
-
+ kdcReqLength = 0;
+ tgsReqLength = 0;
+
kdcReqLength = super.computeLength();
tgsReqLength = 1 + TLV.getNbBytes( kdcReqLength ) + kdcReqLength;
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/test/java/org/apache/directory/server:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/test/java/org/apache/directory/server:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-test:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-test:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-test:1072812-1075328
-/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/kerberos-test:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java (original)
+++ directory/apacheds/branches/apacheds-osgi/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java Sat Nov 12 23:55:24 2011
@@ -105,7 +105,7 @@ public class AbstractKerberosITest exten
/**
- * Obtains a TGT and service tickets for the user.
+ * Obtains a TGT and service tickets for the user.
* Also makes some assertions on the received tickets.
*
* @param encryptionType the encryption type to use
@@ -151,7 +151,7 @@ public class AbstractKerberosITest exten
}
- protected void setupEnv( ObtainTicketParameters parameters )
+ protected void setupEnv( ObtainTicketParameters parameters )
throws Exception
{
// Save current value of sun.security.krb5.KrbKdcReq.udpPrefLimit field.
@@ -183,7 +183,7 @@ public class AbstractKerberosITest exten
"ldap", "randall", servicePrincipal );
}
- protected void resetEnv( ObtainTicketParameters parameters )
+ protected void resetEnv( ObtainTicketParameters parameters )
throws Exception
{
setUdpPrefLimit( parameters.oldUdpPrefLimit );
@@ -210,7 +210,19 @@ public class AbstractKerberosITest exten
{
String clazz = "sun.security.krb5.KrbKdcReq";
Class<?> krbKdcReqClass = Class.forName( clazz );
- Field udpPrefLimitField = krbKdcReqClass.getDeclaredField( "udpPrefLimit" );
+
+ // Absolutely ugly fix to get this method working with the latest JVM on Mac (1.6.0_29)
+ Field udpPrefLimitField = null;
+
+ try
+ {
+ udpPrefLimitField = krbKdcReqClass.getDeclaredField( "udpPrefLimit" );
+ }
+ catch ( NoSuchFieldException nsfe )
+ {
+ udpPrefLimitField = krbKdcReqClass.getDeclaredField( "defaultUdpPrefLimit" );
+ }
+
udpPrefLimitField.setAccessible( true );
return udpPrefLimitField;
}
@@ -263,7 +275,7 @@ public class AbstractKerberosITest exten
* </pre>
*
* @param encryptionType
- * @param checksumType
+ * @param checksumType
* @return the path to the krb5.conf file
* @throws IOException
*/
Modified: directory/apacheds/branches/apacheds-osgi/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java (original)
+++ directory/apacheds/branches/apacheds-osgi/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java Sat Nov 12 23:55:24 2011
@@ -145,7 +145,7 @@ public class SaslGssapiBindITest extends
protected LdapContext sysRoot;
/** the context root for the rootDSE */
- protected CoreSession rootDSE;
+ protected CoreSession rootDse;
/**
* Creates a new instance of SaslGssapiBindTest and sets JAAS system properties.
@@ -406,7 +406,7 @@ public class SaslGssapiBindITest extends
sysRoot = new InitialLdapContext( envFinal, null );
envFinal.put( Context.PROVIDER_URL, "" );
- rootDSE = getService().getAdminSession();
+ rootDse = getService().getAdminSession();
envFinal.put( Context.PROVIDER_URL, SchemaConstants.OU_SCHEMA );
schemaRoot = new InitialLdapContext( envFinal, null );
Propchange: directory/apacheds/branches/apacheds-osgi/ldap-client-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-jdbm/ldap-client-test:1160768-1164092
-/directory/apacheds/trunk/ldap-client-test:1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/ldap-client-test:1185681-1201348
Modified: directory/apacheds/branches/apacheds-osgi/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-osgi/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Sat Nov 12 23:55:24 2011
@@ -38,7 +38,6 @@ import org.apache.directory.server.annot
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
import org.apache.directory.server.core.api.interceptor.Interceptor;
-import org.apache.directory.server.core.api.interceptor.NextInterceptor;
import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
@@ -455,12 +454,12 @@ public class SimpleBindRequestTest exten
{
// Inject the interceptor that waits 1 second when binding
// in order to be able to send a request before we get the response
- Interceptor interceptor = new BaseInterceptor()
+ Interceptor interceptor = new BaseInterceptor( "test" )
{
/**
* Wait 1 second before going any further
*/
- public void bind( NextInterceptor next, BindOperationContext bindContext ) throws LdapException
+ public void bind( BindOperationContext bindContext ) throws LdapException
{
// Wait 1 second
try
@@ -472,11 +471,11 @@ public class SimpleBindRequestTest exten
// Ok, get out
}
- next.bind( bindContext );
+ next( bindContext );
}
};
- getService().getInterceptorChain().addFirst( interceptor );
+ getService().addFirst( interceptor );
// Send another BindRequest
BindRequest bindRequest = new BindRequestImpl();
@@ -509,7 +508,7 @@ public class SimpleBindRequestTest exten
}
finally
{
- getService().getInterceptorChain().remove( "" );
+ getService().remove( "test" );
}
}
Propchange: directory/apacheds/branches/apacheds-osgi/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/ldif-partition:1160768-1164092
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/ldif-partition:1040956-1043765
/directory/apacheds/branches/milestones/ldif-partition:1072812-1075328
-/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/ldif-partition:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dhcp:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dhcp:1040956-1043765
/directory/apacheds/branches/milestones/protocol-dhcp:1072812-1075328
-/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/protocol-dhcp:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dns:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dns:1040956-1043765
/directory/apacheds/branches/milestones/protocol-dns:1072812-1075328
-/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/protocol-dns:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos:1040956-1043765
/directory/apacheds/branches/milestones/protocol-kerberos:1072812-1075328
-/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/protocol-kerberos:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -5,5 +5,5 @@
/directory/apacheds/branches/apacheds-jdbm/protocol-ldap:1160768-1164080
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ldap:1040956-1043765
/directory/apacheds/branches/milestones/protocol-ldap:1072812-1075328
-/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/protocol-ldap:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original)
+++ directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Sat Nov 12 23:55:24 2011
@@ -29,6 +29,7 @@ import org.apache.commons.lang.exception
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.LdapPrincipal;
+import org.apache.directory.server.core.api.OperationEnum;
import org.apache.directory.server.core.api.entry.ClonedServerEntry;
import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
import org.apache.directory.server.i18n.I18n;
@@ -111,6 +112,7 @@ public class BindHandler extends LdapReq
bindContext.setDn( bindRequest.getName() );
bindContext.setCredentials( bindRequest.getCredentials() );
bindContext.setIoSession( ldapSession.getIoSession() );
+ bindContext.setInterceptors( ldapServer.getDirectoryService().getInterceptors( OperationEnum.BIND ) );
// Stores the request controls into the operation context
LdapProtocolUtils.setRequestControls( bindContext, bindRequest );
@@ -168,6 +170,7 @@ public class BindHandler extends LdapReq
// opContext.setEntry( principalEntry );
// And call the OperationManager bind operation.
+ bindContext.setInterceptors( getLdapServer().getDirectoryService().getInterceptors( OperationEnum.BIND ) );
getLdapServer().getDirectoryService().getOperationManager().bind( bindContext );
// As a result, store the created session in the Core Session
Modified: directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Sat Nov 12 23:55:24 2011
@@ -245,18 +245,18 @@ public class SearchHandler extends LdapR
// Position the cursor at the beginning
cursor.beforeFirst();
- boolean hasRootDSE = false;
+ boolean hasRootDse = false;
while ( cursor.next() )
{
- if ( hasRootDSE )
+ if ( hasRootDse )
{
// This is an error ! We should never find more than one rootDSE !
LOG.error( I18n.err( I18n.ERR_167 ) );
}
else
{
- hasRootDSE = true;
+ hasRootDse = true;
Entry entry = cursor.get();
session.getIoSession().write( generateResponse( session, req, entry ) );
}
@@ -1019,7 +1019,7 @@ public class SearchHandler extends LdapR
// ===============================================================
// Handle search in rootDSE differently.
// ===============================================================
- if ( isRootDSESearch( req ) )
+ if ( isRootDseSearch( req ) )
{
handleRootDseSearch( session, req );
@@ -1297,11 +1297,11 @@ public class SearchHandler extends LdapR
* @param req the request issued
* @return true if the search is on the RootDSE false otherwise
*/
- private boolean isRootDSESearch( SearchRequest req )
+ private boolean isRootDseSearch( SearchRequest req )
{
boolean isBaseIsRoot = req.getBase().isEmpty();
boolean isBaseScope = req.getScope() == SearchScope.OBJECT;
- boolean isRootDSEFilter = false;
+ boolean isRootDseFilter = false;
if ( req.getFilter() instanceof PresenceNode )
{
@@ -1310,17 +1310,17 @@ public class SearchHandler extends LdapR
if ( filter.isSchemaAware() )
{
AttributeType attributeType = ( (PresenceNode) req.getFilter() ).getAttributeType();
- isRootDSEFilter = attributeType.equals( OBJECT_CLASS_AT );
+ isRootDseFilter = attributeType.equals( OBJECT_CLASS_AT );
}
else
{
String attribute = ( ( PresenceNode ) req.getFilter() ).getAttribute();
- isRootDSEFilter = attribute.equalsIgnoreCase( SchemaConstants.OBJECT_CLASS_AT )
+ isRootDseFilter = attribute.equalsIgnoreCase( SchemaConstants.OBJECT_CLASS_AT )
|| attribute.equals( SchemaConstants.OBJECT_CLASS_AT_OID );
}
}
- return isBaseIsRoot && isBaseScope && isRootDSEFilter;
+ return isBaseIsRoot && isBaseScope && isRootDseFilter;
}
@@ -1354,7 +1354,7 @@ public class SearchHandler extends LdapR
DirectoryService ds = session.getCoreSession().getDirectoryService();
PartitionNexus nexus = ds.getPartitionNexus();
- Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
+ Value<?> subschemaSubentry = nexus.getRootDse( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
Dn subschemaSubentryDn = new Dn( ds.getSchemaManager(), subschemaSubentry.getString() );
String subschemaSubentryDnNorm = subschemaSubentryDn.getNormName();
Modified: directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java (original)
+++ directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java Sat Nov 12 23:55:24 2011
@@ -24,6 +24,7 @@ import javax.security.sasl.SaslServer;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.directory.server.core.api.CoreSession;
+import org.apache.directory.server.core.api.OperationEnum;
import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
import org.apache.directory.server.ldap.LdapProtocolUtils;
import org.apache.directory.server.ldap.LdapSession;
@@ -60,6 +61,7 @@ public class SimpleMechanismHandler impl
// Stores the Dn of the user to check, and its password
bindContext.setDn( bindRequest.getName() );
bindContext.setCredentials( bindRequest.getCredentials() );
+ bindContext.setInterceptors( ldapSession.getLdapServer().getDirectoryService().getInterceptors( OperationEnum.BIND ) );
// Stores the request controls into the operation context
LdapProtocolUtils.setRequestControls( bindContext, bindRequest );
Propchange: directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -10,5 +10,5 @@
/directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:945827-946347
/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1067785,1068026-1072718,1072800-1075329
-/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java:1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java:1185681-1201347
/directory/studio/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ntp:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ntp:1040956-1043765
/directory/apacheds/branches/milestones/protocol-ntp:1072812-1075328
-/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/protocol-ntp:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/protocol-shared:1160768-1164092
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-shared:1040956-1043765
/directory/apacheds/branches/milestones/protocol-shared:1072812-1075328
-/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/protocol-shared:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/server-annotations:1160768-1164092
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-annotations:1040956-1043765
/directory/apacheds/branches/milestones/server-annotations:1072812-1075328
-/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/server-annotations:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
/directory/apacheds/branches/milestones/server-config:1072812-1075328
/directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
-/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/server-config:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -10,5 +10,5 @@
/directory/apacheds/branches/milestones/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1072812-1075328
/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1042727-1043868
/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -13,5 +13,5 @@
/directory/apacheds/branches/milestones/server-config/src/main/resources:1072812-1075328
/directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868
/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
-/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/server-config/src/main/resources:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -12,5 +12,5 @@
/directory/apacheds/branches/milestones/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1072812-1075328
/directory/apacheds/branches/server-config-annotations/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1042727-1043868
/directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
/directory/studio/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -5,5 +5,5 @@
/directory/apacheds/branches/apacheds-jdbm/server-integ:1160768-1164092
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-integ:1040956-1043765
/directory/apacheds/branches/milestones/server-integ:1072812-1075328
-/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348
/directory/studio/trunk/server-integ:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original)
+++ directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Sat Nov 12 23:55:24 2011
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.operations.bind;
@@ -81,28 +81,28 @@ import org.junit.runner.RunWith;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-@RunWith ( FrameworkRunner.class )
+@RunWith ( FrameworkRunner.class )
@CreateDS( allowAnonAccess=true, name="MiscBindIT-class",
partitions =
{
@CreatePartition(
name = "example",
suffix = "dc=aPache,dc=org",
- contextEntry = @ContextEntry(
+ contextEntry = @ContextEntry(
entryLdif =
"dn: dc=aPache,dc=org\n" +
"dc: aPache\n" +
"objectClass: top\n" +
"objectClass: domain\n\n" ),
- indexes =
+ indexes =
{
@CreateIndex( attribute = "objectClass" ),
@CreateIndex( attribute = "dc" ),
@CreateIndex( attribute = "ou" )
} )
})
-@CreateLdapServer (
- transports =
+@CreateLdapServer (
+ transports =
{
@CreateTransport( protocol = "LDAP" )
})
@@ -199,7 +199,7 @@ public class MiscBindIT extends Abstract
* @throws Exception if anything goes wrong
*/
@Test
- public void testEnableAnonymousBindsOnRootDSE() throws Exception
+ public void testEnableAnonymousBindsOnRootDse() throws Exception
{
getLdapServer().getDirectoryService().setAllowAnonymousAccess( true );
Modified: directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java Sat Nov 12 23:55:24 2011
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.operations.bind;
@@ -68,12 +68,12 @@ import org.junit.runner.RunWith;
@ApplyLdifs(
{
// Entry # 1
- "dn: uid=hnelson,ou=users,ou=system",
- "objectClass: inetOrgPerson",
+ "dn: uid=hnelson,ou=users,ou=system",
+ "objectClass: inetOrgPerson",
"objectClass: organizationalPerson",
- "objectClass: person",
- "objectClass: top",
- "userPassword: secret",
+ "objectClass: person",
+ "objectClass: top",
+ "userPassword: secret",
"uid: hnelson",
"cn: Horatio Nelson",
"sn: Nelson" })
@@ -398,7 +398,7 @@ public class SimpleBindIT extends Abstra
* The configuration for this test case MUST disable anonymous access.
*/
@Test
- public void testAnonymousRootDSESearch()
+ public void testAnonymousRootDseSearch()
{
boolean oldValue = getLdapServer().getDirectoryService().isAllowAnonymousAccess();
Modified: directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java?rev=1201360&r1=1201359&r2=1201360&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java (original)
+++ directory/apacheds/branches/apacheds-osgi/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java Sat Nov 12 23:55:24 2011
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.operations.search;
@@ -42,7 +42,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
import org.apache.directory.server.core.api.interceptor.Interceptor;
-import org.apache.directory.server.core.api.interceptor.NextInterceptor;
import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
@@ -57,14 +56,14 @@ import org.junit.runner.RunWith;
/**
- * A set of tests to make sure the negation operator is working
+ * A set of tests to make sure the negation operator is working
* properly when included in search filters on indexed attributes.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-@RunWith ( FrameworkRunner.class )
-@CreateLdapServer (
- transports =
+@RunWith ( FrameworkRunner.class )
+@CreateLdapServer (
+ transports =
{
@CreateTransport( protocol = "LDAP" )
})
@@ -117,26 +116,31 @@ import org.junit.runner.RunWith;
"uid: jnewbie",
"userPassword: secret",
"cn: Joe Newbie",
- "sn: Newbie"
- }
-)
-public class SearchLimitsIT extends AbstractLdapTestUnit
+ "sn: Newbie"
+}
+ )
+public class SearchLimitsIT extends AbstractLdapTestUnit
{
/**
- * An {@link Interceptor} that fakes a specified amount of delay to each
+ * An {@link Interceptor} that fakes a specified amount of delay to each
* search iteration so we can make sure search time limits are adhered to.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- */
+ */
class DelayInducingInterceptor extends BaseInterceptor
{
private Long delayMillis;
-
- public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext searchContext ) throws LdapException
+ public DelayInducingInterceptor()
+ {
+ super( "DelayInterceptor" );
+ }
+
+
+ public EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException
{
- EntryFilteringCursor cursor = next.search( searchContext );
+ EntryFilteringCursor cursor = next( searchContext );
cursor.addEntryFilter( new EntryFilter() {
public boolean accept( SearchingOperationContext operation, Entry result ) throws Exception
{
@@ -148,51 +152,52 @@ public class SearchLimitsIT extends Abst
return true;
}
});
+
return cursor;
}
-
-
+
+
public void setDelayMillis( long delayMillis )
{
if ( delayMillis <= 0 )
{
this.delayMillis = null;
}
-
+
this.delayMillis = delayMillis;
}
}
-
+
private int oldMaxTimeLimit;
private long oldMaxSizeLimit;
private DelayInducingInterceptor delayInterceptor;
-
+
@Before
public void setUp() throws Exception
{
oldMaxTimeLimit = getLdapServer().getMaxTimeLimit();
oldMaxSizeLimit = getLdapServer().getMaxSizeLimit();
delayInterceptor = new DelayInducingInterceptor();
- getLdapServer().getDirectoryService().getInterceptorChain().addFirst( delayInterceptor );
+ getLdapServer().getDirectoryService().addFirst( delayInterceptor );
}
-
-
+
+
@After
public void tearDown() throws Exception
{
getLdapServer().setMaxTimeLimit( oldMaxTimeLimit );
getLdapServer().setMaxSizeLimit( oldMaxSizeLimit );
- getLdapServer().getDirectoryService().getInterceptorChain().remove( DelayInducingInterceptor.class.getSimpleName() );
+ getLdapServer().getDirectoryService().remove( "DelayInterceptor" );
}
-
+
// -----------------------------------------------------------------------
// Time Limit Tests
// -----------------------------------------------------------------------
-
-
+
+
/**
* Sets up the server with unlimited search time limit but constrains time
* by request time limit value to cause a time limit exceeded exception on
@@ -203,14 +208,14 @@ public class SearchLimitsIT extends Abst
{
getLdapServer().setMaxTimeLimit( LdapServer.NO_TIME_LIMIT );
delayInterceptor.setDelayMillis( 500 );
-
+
getActorsWithLimit( "(objectClass=*)", 499, LdapServer.NO_SIZE_LIMIT );
}
-
+
/**
- * Sets up the server with longer search time limit than the request's
- * which constrains time by request time limit value to cause a time limit
+ * Sets up the server with longer search time limit than the request's
+ * which constrains time by request time limit value to cause a time limit
* exceeded exception on the client.
*/
@Test ( expected = TimeLimitExceededException.class )
@@ -218,14 +223,14 @@ public class SearchLimitsIT extends Abst
{
getLdapServer().setMaxTimeLimit( 10000 ); // this is in seconds
delayInterceptor.setDelayMillis( 500 );
-
+
getActorsWithLimit( "(objectClass=*)", 499, LdapServer.NO_SIZE_LIMIT );
}
-
+
/**
- * Sets up the server with shorter search time limit than the request's
- * which constrains time by using server max limit value to cause a time
+ * Sets up the server with shorter search time limit than the request's
+ * which constrains time by using server max limit value to cause a time
* limit exceeded exception on the client.
*/
@Test ( expected = TimeLimitExceededException.class )
@@ -233,46 +238,46 @@ public class SearchLimitsIT extends Abst
{
getLdapServer().setMaxTimeLimit( 1 ); // this is in seconds
delayInterceptor.setDelayMillis( 1100 );
-
+
getActorsWithLimit( "(objectClass=*)", 100000, LdapServer.NO_SIZE_LIMIT );
}
-
+
/**
* Sets up the server with limited search time with unlimited request
* time limit. Should work just fine for the administrative user.
*/
- @Test
+ @Test
public void testRequestUnlimitedConfigurationLimited() throws Exception
{
getLdapServer().setMaxTimeLimit( 1 ); // this is in seconds
delayInterceptor.setDelayMillis( 500 );
-
- getActorsWithLimit( "(objectClass=*)",
+
+ getActorsWithLimit( "(objectClass=*)",
LdapServer.NO_TIME_LIMIT, LdapServer.NO_SIZE_LIMIT );
}
-
+
/**
* Sets up the server with limited search time with unlimited request
* time limit. Should not work for non administrative users.
*/
- @Test ( expected = TimeLimitExceededException.class )
+ @Test ( expected = TimeLimitExceededException.class )
public void testNonAdminRequestUnlimitedConfigurationLimited() throws Exception
{
getLdapServer().setMaxTimeLimit( 1 ); // this is in seconds
delayInterceptor.setDelayMillis( 500 );
-
- getActorsWithLimitNonAdmin( "(objectClass=*)",
+
+ getActorsWithLimitNonAdmin( "(objectClass=*)",
LdapServer.NO_TIME_LIMIT, LdapServer.NO_SIZE_LIMIT );
}
-
-
+
+
// -----------------------------------------------------------------------
// Size Limit Tests
// -----------------------------------------------------------------------
-
-
+
+
/**
* Sets up the server with unlimited search size limit but constrains size
* by request size limit value to cause a size limit exceeded exception on
@@ -282,78 +287,78 @@ public class SearchLimitsIT extends Abst
public void testRequestConstrainedUnlimitByConfigurationSize() throws Exception
{
getLdapServer().setMaxSizeLimit( LdapServer.NO_SIZE_LIMIT );
-
+
getActorsWithLimit( "(objectClass=*)", LdapServer.NO_TIME_LIMIT, 1 );
}
-
+
/**
- * Sets up the server with longer search size limit than the request's
- * which constrains size by request size limit value to cause a size limit
+ * Sets up the server with longer search size limit than the request's
+ * which constrains size by request size limit value to cause a size limit
* exceeded exception on the client.
*/
@Test ( expected = SizeLimitExceededException.class )
public void testRequestConstrainedLessThanConfigurationSize() throws Exception
{
- getLdapServer().setMaxSizeLimit( 10000 );
+ getLdapServer().setMaxSizeLimit( 10000 );
getActorsWithLimit( "(objectClass=*)", LdapServer.NO_TIME_LIMIT, 1 );
}
/**
- * Sets up the server with shorter search size limit than the request's
- * which constrains size by using server max limit value. Should work
+ * Sets up the server with shorter search size limit than the request's
+ * which constrains size by using server max limit value. Should work
* just fine for the administrative user.
*/
@Test
public void testRequestConstrainedGreaterThanConfigurationSize() throws Exception
{
- getLdapServer().setMaxSizeLimit( 1 );
+ getLdapServer().setMaxSizeLimit( 1 );
Set<String> set = getActorsWithLimit( "(objectClass=*)", LdapServer.NO_TIME_LIMIT, 100000 );
assertEquals( 4, set.size() );
}
/**
- * Sets up the server with shorter search size limit than the request's
- * which constrains size by using server max limit value to cause a size
+ * Sets up the server with shorter search size limit than the request's
+ * which constrains size by using server max limit value to cause a size
* limit exceeded exception on the client.
*/
- @Test (expected = SizeLimitExceededException.class )
+ @Test (expected = SizeLimitExceededException.class )
public void testNonAdminRequestConstrainedGreaterThanConfigurationSize() throws Exception
{
- getLdapServer().setMaxSizeLimit( 1 );
-
+ getLdapServer().setMaxSizeLimit( 1 );
+
// We are not using the admin : it should fail
getActorsWithLimitNonAdmin( "(objectClass=*)", LdapServer.NO_TIME_LIMIT, 100000 );
}
-
+
/**
* Sets up the server with limited search size with unlimited request
* size limit. Should work just fine for the administrative user.
*/
- @Test
+ @Test
public void testRequestUnlimitedConfigurationLimitedSize() throws Exception
{
- getLdapServer().setMaxSizeLimit( 1 );
- Set<String> set = getActorsWithLimit( "(objectClass=*)",
+ getLdapServer().setMaxSizeLimit( 1 );
+ Set<String> set = getActorsWithLimit( "(objectClass=*)",
LdapServer.NO_TIME_LIMIT, LdapServer.NO_SIZE_LIMIT );
-
+
assertEquals( 4, set.size() );
}
-
+
/**
* Sets up the server with limited search size with unlimited request
* size limit. Should not work for non administrative users.
*/
- @Test ( expected = SizeLimitExceededException.class )
+ @Test ( expected = SizeLimitExceededException.class )
public void testNonAdminRequestUnlimitedConfigurationLimitedSize() throws Exception
{
getLdapServer().setMaxSizeLimit( 1 );
- getActorsWithLimitNonAdmin( "(objectClass=*)",
+ getActorsWithLimitNonAdmin( "(objectClass=*)",
LdapServer.NO_TIME_LIMIT, LdapServer.NO_SIZE_LIMIT );
}
@@ -373,7 +378,7 @@ public class SearchLimitsIT extends Abst
public void testRequestConstraintedLessThanExpectedSize() throws Exception
{
getLdapServer().setMaxSizeLimit( LdapServer.NO_SIZE_LIMIT );
-
+
getActorsWithLimit( "(objectClass=*)", LdapServer.NO_TIME_LIMIT, 3 );
}
@@ -425,7 +430,7 @@ public class SearchLimitsIT extends Abst
controls.setCountLimit( 1 );
controls.setSearchScope( SearchControls.OBJECT_SCOPE );
- NamingEnumeration<SearchResult> namingEnumeration =
+ NamingEnumeration<SearchResult> namingEnumeration =
ctx.search( "ou=actors,ou=system", filter, controls );
assertTrue( namingEnumeration.hasMore() );
namingEnumeration.next();
@@ -436,8 +441,8 @@ public class SearchLimitsIT extends Abst
// -----------------------------------------------------------------------
// Utility Methods
// -----------------------------------------------------------------------
-
-
+
+
/**
* Do a search request from the ou=actors,ou=system base, with a principal
* which is the administrator.
@@ -450,15 +455,15 @@ public class SearchLimitsIT extends Abst
controls.setTimeLimit( timeLimitMillis );
controls.setCountLimit( sizeLimit );
controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
-
- NamingEnumeration<SearchResult> namingEnumeration =
+
+ NamingEnumeration<SearchResult> namingEnumeration =
ctx.search( "ou=actors,ou=system", filter, controls );
-
+
while( namingEnumeration.hasMore() )
{
results.add( namingEnumeration.next().getNameInNamespace() );
}
-
+
return results;
}
@@ -466,24 +471,24 @@ public class SearchLimitsIT extends Abst
* Do a search request from the ou=actors,ou=system base, with a principal
* which is not the administrator.
*/
- private Set<String> getActorsWithLimitNonAdmin( String filter, int timeLimitMillis, long sizeLimit )
+ private Set<String> getActorsWithLimitNonAdmin( String filter, int timeLimitMillis, long sizeLimit )
throws Exception
- {
+ {
DirContext ctx = getWiredContext( getLdapServer(), "uid=jblack,ou=actors,ou=system", "secret" );
Set<String> results = new HashSet<String>();
SearchControls controls = new SearchControls();
controls.setTimeLimit( timeLimitMillis );
controls.setCountLimit( sizeLimit );
controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
-
- NamingEnumeration<SearchResult> namingEnumeration =
+
+ NamingEnumeration<SearchResult> namingEnumeration =
ctx.search( "ou=actors,ou=system", filter, controls );
-
+
while( namingEnumeration.hasMore() )
{
results.add( namingEnumeration.next().getNameInNamespace() );
}
-
+
return results;
- }
+ }
}
Propchange: directory/apacheds/branches/apacheds-osgi/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/server-jndi:1160768-1164092
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-jndi:1040956-1043765
/directory/apacheds/branches/milestones/server-jndi:1072812-1075328
-/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348
/directory/studio/trunk/server-jndi:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-replication:1040956-1043765
/directory/apacheds/branches/milestones/server-replication:1072812-1075328
-/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348
/directory/studio/trunk/server-replication:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/service/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -1,2 +1,2 @@
/directory/apacheds/branches/apacheds-jdbm/service:1160768-1164092
-/directory/apacheds/trunk/service:1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/service:1185681-1201348
Propchange: directory/apacheds/branches/apacheds-osgi/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 23:55:24 2011
@@ -1,4 +1,4 @@
/directory/apacheds/branches/antoine/service-builder:1038305-1044163
/directory/apacheds/branches/milestones/service-builder:1072812-1075328
-/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348
/directory/studio/trunk/service-builder:1067786-1067997