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 [1/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...
Author: akarasulu
Date: Fri Feb 25 17:37:16 2011
New Revision: 1074645
URL: http://svn.apache.org/viewvc?rev=1074645&view=rev
Log:
merging in changes from trunk
Modified:
directory/apacheds/branches/akarasulu/ (props changed)
directory/apacheds/branches/akarasulu/all/ (props changed)
directory/apacheds/branches/akarasulu/core/ (props changed)
directory/apacheds/branches/akarasulu/core-annotations/ (props changed)
directory/apacheds/branches/akarasulu/core-api/ (props changed)
directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java (props changed)
directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
directory/apacheds/branches/akarasulu/core-avl/ (props changed)
directory/apacheds/branches/akarasulu/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlMapNode.java
directory/apacheds/branches/akarasulu/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java
directory/apacheds/branches/akarasulu/core-constants/ (props changed)
directory/apacheds/branches/akarasulu/core-integ/ (props changed)
directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (props changed)
directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
directory/apacheds/branches/akarasulu/core-jndi/ (props changed)
directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/branches/akarasulu/http-integration/ (props changed)
directory/apacheds/branches/akarasulu/i18n/ (props changed)
directory/apacheds/branches/akarasulu/installers/ (props changed)
directory/apacheds/branches/akarasulu/installers-maven-plugin/ (props changed)
directory/apacheds/branches/akarasulu/interceptor-kerberos/ (props changed)
directory/apacheds/branches/akarasulu/jdbm/ (props changed)
directory/apacheds/branches/akarasulu/jdbm-partition/ (props changed)
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ (props changed)
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (props changed)
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/ (props changed)
directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java (props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java (props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java (props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (contents, props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (contents, props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (contents, props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java (props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ (props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsReq.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncAsRepPart.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncTgsRepPart.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (contents, props changed)
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
directory/apacheds/branches/akarasulu/kerberos-codec/src/test/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/akarasulu/kerberos-test/ (props changed)
directory/apacheds/branches/akarasulu/ldif-partition/ (props changed)
directory/apacheds/branches/akarasulu/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
directory/apacheds/branches/akarasulu/protocol-changepw/ (props changed)
directory/apacheds/branches/akarasulu/protocol-dhcp/ (props changed)
directory/apacheds/branches/akarasulu/protocol-dns/ (props changed)
directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/DnsOperation.java
directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetFlatRecord.java
directory/apacheds/branches/akarasulu/protocol-dns/src/main/java/org/apache/directory/server/dns/store/jndi/operations/GetRecords.java
directory/apacheds/branches/akarasulu/protocol-kerberos/ (props changed)
directory/apacheds/branches/akarasulu/protocol-ldap/ (props changed)
directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
directory/apacheds/branches/akarasulu/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (props changed)
directory/apacheds/branches/akarasulu/protocol-ntp/ (props changed)
directory/apacheds/branches/akarasulu/protocol-shared/ (props changed)
directory/apacheds/branches/akarasulu/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
directory/apacheds/branches/akarasulu/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/DirectoryServiceOperation.java
directory/apacheds/branches/akarasulu/server-annotations/ (props changed)
directory/apacheds/branches/akarasulu/server-config/ (props changed)
directory/apacheds/branches/akarasulu/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed)
directory/apacheds/branches/akarasulu/server-config/src/main/resources/ (props changed)
directory/apacheds/branches/akarasulu/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed)
directory/apacheds/branches/akarasulu/server-integ/ (props changed)
directory/apacheds/branches/akarasulu/server-jndi/ (props changed)
directory/apacheds/branches/akarasulu/server-replication/ (props changed)
directory/apacheds/branches/akarasulu/server-tools/ (props changed)
directory/apacheds/branches/akarasulu/service-builder/ (props changed)
directory/apacheds/branches/akarasulu/test-framework/ (props changed)
directory/apacheds/branches/akarasulu/xdbm-partition/ (props changed)
directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/KeyOnlyComparator.java
directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java
directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
directory/apacheds/branches/akarasulu/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
directory/apacheds/branches/akarasulu/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/BogusSyntax.java
directory/apacheds/branches/akarasulu/xdbm-tools/ (props changed)
directory/apacheds/branches/akarasulu/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
Propchange: directory/apacheds/branches/akarasulu/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree:965203-965686
/directory/apacheds/branches/milestones:1072813-1074639
/directory/apacheds/branches/xdbm-refactoring:945827-946347
-/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765
/directory/apacheds/branches/milestones/all:1072813-1074639
-/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/all:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
/directory/apacheds/branches/milestones/core:1072813-1074639
-/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/core:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-annotations:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765
/directory/apacheds/branches/milestones/core-annotations:1072813-1074639
-/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/core-annotations:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-api:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api:1040956-1043765
/directory/apacheds/branches/milestones/core-api:1072813-1074639
-/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/core-api:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/LdapPrincipal.java Fri Feb 25 17:37:16 2011
@@ -54,9 +54,8 @@ public final class LdapPrincipal impleme
/** The userPassword
* @todo security risk remove this immediately
- * The field is transient to avoid being serialized
*/
- transient private byte[] userPassword;
+ private byte[] userPassword;
/**
Propchange: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -7,5 +7,5 @@
/directory/apacheds/branches/apacheds-subtree/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java:965203-965686
/directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1072813-1074639
/directory/apacheds/branches/xdbm-refactoring/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:945827-946347
-/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java (original)
+++ directory/apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/TestServerEntryUtils.java Fri Feb 25 17:37:16 2011
@@ -64,8 +64,6 @@ public class TestServerEntryUtils
*/
static class MR extends MatchingRule
{
- private static final long serialVersionUID = 0L;
-
protected MR( String oid )
{
super( oid );
@@ -104,8 +102,6 @@ public class TestServerEntryUtils
syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2.1" )
{
- private static final long serialVersionUID = 0L;
-
public boolean isValidSyntax( Object value )
{
if ( !( value instanceof String ) )
@@ -132,8 +128,6 @@ public class TestServerEntryUtils
matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid() )
{
- private static final long serialVersionUID = 0L;
-
public int compare( String o1, String o2 )
{
return ( o1 == null ?
@@ -162,8 +156,6 @@ public class TestServerEntryUtils
Normalizer normalizer = new Normalizer( "1.1.1" )
{
- private static final long serialVersionUID = 0L;
-
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( !value.isBinary() )
@@ -198,8 +190,6 @@ public class TestServerEntryUtils
syntax.setSyntaxChecker( new SyntaxChecker( "1.1.2" )
{
- private static final long serialVersionUID = 0L;
-
public boolean isValidSyntax( Object value )
{
return ((String)value == null) || (((String)value).length() < 7) ;
@@ -212,8 +202,6 @@ public class TestServerEntryUtils
matchingRule.setLdapComparator( new LdapComparator<String>( matchingRule.getOid() )
{
- private static final long serialVersionUID = 0L;
-
public int compare( String o1, String o2 )
{
return ( ( o1 == null ) ?
@@ -238,8 +226,6 @@ public class TestServerEntryUtils
syntax.setSyntaxChecker( new SyntaxChecker( "1.2.1" )
{
- private static final long serialVersionUID = 0L;
-
public boolean isValidSyntax( Object value )
{
return ( value == null ) || ( ((byte[])value).length < 5 );
@@ -253,9 +239,6 @@ public class TestServerEntryUtils
matchingRule.setNormalizer( new Normalizer( "1.1.1" )
{
- // The serial UID
- private static final long serialVersionUID = 1L;
-
public Value<?> normalize( Value<?> value ) throws LdapException
{
if ( value.isBinary() )
Propchange: directory/apacheds/branches/akarasulu/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-avl:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
/directory/apacheds/branches/milestones/core-avl:1072813-1074639
-/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/core-avl:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlMapNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlMapNode.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlMapNode.java (original)
+++ directory/apacheds/branches/akarasulu/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlMapNode.java Fri Feb 25 17:37:16 2011
@@ -45,11 +45,11 @@ public class LinkedAvlMapNode<K, V>
/** The previous node, inferior to the current node */
LinkedAvlMapNode<K, V> previous;
- transient int depth;
- transient int index;
+ int depth;
+ int index;
boolean isLeft;
- transient int height = 1;
+ int height = 1;
/**
Modified: directory/apacheds/branches/akarasulu/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java (original)
+++ directory/apacheds/branches/akarasulu/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlNode.java Fri Feb 25 17:37:16 2011
@@ -42,11 +42,11 @@ public class LinkedAvlNode<T>
/** The previous node, inferior to the current node */
LinkedAvlNode<T> previous;
- transient int depth;
- transient int index;
+ int depth;
+ int index;
boolean isLeft;
- transient int height = 1;
+ int height = 1;
/**
Propchange: directory/apacheds/branches/akarasulu/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-constants:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
/directory/apacheds/branches/milestones/core-constants:1072813-1074639
-/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/core-constants:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-integ:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
/directory/apacheds/branches/milestones/core-integ:1072813-1074639
-/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/core-integ:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -8,5 +8,5 @@
/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
/directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1072813-1074639
/directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Fri Feb 25 17:37:16 2011
@@ -80,8 +80,6 @@ public class MetaComparatorHandlerIT ext
super( OID );
addName( "dummy" );
}
-
- private static final long serialVersionUID = 1L;
}
Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Fri Feb 25 17:37:16 2011
@@ -660,7 +660,5 @@ public class MetaNormalizerHandlerIT ext
super( OID );
addName( "dummy" );
}
-
- private static final long serialVersionUID = 1L;
}
}
Modified: directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/branches/akarasulu/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Fri Feb 25 17:37:16 2011
@@ -624,9 +624,6 @@ public class MetaSyntaxCheckerHandlerIT
public static class BogusSyntaxChecker extends SyntaxChecker
{
- private static final long serialVersionUID = 1L;
-
-
public BogusSyntaxChecker()
{
super( OID );
@@ -641,9 +638,6 @@ public class MetaSyntaxCheckerHandlerIT
class DummySyntax extends LdapSyntax
{
- private static final long serialVersionUID = 1L;
-
-
public DummySyntax()
{
super( OID );
Propchange: directory/apacheds/branches/akarasulu/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-jndi:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
/directory/apacheds/branches/milestones/core-jndi:1072813-1074639
-/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/core-jndi:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/branches/akarasulu/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Fri Feb 25 17:37:16 2011
@@ -548,7 +548,7 @@ public class OperationalAttributeInterce
else if ( rdn.size() == 1 )
{
String name = schemaManager.lookupAttributeTypeRegistry( rdn.getNormType() ).getName();
- String value = rdn.getAVA().getNormValue().getString();
+ String value = rdn.getNormValue().getString();
newDn = newDn.add( new Rdn( name, name, value, value ) );
continue;
}
Propchange: directory/apacheds/branches/akarasulu/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/http-integration:1040956-1043765
/directory/apacheds/branches/milestones/http-integration:1072813-1074639
-/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/http-integration:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/i18n:1040956-1043765
/directory/apacheds/branches/milestones/i18n:1072813-1074639
-/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/i18n:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/installers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -1,6 +1,6 @@
/directory/apacheds/branches/apacheds-config/installers:1023442-1029077
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers:1040956-1043765
/directory/apacheds/branches/milestones/installers:1072813-1074639
-/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072813-1074641
/directory/installers/branches/installers-schema/apacheds:806631-896441
/directory/studio/trunk/installers:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/installers-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -1,6 +1,6 @@
/directory/apacheds/branches/apacheds-config/installers-maven-plugin:1023442-1029077
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers-maven-plugin:1040956-1043765
/directory/apacheds/branches/milestones/installers-maven-plugin:1072813-1074639
-/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072813-1074641
/directory/daemon/branches/daemon-schema/plugin:806630-896441
/directory/studio/trunk/installers-maven-plugin:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
/directory/apacheds/branches/milestones/interceptor-kerberos:1072813-1074639
-/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/interceptor-kerberos:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765
/directory/apacheds/branches/milestones/jdbm:1072813-1074639
-/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/jdbm:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765
/directory/apacheds/branches/milestones/jdbm-partition:1072813-1074639
-/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/jdbm-partition:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Fri Feb 25 17:37:16 2011
@@ -60,10 +60,10 @@ public class DupsContainerCursorTest
private static final Logger LOG = LoggerFactory.getLogger( NoDupsCursorTest.class.getSimpleName() );
private static final String TEST_OUTPUT_PATH = "test.output.path";
- transient JdbmTable<String,String> table;
- transient File dbFile;
+ JdbmTable<String,String> table;
+ File dbFile;
private static SchemaManager schemaManager;
- transient RecordManager recman;
+ RecordManager recman;
private static final int SIZE = 15;
Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsCursorTest.java Fri Feb 25 17:37:16 2011
@@ -63,9 +63,9 @@ public class DupsCursorTest
private static final String TEST_OUTPUT_PATH = "test.output.path";
private static final int SIZE = 15;
- transient Table<String,String> table;
- transient File dbFile;
- transient RecordManager recman;
+ Table<String,String> table;
+ File dbFile;
+ RecordManager recman;
private static SchemaManager schemaManager;
Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTableTest.java Fri Feb 25 17:37:16 2011
@@ -52,10 +52,10 @@ public class JdbmMasterTableTest
private static final Logger LOG = LoggerFactory.getLogger( JdbmMasterTableTest.class.getSimpleName() );
private static final String TEST_OUTPUT_PATH = "test.output.path";
- transient JdbmMasterTable<Integer> table;
- transient File dbFile;
- transient RecordManager recman;
- transient SchemaManager schemaManager = null;
+ JdbmMasterTable<Integer> table;
+ File dbFile;
+ RecordManager recman;
+ SchemaManager schemaManager = null;
public JdbmMasterTableTest() throws Exception
Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndexTest.java Fri Feb 25 17:37:16 2011
@@ -292,7 +292,7 @@ public class JdbmRdnIndexTest
{
initIndex();
- ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=key", schemaManager ) );
+ ParentIdAndRdn<Long> key = new ParentIdAndRdn<Long>( 0L, new Rdn( schemaManager, "cn=key" ) );
assertNull( idx.forwardLookup( key ) );
@@ -302,7 +302,7 @@ public class JdbmRdnIndexTest
// check with the different case in UP name, this ensures that the custom
// key comparator is used
- key = new ParentIdAndRdn<Long>( 0L, new Rdn( "cn=KEY", schemaManager ) );
+ key = new ParentIdAndRdn<Long>( 0L, new Rdn( schemaManager, "cn=KEY" ) );
assertEquals( 0, ( long ) idx.forwardLookup( key ) );
assertEquals( key, idx.reverseLookup( 0l ) );
}
Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableNoDuplicatesTest.java Fri Feb 25 17:37:16 2011
@@ -58,9 +58,9 @@ public class JdbmTableNoDuplicatesTest
private static final Logger LOG = LoggerFactory.getLogger( JdbmTableNoDuplicatesTest.class.getSimpleName() );
private static final String TEST_OUTPUT_PATH = "test.output.path";
- transient Table<String,String> table;
- transient File dbFile;
- transient RecordManager recman;
+ Table<String,String> table;
+ File dbFile;
+ RecordManager recman;
private static SchemaManager schemaManager;
Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java Fri Feb 25 17:37:16 2011
@@ -71,9 +71,9 @@ public class JdbmTableWithDuplicatesTest
private static final String SIZE2_STR = "30";
private static final String SIZE2_PLUS_ONE_STR = "31";
- transient JdbmTable<String,String> table;
- transient File dbFile;
- transient RecordManager recman;
+ JdbmTable<String,String> table;
+ File dbFile;
+ RecordManager recman;
private static SchemaManager schemaManager;
Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java Fri Feb 25 17:37:16 2011
@@ -95,17 +95,16 @@ public class KeyTupleBTreeCursorTest
@Before
public void createTree() throws Exception
{
- comparator = new Comparator<String>()
- {
-
- public int compare( String i1, String i2 )
- {
- return i1.compareTo( i2 );
- }
-
+ comparator = new Comparator<String>()
+ {
+ public int compare( String i1, String i2 )
+ {
+ return i1.compareTo( i2 );
+ }
};
File tmpDir = null;
+
if ( System.getProperty( TEST_OUTPUT_PATH, null ) != null )
{
tmpDir = new File( System.getProperty( TEST_OUTPUT_PATH ) );
Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/MockComparatorRegistry.java Fri Feb 25 17:37:16 2011
@@ -42,9 +42,6 @@ class MockComparatorRegistry extends Def
private LdapComparator<Integer> comparator = new LdapComparator<Integer>( "1.1.1" )
{
- private static final long serialVersionUID = -4049615866911565018L;
-
-
public int compare( Integer i1, Integer i2 )
{
return i1.compareTo( i2 );
Modified: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original)
+++ directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Fri Feb 25 17:37:16 2011
@@ -61,9 +61,9 @@ public class NoDupsCursorTest
private static final Logger LOG = LoggerFactory.getLogger( NoDupsCursorTest.class.getSimpleName() );
private static final String TEST_OUTPUT_PATH = "test.output.path";
- transient Table<String,String> table;
- transient File dbFile;
- transient RecordManager recman;
+ Table<String,String> table;
+ File dbFile;
+ RecordManager recman;
private static SchemaManager schemaManager;
Propchange: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -7,5 +7,5 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1072813-1074639
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -7,5 +7,5 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1072813-1074639
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -7,5 +7,5 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:1072813-1074639
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -7,5 +7,5 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1072813-1074639
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/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/main/java/org/apache/directory/server:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server:1072813-1074639
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -2,5 +2,5 @@
/directory/apacheds/branches/apacheds-config/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:980138-980936
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1072813-1074639
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/ChangePassword.java Fri Feb 25 17:37:16 2011
@@ -47,8 +47,6 @@ import org.apache.directory.shared.util.
*/
public class ChangePassword implements DirectoryServiceOperation
{
- private static final long serialVersionUID = -7147685183641418353L;
-
/** The Kerberos principal who's password is to be changed. */
protected KerberosPrincipal principal;
/** The new password for the update. */
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/operations/GetPrincipal.java Fri Feb 25 17:37:16 2011
@@ -49,8 +49,6 @@ import org.apache.directory.shared.ldap.
*/
public class GetPrincipal implements DirectoryServiceOperation
{
- private static final long serialVersionUID = 4598007518413451945L;
-
/** The name of the principal to get. */
private final KerberosPrincipal principal;
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.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/types/PaDataType.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1072813-1074639
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1067786-1067997
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 25 17:37:16 2011
@@ -2,5 +2,5 @@
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:980138-980936
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1072813-1074639
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java Fri Feb 25 17:37:16 2011
@@ -60,9 +60,9 @@ public class AdAndOr extends AbstractAsn
private AuthorizationData elements;
// Storage for computed lengths
- private transient int conditionCountTagLength;
- private transient int elementsTagLength;
- private transient int adAndOrSeqLength;
+ private int conditionCountTagLength;
+ private int elementsTagLength;
+ private int adAndOrSeqLength;
/**
* Creates a new instance of AdAndOr
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java Fri Feb 25 17:37:16 2011
@@ -68,12 +68,12 @@ public class AdKdcIssued extends Abstrac
// Storage for computed lengths
- private transient int adCheksumTagLength;
- private transient int irealmTagLength;
- private transient byte[] irealmBytes;
- private transient int isnameTagLength;
- private transient int elementsTagLength;
- private transient int adKdcIssuedSeqLength;
+ private int adCheksumTagLength;
+ private int irealmTagLength;
+ private byte[] irealmBytes;
+ private int isnameTagLength;
+ private int elementsTagLength;
+ private int adKdcIssuedSeqLength;
/**
* Creates a new instance of AdKdcIssued
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java Fri Feb 25 17:37:16 2011
@@ -65,10 +65,10 @@ public class AuthorizationData extends A
private static final boolean IS_DEBUG = LOG.isDebugEnabled();
// Storage for computed lengths
- private transient int adTypeTagLen[];
- private transient int adDataTagLen[];
- private transient int authorizationDataSeqLen[];
- private transient int authorizationDataSeqSeqLen;
+ private int adTypeTagLen[];
+ private int adDataTagLen[];
+ private int authorizationDataSeqLen[];
+ private int authorizationDataSeqSeqLen;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java Fri Feb 25 17:37:16 2011
@@ -26,10 +26,10 @@ import java.util.Arrays;
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.crypto.checksum.ChecksumType;
import org.apache.directory.shared.util.Strings;
@@ -64,9 +64,9 @@ public class Checksum extends AbstractAs
private byte[] checksum;
// Storage for computed lengths
- private transient int checksumTypeLength;
- private transient int checksumBytesLength;
- private transient int checksumLength;
+ private int checksumTypeLength;
+ private int checksumBytesLength;
+ private int checksumLength;
/**
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.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/Checksum.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1072813-1074639
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java Fri Feb 25 17:37:16 2011
@@ -57,7 +57,7 @@ public class ETypeInfo extends AbstractA
private List<ETypeInfoEntry> etypeInfoEntries;
// Storage for computed lengths
- private transient int etypeInfoLength;
+ private int etypeInfoLength;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java Fri Feb 25 17:37:16 2011
@@ -57,7 +57,7 @@ public class ETypeInfo2 extends Abstract
private List<ETypeInfo2Entry> etypeInfo2Entries;
// Storage for computed lengths
- private transient int etypeInfo2Length;
+ private int etypeInfo2Length;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java Fri Feb 25 17:37:16 2011
@@ -68,10 +68,10 @@ public class ETypeInfo2Entry extends Abs
private byte[] s2kparams;
// Storage for computed lengths
- private transient int etypeTagLength;
- private transient int saltTagLength;
- private transient int s2kparamsTagLength;
- private transient int etypeInfo2EntrySeqLength;
+ private int etypeTagLength;
+ private int saltTagLength;
+ private int s2kparamsTagLength;
+ private int etypeInfo2EntrySeqLength;
/**
* Creates a new instance of ETypeInfo2Entry.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.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.EncryptionType;
import org.apache.directory.shared.util.Strings;
@@ -63,9 +63,9 @@ public class ETypeInfoEntry extends Abst
private byte[] salt;
// Storage for computed lengths
- private transient int etypeTagLength;
- private transient int saltTagLength;
- private transient int etypeInfoEntrySeqLength;
+ private int etypeTagLength;
+ private int saltTagLength;
+ private int etypeInfoEntrySeqLength;
/**
* Creates a new instance of ETypeInfoEntry.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java Fri Feb 25 17:37:16 2011
@@ -105,15 +105,15 @@ public class EncKdcRepPart extends Abstr
private HostAddresses caddr; //optional
// Storage for computed lengths
- private transient int keyLength;
- private transient int lastReqLength;
- private transient int nonceLength;
- private transient int flagsLength;
- private transient byte[] srealmBytes;
- private transient int srealmLength;
- private transient int snameLength;
- private transient int caddrLength;
- private transient int encKdcRepPartSeqLength;
+ private int keyLength;
+ private int lastReqLength;
+ private int nonceLength;
+ private int flagsLength;
+ private byte[] srealmBytes;
+ private int srealmLength;
+ private int snameLength;
+ private int caddrLength;
+ private int encKdcRepPartSeqLength;
/**
* Creates a new instance of EncKdcRepPart.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java Fri Feb 25 17:37:16 2011
@@ -77,16 +77,16 @@ public class EncKrbCredPart extends Abst
/** the recipient's address */
private HostAddress recipientAddress;
- private transient int ticketInfoSeqLen;
- private transient int ticketInfoLen;
- private transient int nonceLen;
- private transient int timestampLen;
- private transient byte[] timestampBytes;
- private transient int usecLen;
- private transient int senderAddressLen;
- private transient int recipientAddressLen;
- private transient int encKrbCredPartSeqLen;
- private transient int encKrbCredPartLen;
+ private int ticketInfoSeqLen;
+ private int ticketInfoLen;
+ private int nonceLen;
+ private int timestampLen;
+ private byte[] timestampBytes;
+ private int usecLen;
+ private int senderAddressLen;
+ private int recipientAddressLen;
+ private int encKrbCredPartSeqLen;
+ private int encKrbCredPartLen;
/**
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java Fri Feb 25 17:37:16 2011
@@ -79,16 +79,14 @@ public class EncKrbPrivPart extends Abst
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 encKrbPrivPartSeqLen;
- private transient int encKrbPrivPartLen;
-
-
+ private int userDataLen;
+ private int timestampLen;
+ private int usecLen;
+ private int seqNumberLen;
+ private int senderAddressLen;
+ private int recipientAddressLen;
+ private int encKrbPrivPartSeqLen;
+ private int encKrbPrivPartLen;
/**
* @return the userData
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.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.kerberos.flags.TicketFlag;
@@ -98,24 +98,24 @@ public class EncTicketPart extends Abstr
private AuthorizationData authorizationData;
- private transient int flagsLen;
- private transient int keyLen;
- private transient int cRealmLen;
- private transient byte[] cRealmBytes;
- private transient int cNameLen;
- private transient int transitedLen;
- 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 clientAddressesLen;
- private transient int authzDataLen;
- private transient int encTikcetPartSeqLen;
- private transient int encTikcetPartLen;
+ private int flagsLen;
+ private int keyLen;
+ private int cRealmLen;
+ private byte[] cRealmBytes;
+ private int cNameLen;
+ private int transitedLen;
+ 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 clientAddressesLen;
+ private int authzDataLen;
+ private int encTikcetPartSeqLen;
+ private int encTikcetPartLen;
/**
* compute length for EncTicketPart:
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java Fri Feb 25 17:37:16 2011
@@ -26,10 +26,10 @@ import java.util.Arrays;
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.codec.types.EncryptionType;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -71,11 +71,10 @@ public class EncryptedData extends Abstr
public static final boolean HAS_KVNO = true;
// Storage for computed lengths
- private transient int eTypeTagLength;
- private transient int kvnoTagLength;
- private transient int cipherTagLength;
- private transient int encryptedDataSeqLength;
-
+ private int eTypeTagLength;
+ private int kvnoTagLength;
+ private int cipherTagLength;
+ private int encryptedDataSeqLength;
/**
* Creates a new instance of EncryptedData.
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java Fri Feb 25 17:37:16 2011
@@ -68,10 +68,9 @@ public class EncryptionKey extends Abstr
private int keyVersion;
// Storage for computed lengths
- private transient int keyTypeLength;
- private transient int keyValueLength;
- private transient int encryptionKeyLength;
-
+ private int keyTypeLength;
+ private int keyValueLength;
+ private int encryptionKeyLength;
/**
* Creates a new instance of EncryptionKey.
Propchange: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.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/EncryptionKey.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1072813-1074639
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072813-1073547
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072813-1074641
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1067786-1067997
Modified: directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java?rev=1074645&r1=1074644&r2=1074645&view=diff
==============================================================================
--- directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java (original)
+++ directory/apacheds/branches/akarasulu/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java Fri Feb 25 17:37:16 2011
@@ -77,10 +77,10 @@ public class HostAddress extends Abstrac
private byte[] address;
// Storage for computed lengths
- private transient int addrTypeLength;
- private transient int addressLength;
- private transient int hostAddressLength;
- private transient int hostAddressSeqLength;
+ private int addrTypeLength;
+ private int addressLength;
+ private int hostAddressLength;
+ private int hostAddressSeqLength;
/**