You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/02/25 18:37:19 UTC
svn commit: r1074645 [2/2] - in /directory/apacheds/branches/akarasulu: ./
all/ core-annotations/ core-api/
core-api/src/main/java/org/apache/directory/server/core/
core-api/src/main/java/org/apache/directory/server/core/entry/ core-avl/
core-avl/src/m...
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java Fri Feb 25 17:37:16 2011
@@ -28,9 +28,9 @@ import java.util.List;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.asn1.AbstractAsn1Object;
+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.EncoderException;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +61,7 @@ public class HostAddresses extends Abstr
private List<HostAddress> addresses;
// Storage for computed lengths
- private transient int addressesLength;
+ private int addressesLength;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java Fri Feb 25 17:37:16 2011
@@ -76,17 +76,17 @@ public class KdcRep extends KerberosMess
protected EncKdcRepPart encKdcRepPart;
// Storage for computed lengths
- private transient int pvnoLength;
- private transient int msgTypeLength;
- private transient int paDataLength;
- private transient int paDataSeqLength;
- private transient int[] paDataLengths;
- private transient int cnameLength;
- private transient int crealmLength;
- private transient int ticketLength;
- private transient int encPartLength;
- private transient int kdcRepSeqLength;
- private transient int kdcRepLength;
+ private int pvnoLength;
+ private int msgTypeLength;
+ private int paDataLength;
+ private int paDataSeqLength;
+ private int[] paDataLengths;
+ private int cnameLength;
+ private int crealmLength;
+ private int ticketLength;
+ private int encPartLength;
+ private int kdcRepSeqLength;
+ private int kdcRepLength;
/**
* Creates a new instance of KDC-REP.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java Fri Feb 25 17:37:16 2011
@@ -25,10 +25,10 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.server.i18n.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.EncoderException;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.messages.KerberosMessage;
@@ -58,14 +58,14 @@ public abstract class KdcReq extends Ker
private KdcReqBody kdcReqBody;
// Storage for computed lengths
- private transient int pvnoLength;
- private transient int msgTypeLength;
- private transient int paDataLength;
- private transient int paDataSeqLength;
- private transient int[] paDataLengths;
- private transient int kdcReqBodyLength;
- private transient int kdcReqSeqLength;
- private transient int kdcReqLength;
+ private int pvnoLength;
+ private int msgTypeLength;
+ private int paDataLength;
+ private int paDataSeqLength;
+ private int[] paDataLengths;
+ private int kdcReqBodyLength;
+ private int kdcReqSeqLength;
+ private int kdcReqLength;
/**
* Creates a new instance of KDC-REQ.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java Fri Feb 25 17:37:16 2011
@@ -106,25 +106,25 @@ public class KdcReqBody extends Abstract
private List<Ticket> additionalTickets;
// Storage for computed lengths
- private transient int kdcOptionsLength;
- private transient int cNameLength;
- private transient int realmLength;
- private transient byte[] realmBytes;
- private transient int sNameLength;
- private transient int fromLength;
- private transient int tillLength;
- private transient int rtimeLength;
- private transient int nonceLength;
- private transient int eTypeLength;
- private transient int eTypeSeqLength;
- private transient int[] eTypeLengths;
- private transient int addressesLength;
- private transient int encAuthzDataLength;
- private transient int additionalTicketLength;
- private transient int additionalTicketSeqLength;
- private transient int[] additionalTicketsLengths;
- private transient int kdcReqBodySeqLength;
- private transient int kdcReqBodyLength;
+ private int kdcOptionsLength;
+ private int cNameLength;
+ private int realmLength;
+ private byte[] realmBytes;
+ private int sNameLength;
+ private int fromLength;
+ private int tillLength;
+ private int rtimeLength;
+ private int nonceLength;
+ private int eTypeLength;
+ private int eTypeSeqLength;
+ private int[] eTypeLengths;
+ private int addressesLength;
+ private int encAuthzDataLength;
+ private int additionalTicketLength;
+ private int additionalTicketSeqLength;
+ private int[] additionalTicketsLengths;
+ private int kdcReqBodySeqLength;
+ private int kdcReqBodyLength;
/**
* Creates a new instance of RequestBody.
@@ -727,7 +727,7 @@ public class KdcReqBody extends Abstract
/**
- * reset the transient fields used while computing length
+ * reset the fields used while computing length
*/
private void reset()
{
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java Fri Feb 25 17:37:16 2011
@@ -96,24 +96,24 @@ public class KrbCredInfo extends Abstrac
/** the addresses for which the ticket can be used */
private HostAddresses clientAddresses;
- private transient int keyLen;
- private transient int pRealmLen;
- private transient byte[] pRealmBytes;
- private transient int pNameLen;
- private transient int ticketFlagsLen;
- private transient int authTimeLen;
- private transient byte[] authTimeBytes;
- private transient int startTimeLen;
- private transient byte[] startTimeBytes;
- private transient int endTimeLen;
- private transient byte[] endTimeBytes;
- private transient int renewtillLen;
- private transient byte[] renewtillBytes;
- private transient int sRealmLen;
- private transient byte[] sRealmBytes;
- private transient int sNameLen;
- private transient int clientAddressesLen;
- private transient int krbKredInfoSeqLen;
+ private int keyLen;
+ private int pRealmLen;
+ private byte[] pRealmBytes;
+ private int pNameLen;
+ private int ticketFlagsLen;
+ private int authTimeLen;
+ private byte[] authTimeBytes;
+ private int startTimeLen;
+ private byte[] startTimeBytes;
+ private int endTimeLen;
+ private byte[] endTimeBytes;
+ private int renewtillLen;
+ private byte[] renewtillBytes;
+ private int sRealmLen;
+ private byte[] sRealmBytes;
+ private int sNameLen;
+ private int clientAddressesLen;
+ private int krbKredInfoSeqLen;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java Fri Feb 25 17:37:16 2011
@@ -26,10 +26,10 @@ import java.nio.ByteBuffer;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.asn1.AbstractAsn1Object;
+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.EncoderException;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.util.Strings;
@@ -79,13 +79,13 @@ public class KrbSafeBody extends Abstrac
private HostAddress recipientAddress;
// Storage for computed lengths
- private transient int userDataLen;
- private transient int timestampLen;
- private transient int usecLen;
- private transient int seqNumberLen;
- private transient int senderAddressLen;
- private transient int recipientAddressLen;
- private transient int krbSafeBodySeqLen;
+ private int userDataLen;
+ private int timestampLen;
+ private int usecLen;
+ private int seqNumberLen;
+ private int senderAddressLen;
+ private int recipientAddressLen;
+ private int krbSafeBodySeqLen;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java Fri Feb 25 17:37:16 2011
@@ -67,10 +67,10 @@ public class LastReq extends AbstractAsn
// Storage for computed lengths
- private transient int lrTypeTagLen[];
- private transient int lrValueTagLen[];
- private transient int lastReqSeqLen[];
- private transient int lastReqSeqSeqLen;
+ private int lrTypeTagLen[];
+ private int lrValueTagLen[];
+ private int lastReqSeqLen[];
+ private int lastReqSeqSeqLen;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java Fri Feb 25 17:37:16 2011
@@ -56,7 +56,7 @@ public class MethodData extends Abstract
private List<PaData> paDatas;
// Storage for computed lengths
- private transient int methodDataLength;
+ private int methodDataLength;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java Fri Feb 25 17:37:16 2011
@@ -25,10 +25,10 @@ import java.nio.ByteBuffer;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.asn1.AbstractAsn1Object;
+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.EncoderException;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.codec.types.PaDataType;
import org.apache.directory.shared.util.Strings;
@@ -62,9 +62,9 @@ public class PaData extends AbstractAsn1
private byte[] paDataValue;
// Storage for computed lengths
- private transient int paDataTypeTagLength;
- private transient int paDataValueTagLength;
- private transient int preAuthenticationDataSeqLength;
+ private int paDataTypeTagLength;
+ private int paDataValueTagLength;
+ private int preAuthenticationDataSeqLength;
/**
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java Fri Feb 25 17:37:16 2011
@@ -25,10 +25,10 @@ import java.nio.ByteBuffer;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.asn1.AbstractAsn1Object;
+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.EncoderException;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.util.Strings;
@@ -63,9 +63,9 @@ public class PaEncTsEnc extends Abstract
private Integer pausec;
// Storage for computed lengths
- private transient int paTimestampLength;
- private transient int paUsecLength;
- private transient int paEncTsEncLength;
+ private int paTimestampLength;
+ private int paUsecLength;
+ private int paEncTsEncLength;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java Fri Feb 25 17:37:16 2011
@@ -133,14 +133,14 @@ public class PrincipalName extends Abstr
private List<String> nameString = new ArrayList<String>();
/** The principal name as a byte[], for encoding purpose */
- private transient List<byte[]> nameBytes;
+ private List<byte[]> nameBytes;
// Storage for computed lengths
- private transient int principalNameSeqLength;
- private transient int principalTypeTagLength;
- private transient int principalTypeLength;
- private transient int principalStringsTagLength;
- private transient int principalStringsSeqLength;
+ private int principalNameSeqLength;
+ private int principalTypeTagLength;
+ private int principalTypeLength;
+ private int principalStringsTagLength;
+ private int principalStringsSeqLength;
/**
* Creates a new empty instance of PrincipalName.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java Fri Feb 25 17:37:16 2011
@@ -69,9 +69,9 @@ public class TransitedEncoding extends A
private byte[] contents;
// Storage for computed lengths
- private transient int trTypeLength;
- private transient int contentsLength;
- private transient int transitedEncodingLength;
+ private int trTypeLength;
+ private int contentsLength;
+ private int transitedEncodingLength;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java Fri Feb 25 17:37:16 2011
@@ -28,10 +28,10 @@ import java.util.List;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.asn1.AbstractAsn1Object;
+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.EncoderException;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -90,10 +90,10 @@ public class TypedData extends AbstractA
private static final boolean IS_DEBUG = LOG.isDebugEnabled();
// Storage for computed lengths
- private transient int dataTypeTagLength[];
- private transient int dataValueTagLength[];
- private transient int typedDataSeqLength[];
- private transient int typedDataSeqSeqLength;
+ private int dataTypeTagLength[];
+ private int dataValueTagLength[];
+ private int typedDataSeqLength[];
+ private int typedDataSeqSeqLength;
/**
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java Fri Feb 25 17:37:16 2011
@@ -60,11 +60,11 @@ public class ApRep extends KerberosMessa
private EncryptedData encPart;
// Storage for computed lengths
- private transient int pvnoLength;
- private transient int msgTypeLength;
- private transient int encPartLength;
- private transient int apRepLength;
- private transient int apRepSeqLength;
+ private int pvnoLength;
+ private int msgTypeLength;
+ private int encPartLength;
+ private int apRepLength;
+ private int apRepSeqLength;
/**
* Creates a new instance of AP-REP.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java Fri Feb 25 17:37:16 2011
@@ -67,13 +67,13 @@ public class ApReq extends KerberosMessa
private EncryptedData authenticator;
// Storage for computed lengths
- private transient int pvnoLength;
- private transient int msgTypeLength;
- private transient int apOptionsLength;
- private transient int ticketLength;
- private transient int authenticatorLength;
- private transient int apReqLength;
- private transient int apReqSeqLength;
+ private int pvnoLength;
+ private int msgTypeLength;
+ private int apOptionsLength;
+ private int ticketLength;
+ private int authenticatorLength;
+ private int apReqLength;
+ private int apReqSeqLength;
/**
* Creates a new instance of ApplicationRequest.
@@ -329,7 +329,7 @@ public class ApReq extends KerberosMessa
/**
- * reset the transient fields used while computing length
+ * reset the fields used while computing length
*/
private void reset()
{
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java Fri Feb 25 17:37:16 2011
@@ -43,8 +43,8 @@ import org.apache.directory.shared.kerbe
public class AsRep extends KdcRep
{
// Storage for computed lengths
- private transient int kdcRepLength;
- private transient int asRepLength;
+ private int kdcRepLength;
+ private int asRepLength;
/**
* Creates a new instance of AS-REP.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsReq.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsReq.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsReq.java Fri Feb 25 17:37:16 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.kerbe
public class AsReq extends KdcReq
{
// Storage for computed lengths
- private transient int kdcReqLength;
+ private int kdcReqLength;
/**
* Creates a new instance of AS-REQ.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java Fri Feb 25 17:37:16 2011
@@ -95,18 +95,18 @@ public class Authenticator extends Kerbe
private AuthorizationData authorizationData;
// Storage for computed lengths
- private transient int authenticatorVnoLength;
- private transient int crealmLength;
- private transient byte[] crealmBytes;
- private transient int cnameLength;
- private transient int cksumLength;
- private transient int cusecLength;
- private transient int ctimeLength;
- private transient int subkeyLength;
- private transient int seqNumberLength;
- private transient int authorizationDataLength;
- private transient int authenticatorSeqLength;
- private transient int authenticatorLength;
+ private int authenticatorVnoLength;
+ private int crealmLength;
+ private byte[] crealmBytes;
+ private int cnameLength;
+ private int cksumLength;
+ private int cusecLength;
+ private int ctimeLength;
+ private int subkeyLength;
+ private int seqNumberLength;
+ private int authorizationDataLength;
+ private int authenticatorSeqLength;
+ private int authenticatorLength;
@@ -533,7 +533,7 @@ public class Authenticator extends Kerbe
/**
- * reset the transient fields used while computing length
+ * reset the fields used while computing length
*/
private void reset()
{
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java Fri Feb 25 17:37:16 2011
@@ -23,10 +23,10 @@ import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import org.apache.directory.server.i18n.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.EncoderException;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.KerberosTime;
@@ -71,12 +71,12 @@ public class EncApRepPart extends Kerber
private Integer seqNumber; //optional
// Storage for computed lengths
- private transient int ctimeLength;
- private transient int cusecLength;
- private transient int subKeyLength;
- private transient int seqNumberLength;
- private transient int encApRepPartSeqLength;
- private transient int encApRepPartLength;
+ private int ctimeLength;
+ private int cusecLength;
+ private int subKeyLength;
+ private int seqNumberLength;
+ private int encApRepPartSeqLength;
+ private int encApRepPartLength;
/**
* Creates a new instance of EncApRepPart.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncAsRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncAsRepPart.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncAsRepPart.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncAsRepPart.java Fri Feb 25 17:37:16 2011
@@ -22,8 +22,8 @@ package org.apache.directory.shared.kerb
import java.nio.ByteBuffer;
-import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.EncoderException;
+import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.EncKdcRepPart;
@@ -43,7 +43,7 @@ public class EncAsRepPart extends Kerber
private EncKdcRepPart encKdcRepPart;
// Storage for computed lengths
- private transient int encKdcRepPartLength;
+ private int encKdcRepPartLength;
/**
* Creates a new instance of EncAsRepPart.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncTgsRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncTgsRepPart.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncTgsRepPart.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncTgsRepPart.java Fri Feb 25 17:37:16 2011
@@ -22,8 +22,8 @@ package org.apache.directory.shared.kerb
import java.nio.ByteBuffer;
-import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.EncoderException;
+import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.EncKdcRepPart;
@@ -43,7 +43,7 @@ public class EncTgsRepPart extends Kerbe
private EncKdcRepPart encKdcRepPart;
// Storage for computed lengths
- private transient int encKdcRepPartLength;
+ private int encKdcRepPartLength;
/**
* Creates a new instance of EncTgsRepPart.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java Fri Feb 25 17:37:16 2011
@@ -64,13 +64,13 @@ public class KrbCred extends KerberosMes
private EncryptedData encPart;
- private transient int pvnoLen;
- private transient int msgTypeLen;
- private transient int ticketsSeqLen;
- private transient int ticketsLen;
- private transient int encPartLen;
- private transient int krbCredSeqLen;
- private transient int krbCredLen;
+ private int pvnoLen;
+ private int msgTypeLen;
+ private int ticketsSeqLen;
+ private int ticketsLen;
+ private int encPartLen;
+ private int krbCredSeqLen;
+ private int krbCredLen;
/**
* Creates a new instance of KrbCred.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java Fri Feb 25 17:37:16 2011
@@ -24,10 +24,10 @@ import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import org.apache.directory.server.i18n.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.EncoderException;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.KerberosTime;
@@ -103,24 +103,24 @@ public class KrbError extends KerberosMe
private byte[] eData;
// Storage for computed lengths
- private transient int pvnoLength;
- private transient int msgTypeLength;
- private transient int cTimeLength;
- private transient int cusecLength;
- private transient int sTimeLength;
- private transient int susecLength;
- private transient int errorCodeLength;
- private transient int cRealmLength;
- private transient byte[] crealmBytes;
- private transient int cNameLength;
- private transient int realmLength;
- private transient byte[] realmBytes;
- private transient int sNameLength;
- private transient int eTextLength;
- private transient byte[] eTextBytes;
- private transient int eDataLength;
- private transient int krbErrorSeqLength;
- private transient int krbErrorLength;
+ private int pvnoLength;
+ private int msgTypeLength;
+ private int cTimeLength;
+ private int cusecLength;
+ private int sTimeLength;
+ private int susecLength;
+ private int errorCodeLength;
+ private int cRealmLength;
+ private byte[] crealmBytes;
+ private int cNameLength;
+ private int realmLength;
+ private byte[] realmBytes;
+ private int sNameLength;
+ private int eTextLength;
+ private byte[] eTextBytes;
+ private int eDataLength;
+ private int krbErrorSeqLength;
+ private int krbErrorLength;
/**
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
/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,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java Fri Feb 25 17:37:16 2011
@@ -62,11 +62,11 @@ public class KrbPriv extends KerberosMes
private EncryptedData encPart;
// Storage for computed lengths
- private transient int pvnoLen;
- private transient int msgTypeLength;
- private transient int encPartLen;
- private transient int krbPrivSeqLen;
- private transient int krbPrivLen;
+ private int pvnoLen;
+ private int msgTypeLength;
+ private int encPartLen;
+ private int krbPrivSeqLen;
+ private int krbPrivLen;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java Fri Feb 25 17:37:16 2011
@@ -66,12 +66,12 @@ public class KrbSafe extends KerberosMes
private Checksum checksum;
// Storage for computed lengths
- private transient int pvnoLen;
- private transient int msgTypeLength;
- private transient int krbSafeBodyLen;
- private transient int checksumLen;
- private transient int krbSafeSeqLen;
- private transient int krbSafeLen;
+ private int pvnoLen;
+ private int msgTypeLength;
+ private int krbSafeBodyLen;
+ private int checksumLen;
+ private int krbSafeSeqLen;
+ private int krbSafeLen;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java Fri Feb 25 17:37:16 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.kerbe
public class TgsRep extends KdcRep
{
// Storage for computed lengths
- private transient int kdcRepLength;
+ private int kdcRepLength;
/**
* Creates a new instance of TGS-REP.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java Fri Feb 25 17:37:16 2011
@@ -22,8 +22,8 @@ package org.apache.directory.shared.kerb
import java.nio.ByteBuffer;
-import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.EncoderException;
+import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.components.KdcReq;
@@ -40,8 +40,8 @@ import org.apache.directory.shared.kerbe
public class TgsReq extends KdcReq
{
// Storage for computed lengths
- private transient int kdcReqLength;
- private transient int tgsReqLength;
+ private int kdcReqLength;
+ private int tgsReqLength;
/**
* Creates a new instance of TGS-REQ.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java Fri Feb 25 17:37:16 2011
@@ -77,15 +77,15 @@ public class Ticket extends KerberosMess
private EncryptedData encPart;
/** The encoded ticket part, stored in its original form (not encoded) */
- private transient EncTicketPart encTicketPart;
+ private EncTicketPart encTicketPart;
// Storage for computed lengths
- private transient int tktvnoLength;
- private transient int realmLength;
- private transient int sNameLength;
- private transient int encPartLength;
- private transient int ticketSeqLength;
- private transient int ticketLength;
+ private int tktvnoLength;
+ private int realmLength;
+ private int sNameLength;
+ private int encPartLength;
+ private int ticketSeqLength;
+ private int ticketLength;
/**
* Creates a new instance of Ticket.
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
-/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
-/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-test:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/ldif-partition:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/ldif-partition:1040956-1043765
/directory/apacheds/branches/milestones/ldif-partition:1072813-1074639
-/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/ldif-partition:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Fri Feb 25 17:37:16 2011
@@ -597,13 +597,13 @@ public class LdifPartition extends Abstr
for ( Rdn rdn : dn.getRdns() )
{
// First, get the AT name, or OID
- String normAT = rdn.getAVA().getNormType();
+ String normAT = rdn.getNormType();
AttributeType at = schemaManager.lookupAttributeTypeRegistry( normAT );
String atName = at.getName();
// Now, get the normalized value
- String normValue = rdn.getAVA().getNormValue().getString();
+ String normValue = rdn.getNormValue().getString();
if ( isFirst )
{
Propchange: directory/apacheds/branches/akarasulu/protocol-changepw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-changepw:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw:1040956-1043765
/directory/apacheds/branches/milestones/protocol-changepw:1072813-1074639
-/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/protocol-changepw:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
-/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/protocol-dhcp:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
-/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/protocol-dns:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java Fri Feb 25 17:37:16 2011
@@ -20,7 +20,6 @@
package org.apache.directory.server.dns.store.jndi;
-import java.io.Serializable;
import java.util.Set;
import javax.naming.Name;
@@ -34,7 +33,7 @@ import org.apache.directory.server.dns.m
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface DnsOperation extends Serializable
+public interface DnsOperation
{
/**
* The command pattern execute method.
Modified: directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java Fri Feb 25 17:37:16 2011
@@ -49,8 +49,6 @@ import org.apache.directory.server.dns.s
*/
public class GetFlatRecord implements DnsOperation
{
- private static final long serialVersionUID = 4931303293468915435L;
-
/** The name of the question to get. */
private final QuestionRecord question;
Modified: directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetRecords.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetRecords.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetRecords.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetRecords.java Fri Feb 25 17:37:16 2011
@@ -56,8 +56,6 @@ import org.apache.directory.shared.ldap.
*/
public class GetRecords implements DnsOperation
{
- private static final long serialVersionUID = 1077580995617778894L;
-
/** The name of the question to get. */
private final QuestionRecord question;
Propchange: directory/apacheds/branches/akarasulu/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
-/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/protocol-kerberos:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ldap:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ldap:1040956-1043765
/directory/apacheds/branches/milestones/protocol-ldap:1072813-1074639
-/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/protocol-ldap:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java Fri Feb 25 17:37:16 2011
@@ -34,9 +34,9 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.extras.controls.SyncModifyDnType;
import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncModifyDnDecorator;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.name.DnSerializer;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -62,7 +62,7 @@ public class ReplicaEventMessage impleme
private static SchemaManager schemaManager;
- private transient LdapCodecService codec;
+ private LdapCodecService codec;
public ReplicaEventMessage()
Propchange: directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -8,5 +8,5 @@
/directory/apacheds/branches/apacheds-subtree/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:965203-965686
/directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1072813-1074639
/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,1072813-1073547
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
-/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/protocol-ntp:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-shared:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-shared:1040956-1043765
/directory/apacheds/branches/milestones/protocol-shared:1072813-1074639
-/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/protocol-shared:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Fri Feb 25 17:37:16 2011
@@ -43,9 +43,6 @@ import org.apache.directory.shared.ldap.
*/
public class GetCatalog implements DirectoryServiceOperation
{
- private static final long serialVersionUID = -6657995003127926278L;
-
-
/**
* Note that the base is relative to the existing context.
*/
Modified: directory/apacheds/branches/akarasulu/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java (original)
+++ directory/apacheds/branches/akarasulu/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java Fri Feb 25 17:37:16 2011
@@ -20,8 +20,6 @@
package org.apache.directory.server.protocol.shared.store;
-import java.io.Serializable;
-
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.shared.ldap.model.name.Dn;
@@ -31,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface DirectoryServiceOperation extends Serializable
+public interface DirectoryServiceOperation
{
/**
* The command pattern execute method.
Propchange: directory/apacheds/branches/akarasulu/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-annotations:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-annotations:1040956-1043765
/directory/apacheds/branches/milestones/server-annotations:1072813-1074639
-/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/server-annotations:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -5,5 +5,5 @@
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
/directory/apacheds/branches/milestones/server-config:1072813-1074639
/directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
-/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/server-config:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -9,5 +9,5 @@
/directory/apacheds/branches/milestones/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1072813-1074639
/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,1072813-1073547
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -12,5 +12,5 @@
/directory/apacheds/branches/milestones/server-config/src/main/resources:1072813-1074639
/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,1072813-1073547
+/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/server-config/src/main/resources:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -11,5 +11,5 @@
/directory/apacheds/branches/milestones/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1072813-1074639
/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,1072813-1073547
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-integ:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-integ:1040956-1043765
/directory/apacheds/branches/milestones/server-integ:1072813-1074639
-/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/server-integ:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-jndi:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-jndi:1040956-1043765
/directory/apacheds/branches/milestones/server-jndi:1072813-1074639
-/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/server-jndi:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 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:1072813-1074639
-/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/server-replication:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/server-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-tools:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-tools:1040956-1043765
/directory/apacheds/branches/milestones/server-tools:1072813-1074639
-/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/server-tools:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -1,4 +1,4 @@
/directory/apacheds/branches/antoine/service-builder:1038305-1044163
/directory/apacheds/branches/milestones/service-builder:1072813-1074639
-/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/service-builder:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -9,5 +9,5 @@
/directory/apacheds/branches/apacheds-subtree/test-framework:965203-965686
/directory/apacheds/branches/milestones/test-framework:1072813-1074639
/directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347
-/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/test-framework:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-partition:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-partition:1040956-1043765
/directory/apacheds/branches/milestones/xdbm-partition:1072813-1074639
-/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/xdbm-partition:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java Fri Feb 25 17:37:16 2011
@@ -20,8 +20,6 @@
package org.apache.directory.server.core.partition.impl.btree;
-import java.io.Serializable;
-
import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator;
@@ -30,7 +28,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class KeyOnlyComparator<K, V> implements TupleComparator<K, V>, Serializable
+public class KeyOnlyComparator<K, V> implements TupleComparator<K, V>
{
private static final long serialVersionUID = 3544956549803161397L;
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java Fri Feb 25 17:37:16 2011
@@ -30,8 +30,9 @@ import org.apache.directory.shared.ldap.
public class LongComparator extends SerializableComparator<Long>
{
public static final LongComparator INSTANCE = new LongComparator();
- private static final long serialVersionUID = 3690478030414165816L;
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
public LongComparator()
{
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Fri Feb 25 17:37:16 2011
@@ -1178,7 +1178,7 @@ public abstract class AbstractStore<E, I
Dn updn = entry.getDn();
- newRdn.normalize( schemaManager.getNormalizerMapping() );
+ newRdn.normalize( schemaManager );
/*
* H A N D L E N E W R D N
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java Fri Feb 25 17:37:16 2011
@@ -31,8 +31,8 @@ import org.apache.directory.shared.ldap.
*/
public class ParentIdAndRdnComparator<ID extends Comparable<ID>> extends SerializableComparator<ParentIdAndRdn<ID>>
{
- private static final long serialVersionUID = 5414960421568991202L;
-
+ /** The serial version UID */
+ private static final long serialVersionUID = 2L;
/**
* Creates a new instance of ParentIdAndRdnComparator.
Modified: directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java Fri Feb 25 17:37:16 2011
@@ -32,9 +32,6 @@ import org.apache.directory.shared.ldap.
*/
public class BogusSyntax extends LdapSyntax
{
- private static final long serialVersionUID = 1L;
-
-
protected BogusSyntax( int oidVal )
{
super( "1.3.6.1.4.1.18060.0.4.1.1.100000." + oidVal );
Propchange: directory/apacheds/branches/akarasulu/xdbm-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-tools:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-tools:1040956-1043765
/directory/apacheds/branches/milestones/xdbm-tools:1072813-1074639
-/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/xdbm-tools:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java (original)
+++ directory/apacheds/branches/akarasulu/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java Fri Feb 25 17:37:16 2011
@@ -46,10 +46,10 @@ public class AttributesTableModel extend
public static final String VAL_COL = "Values";
/** list of attribute ids */
- private final transient ArrayList<Object> keyList;
+ private final ArrayList<Object> keyList;
/** list of attribute values */
- private final transient ArrayList<Object> valList;
+ private final ArrayList<Object> valList;
/** the unique id of the entry */
private final Long id;