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 2012/05/01 15:29:25 UTC
svn commit: r1332645 [2/2] - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/api/entry/
core-api/src/main/java/org/apache/directory/server/core/api/filtering/
core-api/src/main/java/org/apache/directory/server/core...
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.codec.options.KdcOptions;
@@ -505,7 +505,7 @@ public class KdcReqBody extends Abstract
}
// The nonce length
- nonceLength = 1 + 1 + Value.getNbBytes( nonce );
+ nonceLength = 1 + 1 + BerValue.getNbBytes( nonce );
kdcReqBodySeqLength += 1 + 1 + nonceLength;
// The eType length
@@ -515,7 +515,7 @@ public class KdcReqBody extends Abstract
for ( EncryptionType encryptionType : eType )
{
- eTypeLengths[pos] = 1 + 1 + Value.getNbBytes( encryptionType.getValue() );
+ eTypeLengths[pos] = 1 + 1 + BerValue.getNbBytes( encryptionType.getValue() );
eTypeSeqLength += eTypeLengths[pos];
pos++;
}
@@ -587,7 +587,7 @@ public class KdcReqBody extends Abstract
buffer.put( TLV.getBytes( kdcOptionsLength ) );
// The value
- Value.encode( buffer, kdcOptions );
+ BerValue.encode( buffer, kdcOptions );
// The cname if any ---------------------------------------------------
if ( cName != null )
@@ -663,7 +663,7 @@ public class KdcReqBody extends Abstract
buffer.put( TLV.getBytes( nonceLength ) );
// The value
- Value.encode( buffer, nonce );
+ BerValue.encode( buffer, nonce );
// The etype ----------------------------------------------------------
// The tag
@@ -677,7 +677,7 @@ public class KdcReqBody extends Abstract
// The values
for ( EncryptionType encryptionType : eType )
{
- Value.encode( buffer, encryptionType.getValue() );
+ BerValue.encode( buffer, encryptionType.getValue() );
}
// The addresses if any -----------------------------------------------
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.flags.TicketFlags;
@@ -290,7 +290,7 @@ public class KrbCredInfo extends Abstrac
// flags tag and value
buffer.put( ( byte ) KerberosConstants.KRB_CRED_INFO_FLAGS_TAG );
buffer.put( TLV.getBytes( ticketFlagsLen ) );
- Value.encode( buffer, ticketFlags );
+ BerValue.encode( buffer, ticketFlags );
}
if ( authTime != null )
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.util.Strings;
@@ -263,14 +263,14 @@ public class KrbSafeBody extends Abstrac
if ( usec != null )
{
- usecLen = Value.getNbBytes( usec );
+ usecLen = BerValue.getNbBytes( usec );
usecLen = 1 + TLV.getNbBytes( usecLen ) + usecLen;
krbSafeBodySeqLen += 1 + TLV.getNbBytes( usecLen ) + usecLen;
}
if ( seqNumber != null )
{
- seqNumberLen = Value.getNbBytes( seqNumber );
+ seqNumberLen = BerValue.getNbBytes( seqNumber );
seqNumberLen = 1 + TLV.getNbBytes( seqNumberLen ) + seqNumberLen;
krbSafeBodySeqLen += 1 + TLV.getNbBytes( seqNumberLen ) + seqNumberLen;
}
@@ -304,7 +304,7 @@ public class KrbSafeBody extends Abstrac
// user-data
buffer.put( ( byte ) KerberosConstants.KRB_SAFE_BODY_USER_DATA_TAG );
buffer.put( TLV.getBytes( userDataLen ) );
- Value.encode( buffer, userData );
+ BerValue.encode( buffer, userData );
if ( timestamp != null )
{
@@ -323,7 +323,7 @@ public class KrbSafeBody extends Abstrac
// usec
buffer.put( ( byte ) KerberosConstants.KRB_SAFE_BODY_USEC_TAG );
buffer.put( TLV.getBytes( usecLen ) );
- Value.encode( buffer, usec );
+ BerValue.encode( buffer, usec );
}
if ( seqNumber != null )
@@ -331,7 +331,7 @@ public class KrbSafeBody extends Abstrac
// seq-number
buffer.put( ( byte ) KerberosConstants.KRB_SAFE_BODY_SEQ_NUMBER_TAG );
buffer.put( TLV.getBytes( seqNumberLen ) );
- Value.encode( buffer, seqNumber );
+ BerValue.encode( buffer, seqNumber );
}
// s-address
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -30,7 +30,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.codec.types.LastReqType;
@@ -183,7 +183,7 @@ public class LastReq extends AbstractAsn
for ( LastReqEntry lre : lastReqs )
{
- int lrTypeLen = Value.getNbBytes( lre.getLrType().getValue() );
+ int lrTypeLen = BerValue.getNbBytes( lre.getLrType().getValue() );
lrTypeTagLen[i] = 1 + TLV.getNbBytes( lrTypeLen ) + lrTypeLen;
byte[] lrValyeBytes = lre.getLrValue().getBytes();
lrValueTagLen[i] = 1 + TLV.getNbBytes( lrValyeBytes.length ) + lrValyeBytes.length;
@@ -240,7 +240,7 @@ public class LastReq extends AbstractAsn
// the lrType
buffer.put( ( byte ) KerberosConstants.LAST_REQ_LR_TYPE_TAG );
buffer.put( TLV.getBytes( lrTypeTagLen[i] ) );
- Value.encode( buffer, lre.getLrType().getValue() );
+ BerValue.encode( buffer, lre.getLrType().getValue() );
// the lrValue tag
buffer.put( ( byte ) KerberosConstants.LAST_REQ_LR_VALUE_TAG );
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.codec.types.PaDataType;
import org.apache.directory.shared.util.Strings;
@@ -168,7 +168,7 @@ public class PaData extends AbstractAsn1
public int computeLength()
{
// Compute the paDataType. The Length will always be contained in 1 byte
- int paDataTypeLength = Value.getNbBytes( paDataType.getValue() );
+ int paDataTypeLength = BerValue.getNbBytes( paDataType.getValue() );
paDataTypeTagLength = 1 + TLV.getNbBytes( paDataTypeLength ) + paDataTypeLength;
preAuthenticationDataSeqLength = 1 + TLV.getNbBytes( paDataTypeTagLength ) + paDataTypeTagLength;
@@ -221,12 +221,12 @@ public class PaData extends AbstractAsn1
// The PaDataType, first the tag, then the value
buffer.put( ( byte ) KerberosConstants.PADATA_TYPE_TAG );
buffer.put( TLV.getBytes( paDataTypeTagLength ) );
- Value.encode( buffer, paDataType.getValue() );
+ BerValue.encode( buffer, paDataType.getValue() );
// The PaDataValue, first the tag, then the value
buffer.put( ( byte ) KerberosConstants.PADATA_VALUE_TAG );
buffer.put( TLV.getBytes( paDataValueTagLength ) );
- Value.encode( buffer, paDataValue );
+ BerValue.encode( buffer, paDataValue );
}
catch ( BufferOverflowException boe )
{
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.util.Strings;
@@ -158,13 +158,13 @@ public class PaEncTsEnc extends Abstract
// The pausec, if any
if ( pausec != null )
{
- int pausecLength = Value.getNbBytes( pausec );
+ int pausecLength = BerValue.getNbBytes( pausec );
paUsecLength = 1 + TLV.getNbBytes( pausecLength ) + pausecLength;
paEncTsEncLength += 1 + TLV.getNbBytes( paUsecLength ) + paUsecLength;
}
// Compute the whole sequence length
- return 1 + Value.getNbBytes( paEncTsEncLength ) + paEncTsEncLength;
+ return 1 + BerValue.getNbBytes( paEncTsEncLength ) + paEncTsEncLength;
}
@@ -210,7 +210,7 @@ public class PaEncTsEnc extends Abstract
{
buffer.put( ( byte ) KerberosConstants.PA_ENC_TS_ENC_PA_USEC_TAG );
buffer.put( TLV.getBytes( paUsecLength ) );
- Value.encode( buffer, pausec );
+ BerValue.encode( buffer, pausec );
}
}
catch ( BufferOverflowException boe )
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -98,7 +98,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosUtils;
import org.apache.directory.shared.kerberos.codec.types.PrincipalNameType;
import org.apache.directory.shared.util.StringConstants;
@@ -325,7 +325,7 @@ public class PrincipalName extends Abstr
public int computeLength()
{
// The principalName can't be empty.
- principalTypeLength = Value.getNbBytes( nameType.getValue() );
+ principalTypeLength = BerValue.getNbBytes( nameType.getValue() );
principalTypeTagLength = 1 + 1 + principalTypeLength;
principalNameSeqLength = 1 + TLV.getNbBytes( principalTypeTagLength ) + principalTypeTagLength;
@@ -399,7 +399,7 @@ public class PrincipalName extends Abstr
// The name-type, first the tag, then the value
buffer.put( ( byte ) 0xA0 );
buffer.put( TLV.getBytes( principalTypeTagLength ) );
- Value.encode( buffer, nameType.getValue() );
+ BerValue.encode( buffer, nameType.getValue() );
// The name-string tag
buffer.put( ( byte ) 0xA1 );
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.codec.types.TransitedEncodingType;
import org.apache.directory.shared.util.Strings;
@@ -152,7 +152,7 @@ public class TransitedEncoding extends A
public int computeLength()
{
// Compute the trType. The Length will always be contained in 1 byte
- trTypeLength = 1 + 1 + Value.getNbBytes( trType.getValue() );
+ trTypeLength = 1 + 1 + BerValue.getNbBytes( trType.getValue() );
transitedEncodingLength = 1 + TLV.getNbBytes( trTypeLength ) + trTypeLength;
// Compute the contents length
@@ -168,7 +168,7 @@ public class TransitedEncoding extends A
transitedEncodingLength += 1 + TLV.getNbBytes( contentsLength ) + contentsLength;
// Compute the whole sequence length
- int transitedEncodingSeqLength = 1 + Value.getNbBytes( transitedEncodingLength ) + transitedEncodingLength;
+ int transitedEncodingSeqLength = 1 + BerValue.getNbBytes( transitedEncodingLength ) + transitedEncodingLength;
return transitedEncodingSeqLength;
}
@@ -205,12 +205,12 @@ public class TransitedEncoding extends A
// The tr-type, first the tag, then the value
buffer.put( ( byte ) KerberosConstants.TRANSITED_ENCODING_TR_TYPE_TAG );
buffer.put( TLV.getBytes( trTypeLength ) );
- Value.encode( buffer, trType.getValue() );
+ BerValue.encode( buffer, trType.getValue() );
// The contents, first the tag, then the value
buffer.put( ( byte ) KerberosConstants.TRANSITED_ENCODING_CONTENTS_TAG );
buffer.put( TLV.getBytes( contentsLength ) );
- Value.encode( buffer, contents );
+ BerValue.encode( buffer, contents );
}
catch ( BufferOverflowException boe )
{
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -187,7 +187,7 @@ public class TypedData extends AbstractA
for ( TD td : typedDataList )
{
- int adTypeLen = Value.getNbBytes( td.dataType );
+ int adTypeLen = BerValue.getNbBytes( td.dataType );
dataTypeTagLength[i] = 1 + TLV.getNbBytes( adTypeLen ) + adTypeLen;
typedDataSeqLength[i] = 1 + TLV.getNbBytes( dataTypeTagLength[i] ) + dataTypeTagLength[i];
@@ -231,14 +231,14 @@ public class TypedData extends AbstractA
// the tdType
buffer.put( ( byte ) KerberosConstants.TYPED_DATA_TDTYPE_TAG );
buffer.put( TLV.getBytes( dataTypeTagLength[i] ) );
- Value.encode( buffer, td.dataType );
+ BerValue.encode( buffer, td.dataType );
if ( td.dataValue != null )
{
// the tdData
buffer.put( ( byte ) KerberosConstants.TYPED_DATA_TDDATA_TAG );
buffer.put( TLV.getBytes( dataValueTagLength[i] ) );
- Value.encode( buffer, td.dataValue );
+ BerValue.encode( buffer, td.dataValue );
}
i++;
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -27,7 +27,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.EncryptedData;
@@ -124,10 +124,10 @@ public class ApRep extends KerberosMessa
public int computeLength()
{
// Compute the PVNO length.
- pvnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
+ pvnoLength = 1 + 1 + BerValue.getNbBytes( getProtocolVersionNumber() );
// Compute the msg-type length
- msgTypeLength = 1 + 1 + Value.getNbBytes( getMessageType().getValue() );
+ msgTypeLength = 1 + 1 + BerValue.getNbBytes( getMessageType().getValue() );
// Compute the enc-part length
encPartLength = encPart.computeLength();
@@ -174,7 +174,7 @@ public class ApRep extends KerberosMessa
buffer.put( TLV.getBytes( pvnoLength ) );
// The value
- Value.encode( buffer, getProtocolVersionNumber() );
+ BerValue.encode( buffer, getProtocolVersionNumber() );
// The msg-type ---------------------------------------------------
// The tag
@@ -182,7 +182,7 @@ public class ApRep extends KerberosMessa
buffer.put( TLV.getBytes( msgTypeLength ) );
// The value
- Value.encode( buffer, getMessageType().getValue() );
+ BerValue.encode( buffer, getMessageType().getValue() );
// The enc-part ---------------------------------------------------
// The tag
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -27,7 +27,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.codec.options.ApOptions;
@@ -221,10 +221,10 @@ public class ApReq extends KerberosMessa
reset();
// Compute the PVNO length.
- pvnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
+ pvnoLength = 1 + 1 + BerValue.getNbBytes( getProtocolVersionNumber() );
// Compute the msg-type length
- msgTypeLength = 1 + 1 + Value.getNbBytes( getMessageType().getValue() );
+ msgTypeLength = 1 + 1 + BerValue.getNbBytes( getMessageType().getValue() );
// Compute the APOptions length
apOptionsLength = 1 + 1 + apOptions.getBytes().length;
@@ -279,7 +279,7 @@ public class ApReq extends KerberosMessa
buffer.put( TLV.getBytes( pvnoLength ) );
// The value
- Value.encode( buffer, getProtocolVersionNumber() );
+ BerValue.encode( buffer, getProtocolVersionNumber() );
// The msg-type ---------------------------------------------------
// The tag
@@ -287,7 +287,7 @@ public class ApReq extends KerberosMessa
buffer.put( TLV.getBytes( msgTypeLength ) );
// The value
- Value.encode( buffer, getMessageType().getValue() );
+ BerValue.encode( buffer, getMessageType().getValue() );
// The ap-options -------------------------------------------------
// The tag
@@ -295,7 +295,7 @@ public class ApReq extends KerberosMessa
buffer.put( TLV.getBytes( apOptionsLength ) );
// The value
- Value.encode( buffer, apOptions );
+ BerValue.encode( buffer, apOptions );
// The ticket -----------------------------------------------------
// The tag
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -27,7 +27,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.KerberosTime;
@@ -327,7 +327,7 @@ public class Authenticator extends Kerbe
reset();
// Compute the Authenticator version length.
- authenticatorVnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
+ authenticatorVnoLength = 1 + 1 + BerValue.getNbBytes( getProtocolVersionNumber() );
authenticatorSeqLength = 1 + TLV.getNbBytes( authenticatorVnoLength ) + authenticatorVnoLength;
// Compute the crealm length.
@@ -347,7 +347,7 @@ public class Authenticator extends Kerbe
}
// Compute the cusec length
- cusecLength = 1 + 1 + Value.getNbBytes( cusec );
+ cusecLength = 1 + 1 + BerValue.getNbBytes( cusec );
authenticatorSeqLength += 1 + TLV.getNbBytes( cusecLength ) + cusecLength;
// Compute the ctime length
@@ -364,7 +364,7 @@ public class Authenticator extends Kerbe
// Compute the seq-number length if any
if ( seqNumber != null )
{
- seqNumberLength = 1 + 1 + Value.getNbBytes( seqNumber );
+ seqNumberLength = 1 + 1 + BerValue.getNbBytes( seqNumber );
authenticatorSeqLength += 1 + TLV.getNbBytes( seqNumberLength ) + seqNumberLength;
}
@@ -434,7 +434,7 @@ public class Authenticator extends Kerbe
buffer.put( TLV.getBytes( authenticatorVnoLength ) );
// The value
- Value.encode( buffer, getProtocolVersionNumber() );
+ BerValue.encode( buffer, getProtocolVersionNumber() );
// The crealm -----------------------------------------------------
// The tag
@@ -471,7 +471,7 @@ public class Authenticator extends Kerbe
buffer.put( TLV.getBytes( cusecLength ) );
// The value
- Value.encode( buffer, cusec );
+ BerValue.encode( buffer, cusec );
// The ctime ------------------------------------------------------
// The tag
@@ -500,7 +500,7 @@ public class Authenticator extends Kerbe
buffer.put( TLV.getBytes( seqNumberLength ) );
// The value
- Value.encode( buffer, seqNumber );
+ BerValue.encode( buffer, seqNumber );
// The authorization-data, if any ---------------------------------
if ( authorizationData != null )
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -27,7 +27,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.KerberosTime;
@@ -194,7 +194,7 @@ public class EncApRepPart extends Kerber
encApRepPartSeqLength = 1 + TLV.getNbBytes( ctimeLength ) + ctimeLength;
// Compute the cusec length
- cusecLength = 1 + 1 + Value.getNbBytes( cusec );
+ cusecLength = 1 + 1 + BerValue.getNbBytes( cusec );
encApRepPartSeqLength += 1 + TLV.getNbBytes( cusecLength ) + cusecLength;
// Compute the subkey length, if any
@@ -207,7 +207,7 @@ public class EncApRepPart extends Kerber
// Compute the sequence size, if any
if ( seqNumber != null )
{
- seqNumberLength = 1 + 1 + Value.getNbBytes( seqNumber );
+ seqNumberLength = 1 + 1 + BerValue.getNbBytes( seqNumber );
encApRepPartSeqLength += 1 + TLV.getNbBytes( seqNumberLength ) + seqNumberLength;
}
@@ -269,7 +269,7 @@ public class EncApRepPart extends Kerber
buffer.put( TLV.getBytes( cusecLength ) );
// The value
- Value.encode( buffer, cusec );
+ BerValue.encode( buffer, cusec );
// The subkey if any ----------------------------------------------
if ( subkey != null )
@@ -290,7 +290,7 @@ public class EncApRepPart extends Kerber
buffer.put( TLV.getBytes( seqNumberLength ) );
// The value
- Value.encode( buffer, seqNumber );
+ BerValue.encode( buffer, seqNumber );
}
}
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -30,7 +30,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.EncryptedData;
@@ -116,7 +116,7 @@ public class KrbCred extends KerberosMes
pvnoLen = 1 + 1 + 1;
krbCredSeqLen = 1 + TLV.getNbBytes( pvnoLen ) + pvnoLen;
- msgTypeLen = 1 + 1 + Value.getNbBytes( getMessageType().getValue() );
+ msgTypeLen = 1 + 1 + BerValue.getNbBytes( getMessageType().getValue() );
krbCredSeqLen += 1 + TLV.getNbBytes( msgTypeLen ) + msgTypeLen;
for ( Ticket t : tickets )
@@ -157,12 +157,12 @@ public class KrbCred extends KerberosMes
// pvno tag and value
buffer.put( ( byte ) KerberosConstants.KRB_CRED_PVNO_TAG );
buffer.put( TLV.getBytes( pvnoLen ) );
- Value.encode( buffer, getProtocolVersionNumber() );
+ BerValue.encode( buffer, getProtocolVersionNumber() );
// msg-type tag and value
buffer.put( ( byte ) KerberosConstants.KRB_CRED_MSGTYPE_TAG );
buffer.put( TLV.getBytes( msgTypeLen ) );
- Value.encode( buffer, getMessageType().getValue() );
+ BerValue.encode( buffer, getMessageType().getValue() );
// tickets tag and value
buffer.put( ( byte ) KerberosConstants.KRB_CRED_TICKETS_TAG );
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -27,7 +27,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.KerberosTime;
@@ -404,7 +404,7 @@ public class KrbError extends KerberosMe
krbErrorSeqLength = 1 + TLV.getNbBytes( pvnoLength ) + pvnoLength;
// The message type
- msgTypeLength = 1 + 1 + Value.getNbBytes( getMessageType().getValue() );
+ msgTypeLength = 1 + 1 + BerValue.getNbBytes( getMessageType().getValue() );
krbErrorSeqLength += 1 + TLV.getNbBytes( msgTypeLength ) + msgTypeLength;
// The ctime, if any
@@ -417,7 +417,7 @@ public class KrbError extends KerberosMe
// The cusec, if any
if ( cusec != null )
{
- int cusecLen = Value.getNbBytes( cusec );
+ int cusecLen = BerValue.getNbBytes( cusec );
cusecLength = 1 + TLV.getNbBytes( cusecLen ) + cusecLen;
krbErrorSeqLength += 1 + TLV.getNbBytes( cusecLength ) + cusecLength;
}
@@ -427,12 +427,12 @@ public class KrbError extends KerberosMe
krbErrorSeqLength += 1 + TLV.getNbBytes( sTimeLength ) + sTimeLength;
// The susec
- int susecLen = Value.getNbBytes( susec );
+ int susecLen = BerValue.getNbBytes( susec );
susecLength = 1 + TLV.getNbBytes( susecLen ) + susecLen;
krbErrorSeqLength += 1 + TLV.getNbBytes( susecLength ) + susecLength;
// The error-code
- errorCodeLength = 1 + 1 + Value.getNbBytes( errorCode.getValue() );
+ errorCodeLength = 1 + 1 + BerValue.getNbBytes( errorCode.getValue() );
krbErrorSeqLength += 1 + TLV.getNbBytes( errorCodeLength ) + errorCodeLength;
// The crealm, if any
@@ -537,12 +537,12 @@ public class KrbError extends KerberosMe
// pvno tag and value
buffer.put( ( byte ) KerberosConstants.KRB_ERROR_PVNO_TAG );
buffer.put( TLV.getBytes( pvnoLength ) );
- Value.encode( buffer, getProtocolVersionNumber() );
+ BerValue.encode( buffer, getProtocolVersionNumber() );
// msg-type tag and value
buffer.put( ( byte ) KerberosConstants.KRB_ERROR_MSGTYPE_TAG );
buffer.put( TLV.getBytes( msgTypeLength ) );
- Value.encode( buffer, getMessageType().getValue() );
+ BerValue.encode( buffer, getMessageType().getValue() );
// ctime tag and value if any
if ( cTimeLength > 0 )
@@ -562,7 +562,7 @@ public class KrbError extends KerberosMe
{
buffer.put( ( byte ) KerberosConstants.KRB_ERROR_CUSEC_TAG );
buffer.put( TLV.getBytes( cusecLength ) );
- Value.encode( buffer, cusec );
+ BerValue.encode( buffer, cusec );
}
// stime tag and value
@@ -578,12 +578,12 @@ public class KrbError extends KerberosMe
// susec tag and value
buffer.put( ( byte ) KerberosConstants.KRB_ERROR_SUSEC_TAG );
buffer.put( TLV.getBytes( susecLength ) );
- Value.encode( buffer, susec );
+ BerValue.encode( buffer, susec );
// error-code tag and value
buffer.put( ( byte ) KerberosConstants.KRB_ERROR_ERROR_CODE_TAG );
buffer.put( TLV.getBytes( errorCodeLength ) );
- Value.encode( buffer, errorCode.getValue() );
+ BerValue.encode( buffer, errorCode.getValue() );
// crealm tage and value, if any
if ( cRealm != null )
@@ -635,7 +635,7 @@ public class KrbError extends KerberosMe
{
buffer.put( ( byte ) KerberosConstants.KRB_ERROR_EDATA_TAG );
buffer.put( TLV.getBytes( eDataLength ) );
- Value.encode( buffer, eData );
+ BerValue.encode( buffer, eData );
}
}
catch ( BufferOverflowException boe )
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.EncryptedData;
@@ -121,7 +121,7 @@ public class KrbPriv extends KerberosMes
pvnoLen = 1 + 1 + 1;
krbPrivSeqLen = 1 + TLV.getNbBytes( pvnoLen ) + pvnoLen;
- msgTypeLength = 1 + 1 + Value.getNbBytes( getMessageType().getValue() );
+ msgTypeLength = 1 + 1 + BerValue.getNbBytes( getMessageType().getValue() );
krbPrivSeqLen += 1 + TLV.getNbBytes( msgTypeLength ) + msgTypeLength;
encPartLen = encPart.computeLength();
@@ -157,12 +157,12 @@ public class KrbPriv extends KerberosMes
// pvno tag and value
buffer.put( ( byte ) KerberosConstants.KRB_PRIV_PVNO_TAG );
buffer.put( TLV.getBytes( pvnoLen ) );
- Value.encode( buffer, getProtocolVersionNumber() );
+ BerValue.encode( buffer, getProtocolVersionNumber() );
// msg-type tag and value
buffer.put( ( byte ) KerberosConstants.KRB_PRIV_MSGTYPE_TAG );
buffer.put( TLV.getBytes( msgTypeLength ) );
- Value.encode( buffer, getMessageType().getValue() );
+ BerValue.encode( buffer, getMessageType().getValue() );
// enc-part
buffer.put( ( byte ) KerberosConstants.KRB_PRIV_ENC_PART_TAG );
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.Checksum;
@@ -151,7 +151,7 @@ public class KrbSafe extends KerberosMes
pvnoLen = 1 + 1 + 1;
krbSafeSeqLen = 1 + TLV.getNbBytes( pvnoLen ) + pvnoLen;
- msgTypeLength = 1 + 1 + Value.getNbBytes( getMessageType().getValue() );
+ msgTypeLength = 1 + 1 + BerValue.getNbBytes( getMessageType().getValue() );
krbSafeSeqLen += 1 + TLV.getNbBytes( msgTypeLength ) + msgTypeLength;
krbSafeBodyLen = krbSafeBody.computeLength();
@@ -190,12 +190,12 @@ public class KrbSafe extends KerberosMes
// pvno tag and value
buffer.put( ( byte ) KerberosConstants.KRB_SAFE_PVNO_TAG );
buffer.put( TLV.getBytes( pvnoLen ) );
- Value.encode( buffer, getProtocolVersionNumber() );
+ BerValue.encode( buffer, getProtocolVersionNumber() );
// msg-type tag and value
buffer.put( ( byte ) KerberosConstants.KRB_SAFE_MSGTYPE_TAG );
buffer.put( TLV.getBytes( msgTypeLength ) );
- Value.encode( buffer, getMessageType().getValue() );
+ BerValue.encode( buffer, getMessageType().getValue() );
// safe-body tag and value
buffer.put( ( byte ) KerberosConstants.KRB_SAFE_SAFE_BODY_TAG );
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=1332645&r1=1332644&r2=1332645&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 Tue May 1 13:29:22 2012
@@ -27,7 +27,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.EncTicketPart;
@@ -252,7 +252,7 @@ public class Ticket extends KerberosMess
public int computeLength()
{
// Compute the Ticket version length.
- tktvnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
+ tktvnoLength = 1 + 1 + BerValue.getNbBytes( getProtocolVersionNumber() );
// Compute the Ticket realm length.
realmBytes = Strings.getBytesUtf8( realm );
@@ -314,7 +314,7 @@ public class Ticket extends KerberosMess
// The tkt-vno Tag and value
buffer.put( ( byte ) KerberosConstants.TICKET_TKT_VNO_TAG );
buffer.put( TLV.getBytes( tktvnoLength ) );
- Value.encode( buffer, getProtocolVersionNumber() );
+ BerValue.encode( buffer, getProtocolVersionNumber() );
// The realm Tag and value
buffer.put( ( byte ) KerberosConstants.TICKET_REALM_TAG );
Modified: directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java (original)
+++ directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java Tue May 1 13:29:22 2012
@@ -51,7 +51,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext;
import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
import org.apache.directory.server.core.api.normalization.FilterNormalizingVisitor;
-import org.apache.directory.server.core.api.partition.Partition;
import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
@@ -198,7 +197,7 @@ public class SingleFileLdifPartitionTest
* @param fileName the full path to the ldif file to be loaded
* @param truncate the flag to determine to truncate the file or not
* @return the ldif partition after loading all the data
- * @throws Exception
+ * @throws Exception
*/
private SingleFileLdifPartition createPartition( String fileName, boolean truncate ) throws Exception
{
@@ -408,7 +407,7 @@ public class SingleFileLdifPartitionTest
partition.add( addCtx );
- // now perform a modification on the entry present in middle of LDIF file
+ // now perform a modification on the entry present in middle of LDIF file
modOpCtx = new ModifyOperationContext( mockSession );
modOpCtx.setEntry( new ClonedServerEntry( entry1 ) );
modOpCtx.setDn( entry1.getDn() );
@@ -868,7 +867,7 @@ public class SingleFileLdifPartitionTest
/**
* An important test to check the stability of the partition
- * under high concurrency
+ * under high concurrency
*
* @throws Exception
*/
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java Tue May 1 13:29:22 2012
@@ -31,7 +31,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.ldap.handlers.controls.PagedSearchContext;
-import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.message.AbandonableRequest;
import org.apache.directory.shared.ldap.model.message.BindStatus;
import org.apache.mina.core.session.IoSession;
@@ -172,7 +171,7 @@ public class LdapSession
/**
* Gets the MINA IoSession associated with this LdapSession.
*
- * @return the MINA IoSession
+ * @return the MINA IoSession
*/
public IoSession getIoSession()
{
@@ -181,7 +180,7 @@ public class LdapSession
/**
- * Gets the logical core DirectoryService session associated with this
+ * Gets the logical core DirectoryService session associated with this
* LdapSession.
*
* @return the logical core DirectoryService session
@@ -193,7 +192,7 @@ public class LdapSession
/**
- * Sets the logical core DirectoryService session.
+ * Sets the logical core DirectoryService session.
*
* @param coreSession the logical core DirectoryService session
*/
@@ -286,7 +285,7 @@ public class LdapSession
/**
- * @return A list of all the abandonable requests for this session.
+ * @return A list of all the abandonable requests for this session.
*/
public Map<Integer, AbandonableRequest> getOutstandingRequests()
{
@@ -419,7 +418,7 @@ public class LdapSession
/**
* Add a new Paged Search context into the stored context. If some
- * context with the same id already exists, it will be closed and
+ * context with the same id already exists, it will be closed and
* removed.
*
* @param context The context to add
@@ -481,8 +480,8 @@ public class LdapSession
}
/**
- * Get paged search context associated with an ID
- * @param contextId The id for teh context we want to get
+ * Get paged search context associated with an ID
+ * @param contextId The id for teh context we want to get
* @return The associated context, if any
*/
public PagedSearchContext getPagedSearchContext( int contextId )
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java Tue May 1 13:29:22 2012
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.message.SearchRequest;
@@ -73,7 +73,7 @@ public class PagedSearchContext
// a user may send more than one PagedSearch on the same session.
cookieValue = new AtomicInteger( searchRequest.getMessageId() << 16 );
- cookie = Value.getBytes( cookieValue.get() );
+ cookie = BerValue.getBytes( cookieValue.get() );
}
@@ -104,7 +104,7 @@ public class PagedSearchContext
*/
public byte[] getNewCookie()
{
- cookie = Value.getBytes( cookieValue.incrementAndGet() );
+ cookie = BerValue.getBytes( cookieValue.incrementAndGet() );
return cookie;
}
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Tue May 1 13:29:22 2012
@@ -34,8 +34,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.naming.directory.SearchControls;
-
import org.apache.directory.server.config.beans.AdsBaseBean;
import org.apache.directory.server.config.beans.ConfigBean;
import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition;
@@ -132,7 +130,7 @@ public class ConfigPartitionReader
{
String ocName = ocValue.getString();
String ocOid = schemaManager.getObjectClassRegistry().getOidByName( ocName );
- ObjectClass oc = ( ObjectClass ) schemaManager.getObjectClassRegistry().get( ocOid );
+ ObjectClass oc = schemaManager.getObjectClassRegistry().get( ocOid );
if ( oc.isStructural() )
{
@@ -151,7 +149,7 @@ public class ConfigPartitionReader
{
String ocName = ocValue.getString();
String ocOid = schemaManager.getObjectClassRegistry().getOidByName( ocName );
- ObjectClass oc = ( ObjectClass ) schemaManager.getObjectClassRegistry().get( ocOid );
+ ObjectClass oc = schemaManager.getObjectClassRegistry().get( ocOid );
for ( ObjectClass superior : oc.getSuperiors() )
{
@@ -174,8 +172,8 @@ public class ConfigPartitionReader
}
- /**
- * Create the base Bean from the ObjectClass name.
+ /**
+ * Create the base Bean from the ObjectClass name.
* The bean name is constructed using the OjectClass name, by
* removing the ADS prefix, upper casing the first letter and adding "Bean" at the end.
*
@@ -717,7 +715,7 @@ public class ConfigPartitionReader
/**
- * Read some configuration element from the DIT using its name
+ * Read some configuration element from the DIT using its name
*/
private List<AdsBaseBean> read( Dn baseDn, String name, SearchScope scope, boolean mandatory )
throws ConfigurationException
Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java (original)
+++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java Tue May 1 13:29:22 2012
@@ -35,8 +35,6 @@ import java.util.Map.Entry;
import java.util.Stack;
import java.util.regex.Pattern;
-import javax.management.RuntimeErrorException;
-
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
import org.apache.directory.shared.ldap.schemaextractor.impl.ResourceMap;
@@ -49,8 +47,8 @@ import org.slf4j.LoggerFactory;
* A class to copy the default config to the work directory of a DirectoryService instance.
*
* NOTE: much of this class code is duplicated from DefaultSchemaLdifExtractor class
- * We should create a AbstractLdifExtractor class and move the reusable code there
- *
+ * We should create a AbstractLdifExtractor class and move the reusable code there
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class LdifConfigExtractor
@@ -119,7 +117,7 @@ public class LdifConfigExtractor
/**
- * Copies a file line by line from the source file argument to the
+ * Copies a file line by line from the source file argument to the
* destination file argument.
*
* @param source the source file to copy
@@ -228,8 +226,8 @@ public class LdifConfigExtractor
{
if ( parent.getName().equals( "config" ) )
{
- // All LDIF files besides the config.ldif are under the
- // config/config base path. So we need to add one more
+ // All LDIF files besides the config.ldif are under the
+ // config/config base path. So we need to add one more
// schema component to all LDIF files minus this config.ldif
fileComponentStack.push( "config" );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java Tue May 1 13:29:22 2012
@@ -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.add;
@@ -30,7 +30,6 @@ import org.apache.directory.server.annot
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.server.integ.ServerIntegrationUtils;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.cursor.EntryCursor;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -79,7 +78,7 @@ public class AddingEntriesWithSpecialCha
/**
* adding an entry with hash sign (#) in Rdn.
*
- * @throws Exception
+ * @throws Exception
*/
@Test
public void testAddingWithHashRdn() throws Exception
@@ -117,8 +116,8 @@ public class AddingEntriesWithSpecialCha
/**
* adding an entry with comma sign (,) in Rdn.
- *
- * @throws Exception
+ *
+ * @throws Exception
*/
@Test
public void testAddingWithCommaInRdn() throws Exception
@@ -229,7 +228,7 @@ public class AddingEntriesWithSpecialCha
/**
* adding an entry with greater sign (>) in Rdn.
*
- * @throws Exception
+ * @throws Exception
*/
@Test
public void testAddingWithGreaterSignInRdn() throws Exception
@@ -269,7 +268,7 @@ public class AddingEntriesWithSpecialCha
/**
* adding an entry with less sign (<) in Rdn.
*
- * @throws Exception
+ * @throws Exception
*/
@Test
public void testAddingWithLessSignInRdn() throws Exception
@@ -309,7 +308,7 @@ public class AddingEntriesWithSpecialCha
/**
* adding an entry with semicolon (;) in Rdn.
*
- * @throws Exception
+ * @throws Exception
*/
@Test
public void testAddingWithSemicolonInRdn() throws Exception
@@ -349,7 +348,7 @@ public class AddingEntriesWithSpecialCha
/**
* adding an entry with equals sign (=) in Rdn.
*
- * @throws Exception
+ * @throws Exception
*/
@Test
public void testAddingWithEqualsInRdn() throws Exception
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java Tue May 1 13:29:22 2012
@@ -40,7 +40,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.model.exception.LdapContextNotEmptyException;
import org.apache.directory.shared.ldap.model.exception.LdapNoSuchObjectException;
-import org.apache.directory.shared.ldap.model.exception.LdapOperationException;
import org.apache.directory.shared.ldap.model.message.Control;
import org.apache.directory.shared.ldap.model.message.DeleteRequest;
import org.apache.directory.shared.ldap.model.message.DeleteRequestImpl;
@@ -97,7 +96,7 @@ public class DeleteIT extends AbstractLd
/**
- * Tests normal delete operation on normal non-referral entries without
+ * Tests normal delete operation on normal non-referral entries without
* the ManageDsaIT control.
*/
@Test
@@ -122,7 +121,7 @@ public class DeleteIT extends AbstractLd
/**
- * Tests normal delete operation on normal non-referral entries without
+ * Tests normal delete operation on normal non-referral entries without
* the ManageDsaIT control.
*/
@Test
@@ -150,7 +149,7 @@ public class DeleteIT extends AbstractLd
/**
- * Tests normal delete operation on non-existent entries without
+ * Tests normal delete operation on non-existent entries without
* the ManageDsaIT control.
*/
@Test
@@ -199,7 +198,7 @@ public class DeleteIT extends AbstractLd
/**
- * Tests delete operation on normal and referral entries without the
+ * Tests delete operation on normal and referral entries without the
* ManageDsaIT control. Referrals are sent back to the client with a
* non-success result code.
*/
@@ -227,8 +226,8 @@ public class DeleteIT extends AbstractLd
/**
- * Tests delete operation on normal and referral entries without the
- * ManageDsaIT control using JNDI instead of the Netscape API. Referrals
+ * Tests delete operation on normal and referral entries without the
+ * ManageDsaIT control using JNDI instead of the Netscape API. Referrals
* are sent back to the client with a non-success result code.
*/
@Test
Modified: directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java (original)
+++ directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java Tue May 1 13:29:22 2012
@@ -89,7 +89,7 @@ public class ApacheDS
/**
* Creates a new instance of the ApacheDS server
- *
+ *
* @param ldapServer The ldap server protocol handler
*/
public ApacheDS( LdapServer ldapServer ) throws Exception
@@ -112,7 +112,7 @@ public class ApacheDS
* <li>initialize the DirectoryService</li>
* <li>start the LDAP server</li>
* <li>start the LDAPS server</li>
- *
+ *
* @throws NamingException If the server cannot be started
* @throws IOException If an IO error occurred while reading some file
*/
@@ -338,7 +338,7 @@ public class ApacheDS
/**
* Load a ldif into the directory.
- *
+ *
* @param root The context in which we will inject the entries
* @param ldifFile The ldif file to read
* @throws NamingException If something went wrong while loading the entries
@@ -395,8 +395,6 @@ public class ApacheDS
return;
}
- Dn dn = new Dn( directoryService.getSchemaManager(), ServerDNConstants.ADMIN_SYSTEM_DN );
-
ensureLdifFileBase();
// if ldif directory is a file try to load it
@@ -503,7 +501,7 @@ public class ApacheDS
schemaPartition.setWrappedPartition( ldifPartition );
// We have to load the schema now, otherwise we won't be able
- // to initialize the Partitions, as we won't be able to parse
+ // to initialize the Partitions, as we won't be able to parse
// and normalize their suffix Dn
schemaManager.loadAllEnabled();