You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/05/01 15:29:25 UTC
svn commit: r1332645 [1/2] - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/api/entry/
core-api/src/main/java/org/apache/directory/server/core/api/filtering/
core-api/src/main/java/org/apache/directory/server/core...
Author: elecharny
Date: Tue May 1 13:29:22 2012
New Revision: 1332645
URL: http://svn.apache.org/viewvc?rev=1332645&view=rev
Log:
o Remove unused imports
o Complete the Value -> BerValue rename
o Removed dead code
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/StoreCksumType.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreEType.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreSalt.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreEType.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddEType.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreFrom.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreTill.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/actions/StoreDataType.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/principalName/actions/StoreNameString.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java
directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
directory/apacheds/trunk/ldif-partition/src/test/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartitionTest.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
directory/apacheds/trunk/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/entry/ClonedServerEntry.java Tue May 1 13:29:22 2012
@@ -26,7 +26,6 @@ import java.io.ObjectOutput;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -40,7 +39,7 @@ import org.apache.directory.shared.ldap.
/**
- * A ServerEntry refers to the original entry before being modified by
+ * A ServerEntry refers to the original entry before being modified by
* EntryFilters or operations.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -72,7 +71,7 @@ public class ClonedServerEntry implement
public ClonedServerEntry( Entry originalEntry )
{
this.originalEntry = originalEntry;
- this.clonedEntry = ( Entry ) originalEntry.clone();
+ this.clonedEntry = originalEntry.clone();
}
@@ -405,7 +404,7 @@ public class ClonedServerEntry implement
// Copy the Dn
Entry clientEntry = new DefaultEntry( clonedEntry.getDn() );
- // Convert each attribute
+ // Convert each attribute
for ( Attribute clonedEntry : this )
{
Attribute clientAttribute = clonedEntry.clone();
@@ -440,7 +439,7 @@ public class ClonedServerEntry implement
public Entry clone()
{
- return ( Entry ) clonedEntry.clone();
+ return clonedEntry.clone();
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/filtering/BaseEntryFilteringCursor.java Tue May 1 13:29:22 2012
@@ -29,7 +29,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.entry.ClonedServerEntrySearch;
import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.model.cursor.AbstractCursor;
import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.cursor.CursorIterator;
@@ -46,7 +45,7 @@ import org.slf4j.LoggerFactory;
/**
* A Cursor which uses a list of filters to selectively return entries and/or
- * modify the contents of entries. Uses lazy pre-fetching on positioning
+ * modify the contents of entries. Uses lazy pre-fetching on positioning
* operations which means adding filters after creation will not miss candidate
* entries.
*
@@ -78,7 +77,7 @@ public class BaseEntryFilteringCursor im
// ------------------------------------------------------------------------
/**
- * Creates a new entry filtering Cursor over an existing Cursor using a
+ * Creates a new entry filtering Cursor over an existing Cursor using a
* single filter initially: more can be added later after creation.
*
* @param wrapped the underlying wrapped Cursor whose entries are filtered
@@ -94,7 +93,7 @@ public class BaseEntryFilteringCursor im
/**
- * Creates a new entry filtering Cursor over an existing Cursor using a
+ * Creates a new entry filtering Cursor over an existing Cursor using a
* no filter initially: more can be added later after creation.
*
* @param wrapped the underlying wrapped Cursor whose entries are filtered
@@ -112,7 +111,7 @@ public class BaseEntryFilteringCursor im
/**
- * Creates a new entry filtering Cursor over an existing Cursor using a
+ * Creates a new entry filtering Cursor over an existing Cursor using a
* list of filters initially: more can be added later after creation.
*
* @param wrapped the underlying wrapped Cursor whose entries are filtered
@@ -195,7 +194,7 @@ public class BaseEntryFilteringCursor im
// ------------------------------------------------------------------------
// Cursor Interface Methods
// ------------------------------------------------------------------------
- /*
+ /*
* @see Cursor#after(Object)
*/
/* (non-Javadoc)
@@ -226,7 +225,7 @@ public class BaseEntryFilteringCursor im
}
- /*
+ /*
* @see Cursor#before(java.lang.Object)
*/
/* (non-Javadoc)
@@ -488,7 +487,7 @@ public class BaseEntryFilteringCursor im
* O P T I M I Z A T I O N
* -----------------------
*
- * Don't want to waste cycles on enabling a loop for processing
+ * Don't want to waste cycles on enabling a loop for processing
* filters if we have zero or one filter.
*/
@@ -553,7 +552,7 @@ public class BaseEntryFilteringCursor im
* O P T I M I Z A T I O N
* -----------------------
*
- * Don't want to waste cycles on enabling a loop for processing
+ * Don't want to waste cycles on enabling a loop for processing
* filters if we have zero or one filter.
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java Tue May 1 13:29:22 2012
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.core.api.interceptor.context;
@@ -40,13 +40,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.AttributeTypeOptions;
import org.apache.directory.shared.ldap.model.schema.SchemaUtils;
import org.apache.directory.shared.util.StringConstants;
-import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A context used for search related operations and used by all
+ * A context used for search related operations and used by all
* the Interceptors.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -108,12 +107,12 @@ public abstract class SearchingOperation
/**
- * Creates a new instance of a SearchingOperationContext using one level
+ * Creates a new instance of a SearchingOperationContext using one level
* scope, with attributes to return.
*
* @param dn The Dn to get the suffix from
* @param aliasDerefMode the alias dereferencing mode to use
- * @throws LdapException
+ * @throws LdapException
*/
public SearchingOperationContext( CoreSession session, Dn dn, Set<AttributeTypeOptions> returningAttributes )
{
@@ -346,7 +345,7 @@ public abstract class SearchingOperation
/**
- * Creates a new SearchControls object populated with the parameters
+ * Creates a new SearchControls object populated with the parameters
* contained in this SearchOperationContext in normalized form.
*
* @return a new SearchControls object
@@ -358,7 +357,7 @@ public abstract class SearchingOperation
/**
- * Creates a new SearchControls object populated with the parameters
+ * Creates a new SearchControls object populated with the parameters
* contained in this SearchOperationContext.
*
* @param denormalized true if attribute values are <b>not</b> normalized
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java Tue May 1 13:29:22 2012
@@ -47,14 +47,13 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.ldap.model.schema.registries.ObjectClassRegistry;
-import org.apache.directory.shared.ldap.model.schema.registries.Registries;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Central point of control for schemas enforced by the server. The
+ * Central point of control for schemas enforced by the server. The
* following duties are presently performed by this class:
*
* <ul>
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Tue May 1 13:29:22 2012
@@ -96,7 +96,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
import org.apache.directory.shared.ldap.model.cursor.SingletonCursor;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -1076,12 +1075,14 @@ public abstract class ServerContext impl
{
try
{
+ // Remember : a JNDI Bind is a LDAP Add ! Silly, insn't it ?
doAddOperation( target, outServerEntry );
}
catch ( Exception e )
{
JndiUtils.wrap( e );
}
+
return;
}
@@ -1121,21 +1122,6 @@ public abstract class ServerContext impl
throw new NamingException( I18n.err( I18n.ERR_495, obj ) );
}
- if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
- {
- for ( Attribute serverAttribute : outServerEntry )
- {
- try
- {
- serverEntry.put( serverAttribute );
- }
- catch ( LdapException le )
- {
- throw new NamingException( I18n.err( I18n.ERR_495, obj ) );
- }
- }
- }
-
// Get target and inject all rdn attributes into entry
injectRdnAttributeValues( target, serverEntry );
@@ -1173,22 +1159,8 @@ public abstract class ServerContext impl
throw new NamingException( I18n.err( I18n.ERR_495, obj ) );
}
- if ( ( outServerEntry != null ) && ( outServerEntry.size() > 0 ) )
- {
- for ( Attribute serverAttribute : outServerEntry )
- {
- try
- {
- serverEntry.put( serverAttribute );
- }
- catch ( LdapException le )
- {
- throw new NamingException( I18n.err( I18n.ERR_495, obj ) );
- }
- }
- }
-
injectRdnAttributeValues( target, serverEntry );
+
try
{
doAddOperation( target, serverEntry );
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java Tue May 1 13:29:22 2012
@@ -49,7 +49,6 @@ import javax.naming.spi.DirectoryManager
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.LdapPrincipal;
-import org.apache.directory.server.core.api.OperationEnum;
import org.apache.directory.server.core.api.entry.ServerEntryUtils;
import org.apache.directory.server.core.api.event.DirectoryListener;
import org.apache.directory.server.core.api.event.NotificationCriteria;
Modified: directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java Tue May 1 13:29:22 2012
@@ -33,7 +33,6 @@ import java.util.Set;
import java.util.UUID;
import javax.naming.ConfigurationException;
-import javax.naming.directory.SearchControls;
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.api.CoreSession;
@@ -43,7 +42,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.api.filtering.CursorList;
import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
import org.apache.directory.server.core.api.interceptor.context.CompareOperationContext;
import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
Modified: directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original)
+++ directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Tue May 1 13:29:22 2012
@@ -24,10 +24,6 @@ import java.net.SocketAddress;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
import javax.naming.Context;
Modified: directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Tue May 1 13:29:22 2012
@@ -21,9 +21,6 @@ package org.apache.directory.server.core
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.event.Evaluator;
Modified: directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/apacheds/trunk/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Tue May 1 13:29:22 2012
@@ -21,8 +21,6 @@ package org.apache.directory.server.core
import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
import javax.naming.directory.SearchControls;
Modified: directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Tue May 1 13:29:22 2012
@@ -583,6 +583,8 @@ public class SchemaInterceptor extends B
else if ( filter instanceof ExtensibleNode )
{
ExtensibleNode node = ( ( ExtensibleNode ) filter );
+
+ // Todo : add the needed checks here
}
else if ( filter instanceof ApproximateNode )
{
Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursorTest.java Tue May 1 13:29:22 2012
@@ -139,7 +139,7 @@ public class DupsContainerCursorTest
recman = new BaseRecordManager( dbFile.getAbsolutePath() );
// gosh this is a terrible use of a global static variable
- //SerializableComparator.setRegistry(
+ //SerializableComparator.setRegistry(
// new MockComparatorRegistry(
// new OidRegistry() ) );
SerializableComparator<String> comparator = new SerializableComparator<String>(
@@ -147,9 +147,7 @@ public class DupsContainerCursorTest
comparator.setSchemaManager( schemaManager );
table = new JdbmTable<String, String>( schemaManager, "test", recman, comparator, null, null );
- Cursor<Tuple<String, DupsContainer<String>>> cursor = null;
-
- cursor = new DupsContainerCursor<String, String>( table );
+ new DupsContainerCursor<String, String>( table );
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadKerberosTime.java Tue May 1 13:29:22 2012
@@ -24,7 +24,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.Asn1Container;
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.util.Strings;
@@ -82,7 +82,7 @@ public abstract class AbstractReadKerber
}
// The value is the KerberosTime
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
String date = Strings.utf8ToString( value.getData() );
try
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadMsgType.java Tue May 1 13:29:22 2012
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.codec.kdcRep.KdcRepContainer;
@@ -85,7 +85,7 @@ public abstract class AbstractReadMsgTyp
throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
}
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
try
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadPvno.java Tue May 1 13:29:22 2012
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -83,7 +83,7 @@ public abstract class AbstractReadPvno<E
throw new DecoderException( I18n.err( I18n.ERR_04067 ) );
}
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
try
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/actions/AbstractReadRealm.java Tue May 1 13:29:22 2012
@@ -24,7 +24,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.Asn1Container;
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -80,7 +80,7 @@ public abstract class AbstractReadRealm<
}
// The value is the realm
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
String realm = Strings.utf8ToString( value.getData() );
if ( IS_DEBUG )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/StoreCksumType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/StoreCksumType.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/StoreCksumType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/checksum/actions/StoreCksumType.java Tue May 1 13:29:22 2012
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.codec.checksum.ChecksumContainer;
import org.apache.directory.shared.kerberos.components.Checksum;
@@ -77,7 +77,7 @@ public class StoreCksumType extends Gram
Checksum checksum = checksumContainer.getChecksum();
// The Checksum's type is an integer
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
try
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreEType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreEType.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreEType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreEType.java Tue May 1 13:29:22 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.codec.etypeInfo2Entry.ETypeInfo2EntryContainer;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
@@ -75,7 +75,7 @@ public class StoreEType extends GrammarA
}
// The etype is an integer
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
EncryptionType etype = null;
ETypeInfo2Entry etypeInfo2Entry = eTypeInfo2EntryContainer.getETypeInfo2Entry();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreSalt.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreSalt.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreSalt.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfo2Entry/actions/StoreSalt.java Tue May 1 13:29:22 2012
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.codec.etypeInfo2Entry.ETypeInfo2EntryContainer;
import org.apache.directory.shared.kerberos.components.ETypeInfo2Entry;
import org.apache.directory.shared.util.Strings;
@@ -65,7 +65,7 @@ public class StoreSalt extends GrammarAc
// The Length may be null
if ( tlv.getLength() != 0 )
{
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
// The encrypted data may be null
if ( value.getData() != null )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreEType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreEType.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreEType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreEType.java Tue May 1 13:29:22 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.codec.etypeInfoEntry.ETypeInfoEntryContainer;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
@@ -75,7 +75,7 @@ public class StoreEType extends GrammarA
}
// The etype is an integer
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
EncryptionType etype = null;
ETypeInfoEntry etypeInfoEntry = eTypeInfoEntryContainer.getETypeInfoEntry();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddEType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddEType.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddEType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/AddEType.java Tue May 1 13:29:22 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.codec.kdcReqBody.KdcReqBodyContainer;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
@@ -76,7 +76,7 @@ public class AddEType extends GrammarAct
KdcReqBody kdcReqBody = kdcReqBodyContainer.getKdcReqBody();
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
try
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreFrom.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreFrom.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreFrom.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreFrom.java Tue May 1 13:29:22 2012
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.codec.kdcReqBody.KdcReqBodyContainer;
@@ -75,7 +75,7 @@ public class StoreFrom extends GrammarAc
KdcReqBody kdcReqBody = kdcReqBodyContainer.getKdcReqBody();
// The value is the KerberosTime
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
String date = Strings.utf8ToString( value.getData() );
try
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreTill.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreTill.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreTill.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/kdcReqBody/actions/StoreTill.java Tue May 1 13:29:22 2012
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.codec.kdcReqBody.KdcReqBodyContainer;
@@ -75,7 +75,7 @@ public class StoreTill extends GrammarAc
KdcReqBody kdcReqBody = kdcReqBodyContainer.getKdcReqBody();
// The value is the KerberosTime
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
String date = Strings.utf8ToString( value.getData() );
try
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/krbError/actions/StoreEText.java Tue May 1 13:29:22 2012
@@ -23,7 +23,7 @@ package org.apache.directory.shared.kerb
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.codec.krbError.KrbErrorContainer;
import org.apache.directory.shared.kerberos.messages.KrbError;
@@ -72,7 +72,7 @@ public class StoreEText extends GrammarA
}
// The value is the realm
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
String eText = Strings.utf8ToString( value.getData() );
KrbError krbError = krbErrorContainer.getKrbError();
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/actions/StoreDataType.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/actions/StoreDataType.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/actions/StoreDataType.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/padata/actions/StoreDataType.java Tue May 1 13:29:22 2012
@@ -26,7 +26,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.kerberos.codec.padata.PaDataContainer;
import org.apache.directory.shared.kerberos.codec.types.PaDataType;
@@ -77,7 +77,7 @@ public class StoreDataType extends Gramm
PaData paData = paDataContainer.getPaData();
// The PaData's type is an integer
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
try
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/principalName/actions/StoreNameString.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/principalName/actions/StoreNameString.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/principalName/actions/StoreNameString.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/principalName/actions/StoreNameString.java Tue May 1 13:29:22 2012
@@ -24,7 +24,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.DecoderException;
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosUtils;
import org.apache.directory.shared.kerberos.codec.principalName.PrincipalNameContainer;
import org.apache.directory.shared.kerberos.components.PrincipalName;
@@ -75,7 +75,7 @@ public class StoreNameString extends Gra
// Get the principalName
PrincipalName principalName = principalNameContainer.getPrincipalName();
- Value value = tlv.getValue();
+ BerValue value = tlv.getValue();
// The PrincipalName must be pure ASCII witout any control character
if ( KerberosUtils.isKerberosString( value.getData() ) )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -129,7 +129,7 @@ public class AdAndOr extends AbstractAsn
public int computeLength()
{
// Compute the condition count length
- int conditionCountLength = Value.getNbBytes( conditionCount );
+ int conditionCountLength = BerValue.getNbBytes( conditionCount );
conditionCountTagLength = 1 + TLV.getNbBytes( conditionCountLength ) + conditionCountLength;
adAndOrSeqLength = 1 + TLV.getNbBytes( conditionCountTagLength ) + conditionCountTagLength;
@@ -166,7 +166,7 @@ public class AdAndOr extends AbstractAsn
// the condition-count
buffer.put( ( byte ) KerberosConstants.AD_AND_OR_CONDITION_COUNT_TAG );
buffer.put( ( byte ) conditionCountTagLength );
- Value.encode( buffer, conditionCount );
+ BerValue.encode( buffer, conditionCount );
// the elements
buffer.put( ( byte ) KerberosConstants.AD_AND_OR_ELEMENTS_TAG );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java Tue May 1 13:29:22 2012
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.codec.types.AuthorizationType;
import org.apache.directory.shared.util.Strings;
@@ -106,7 +106,7 @@ public class AuthorizationData extends A
for ( AuthorizationDataEntry ad : authorizationData )
{
- int adTypeLen = Value.getNbBytes( ad.getAdType().getValue() );
+ int adTypeLen = BerValue.getNbBytes( ad.getAdType().getValue() );
adTypeTagLen[i] = 1 + TLV.getNbBytes( adTypeLen ) + adTypeLen;
adDataTagLen[i] = 1 + TLV.getNbBytes( ad.getAdDataRef().length ) + ad.getAdDataRef().length;
@@ -152,12 +152,12 @@ public class AuthorizationData extends A
// the adType
buffer.put( ( byte ) KerberosConstants.AUTHORIZATION_DATA_ADTYPE_TAG );
buffer.put( TLV.getBytes( adTypeTagLen[i] ) );
- Value.encode( buffer, ad.getAdType().getValue() );
+ BerValue.encode( buffer, ad.getAdType().getValue() );
// the adData
buffer.put( ( byte ) KerberosConstants.AUTHORIZATION_DATA_ADDATA_TAG );
buffer.put( TLV.getBytes( adDataTagLen[i] ) );
- Value.encode( buffer, ad.getAdDataRef() );
+ BerValue.encode( buffer, ad.getAdDataRef() );
i++;
}
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java Tue May 1 13:29:22 2012
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
import org.apache.directory.shared.util.Strings;
@@ -195,7 +195,7 @@ public class Checksum extends AbstractAs
public int computeLength()
{
// Compute the checksulType. The Length will always be contained in 1 byte
- checksumTypeLength = 1 + 1 + Value.getNbBytes( cksumtype.getValue() );
+ checksumTypeLength = 1 + 1 + BerValue.getNbBytes( cksumtype.getValue() );
checksumLength = 1 + TLV.getNbBytes( checksumTypeLength ) + checksumTypeLength;
// Compute the checksum Value
@@ -211,7 +211,7 @@ public class Checksum extends AbstractAs
checksumLength += 1 + TLV.getNbBytes( checksumBytesLength ) + checksumBytesLength;
// Compute the whole sequence length
- int checksumSeqLength = 1 + Value.getNbBytes( checksumLength ) + checksumLength;
+ int checksumSeqLength = 1 + BerValue.getNbBytes( checksumLength ) + checksumLength;
return checksumSeqLength;
@@ -250,12 +250,12 @@ public class Checksum extends AbstractAs
// The cksumtype, first the tag, then the value
buffer.put( ( byte ) KerberosConstants.CHECKSUM_TYPE_TAG );
buffer.put( TLV.getBytes( checksumTypeLength ) );
- Value.encode( buffer, cksumtype.getValue() );
+ BerValue.encode( buffer, cksumtype.getValue() );
// The checksum, first the tag, then the value
buffer.put( ( byte ) KerberosConstants.CHECKSUM_CHECKSUM_TAG );
buffer.put( TLV.getBytes( checksumBytesLength ) );
- Value.encode( buffer, checksum );
+ BerValue.encode( buffer, checksum );
}
catch ( BufferOverflowException boe )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.util.Strings;
@@ -173,7 +173,7 @@ public class ETypeInfo2Entry extends Abs
public int computeLength()
{
// Compute the etype. The Length will always be contained in 1 byte
- int etypeLength = Value.getNbBytes( etype.getValue() );
+ int etypeLength = BerValue.getNbBytes( etype.getValue() );
etypeTagLength = 1 + TLV.getNbBytes( etypeLength ) + etypeLength;
etypeInfo2EntrySeqLength = 1 + TLV.getNbBytes( etypeTagLength ) + etypeTagLength;
@@ -229,7 +229,7 @@ public class ETypeInfo2Entry extends Abs
// The etype, first the tag, then the value
buffer.put( ( byte ) KerberosConstants.ETYPE_INFO2_ENTRY_ETYPE_TAG );
buffer.put( TLV.getBytes( etypeTagLength ) );
- Value.encode( buffer, etype.getValue() );
+ BerValue.encode( buffer, etype.getValue() );
// The salt, first the tag, then the value, if salt is not null
if ( salt != null )
@@ -249,7 +249,7 @@ public class ETypeInfo2Entry extends Abs
{
buffer.put( ( byte ) KerberosConstants.ETYPE_INFO2_ENTRY_S2KPARAMS_TAG );
buffer.put( TLV.getBytes( saltTagLength ) );
- Value.encode( buffer, s2kparams );
+ BerValue.encode( buffer, s2kparams );
}
}
catch ( BufferOverflowException boe )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.util.Strings;
@@ -154,7 +154,7 @@ public class ETypeInfoEntry extends Abst
public int computeLength()
{
// Compute the etype. The Length will always be contained in 1 byte
- int etypeLength = Value.getNbBytes( etype.getValue() );
+ int etypeLength = BerValue.getNbBytes( etype.getValue() );
etypeTagLength = 1 + TLV.getNbBytes( etypeLength ) + etypeLength;
etypeInfoEntrySeqLength = 1 + TLV.getNbBytes( etypeTagLength ) + etypeTagLength;
@@ -200,14 +200,14 @@ public class ETypeInfoEntry extends Abst
// The etype, first the tag, then the value
buffer.put( ( byte ) KerberosConstants.ETYPE_INFO_ENTRY_ETYPE_TAG );
buffer.put( TLV.getBytes( etypeTagLength ) );
- Value.encode( buffer, etype.getValue() );
+ BerValue.encode( buffer, etype.getValue() );
// The salt, first the tag, then the value, if salt is not null
if ( salt != null )
{
buffer.put( ( byte ) KerberosConstants.ETYPE_INFO_ENTRY_SALT_TAG );
buffer.put( TLV.getBytes( saltTagLength ) );
- Value.encode( buffer, salt );
+ BerValue.encode( buffer, salt );
}
}
catch ( BufferOverflowException boe )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.flags.TicketFlags;
@@ -455,7 +455,7 @@ public class EncKdcRepPart extends Abstr
encKdcRepPartSeqLength += 1 + TLV.getNbBytes( lastReqLength ) + lastReqLength;
// The nonce
- nonceLength = Value.getNbBytes( nonce );
+ nonceLength = BerValue.getNbBytes( nonce );
nonceLength = 1 + TLV.getNbBytes( nonceLength ) + nonceLength;
encKdcRepPartSeqLength += 1 + TLV.getNbBytes( nonceLength ) + nonceLength;
@@ -540,7 +540,7 @@ public class EncKdcRepPart extends Abstr
// The nonce
buffer.put( ( byte ) KerberosConstants.ENC_KDC_REP_PART_NONCE_TAG );
buffer.put( TLV.getBytes( nonceLength ) );
- Value.encode( buffer, nonce );
+ BerValue.encode( buffer, nonce );
// The key-expiration, if any
if ( keyExpiration != null )
@@ -556,7 +556,7 @@ public class EncKdcRepPart extends Abstr
// The flags
buffer.put( ( byte ) KerberosConstants.ENC_KDC_REP_PART_FLAGS_TAG );
buffer.put( TLV.getBytes( 0x07 ) );
- Value.encode( buffer, flags );
+ BerValue.encode( buffer, flags );
// The authtime
buffer.put( ( byte ) KerberosConstants.ENC_KDC_REP_PART_AUTH_TIME_TAG );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java Tue May 1 13:29:22 2012
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.util.Strings;
@@ -141,7 +141,7 @@ public class EncKrbCredPart extends Abst
if ( nonce != null )
{
- nonceLen = Value.getNbBytes( nonce );
+ nonceLen = BerValue.getNbBytes( nonce );
nonceLen = 1 + TLV.getNbBytes( nonceLen ) + nonceLen;
encKrbCredPartSeqLen += 1 + TLV.getNbBytes( nonceLen ) + nonceLen;
}
@@ -155,7 +155,7 @@ public class EncKrbCredPart extends Abst
if ( usec != null )
{
- usecLen = Value.getNbBytes( usec );
+ usecLen = BerValue.getNbBytes( usec );
usecLen = 1 + TLV.getNbBytes( usecLen ) + usecLen;
encKrbCredPartSeqLen += 1 + TLV.getNbBytes( usecLen ) + usecLen;
}
@@ -217,7 +217,7 @@ public class EncKrbCredPart extends Abst
// nonce tag and value
buffer.put( ( byte ) KerberosConstants.ENC_KRB_CRED_PART_NONCE_TAG );
buffer.put( TLV.getBytes( nonceLen ) );
- Value.encode( buffer, nonce );
+ BerValue.encode( buffer, nonce );
}
if ( timestamp != null )
@@ -236,7 +236,7 @@ public class EncKrbCredPart extends Abst
// usec tag and value
buffer.put( ( byte ) KerberosConstants.ENC_KRB_CRED_PART_USEC_TAG );
buffer.put( TLV.getBytes( usecLen ) );
- Value.encode( buffer, usec );
+ BerValue.encode( buffer, usec );
}
if ( senderAddress != null )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java Tue May 1 13:29:22 2012
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.util.Strings;
@@ -261,14 +261,14 @@ public class EncKrbPrivPart extends Abst
if ( usec != null )
{
- usecLen = Value.getNbBytes( usec );
+ usecLen = BerValue.getNbBytes( usec );
usecLen = 1 + TLV.getNbBytes( usecLen ) + usecLen;
encKrbPrivPartSeqLen += 1 + TLV.getNbBytes( usecLen ) + usecLen;
}
if ( seqNumber != null )
{
- seqNumberLen = Value.getNbBytes( seqNumber );
+ seqNumberLen = BerValue.getNbBytes( seqNumber );
seqNumberLen = 1 + TLV.getNbBytes( seqNumberLen ) + seqNumberLen;
encKrbPrivPartSeqLen += 1 + TLV.getNbBytes( seqNumberLen ) + seqNumberLen;
}
@@ -307,7 +307,7 @@ public class EncKrbPrivPart extends Abst
// user-data
buffer.put( ( byte ) KerberosConstants.KRB_SAFE_BODY_USER_DATA_TAG );
buffer.put( TLV.getBytes( userDataLen ) );
- Value.encode( buffer, userData );
+ BerValue.encode( buffer, userData );
if ( timestamp != null )
{
@@ -326,7 +326,7 @@ public class EncKrbPrivPart extends Abst
// usec
buffer.put( ( byte ) KerberosConstants.KRB_SAFE_BODY_USEC_TAG );
buffer.put( TLV.getBytes( usecLen ) );
- Value.encode( buffer, usec );
+ BerValue.encode( buffer, usec );
}
if ( seqNumber != null )
@@ -334,7 +334,7 @@ public class EncKrbPrivPart extends Abst
// seq-number
buffer.put( ( byte ) KerberosConstants.KRB_SAFE_BODY_SEQ_NUMBER_TAG );
buffer.put( TLV.getBytes( seqNumberLen ) );
- Value.encode( buffer, seqNumber );
+ BerValue.encode( buffer, seqNumber );
}
// s-address
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java Tue May 1 13:29:22 2012
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.flags.TicketFlag;
@@ -250,7 +250,7 @@ public class EncTicketPart extends Abstr
// flags tag and int value
buffer.put( ( byte ) KerberosConstants.ENC_TICKET_PART_FLAGS_TAG );
buffer.put( TLV.getBytes( flagsLen ) );
- Value.encode( buffer, flags );
+ BerValue.encode( buffer, flags );
// key tag and value
buffer.put( ( byte ) KerberosConstants.ENC_TICKET_PART_KEY_TAG );
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java Tue May 1 13:29:22 2012
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -217,14 +217,14 @@ public class EncryptedData extends Abstr
encryptedDataSeqLength = 0;
// Compute the encryption Type length
- int eTypeLength = Value.getNbBytes( eType.getValue() );
+ int eTypeLength = BerValue.getNbBytes( eType.getValue() );
eTypeTagLength = 1 + TLV.getNbBytes( eTypeLength ) + eTypeLength;
encryptedDataSeqLength = 1 + TLV.getNbBytes( eTypeTagLength ) + eTypeTagLength;
// Compute the kvno length if any
if ( hasKvno )
{
- int kvnoLength = Value.getNbBytes( kvno );
+ int kvnoLength = BerValue.getNbBytes( kvno );
kvnoTagLength = 1 + TLV.getNbBytes( kvnoLength ) + kvnoLength;
encryptedDataSeqLength += 1 + TLV.getNbBytes( kvnoTagLength ) + kvnoTagLength;
}
@@ -284,7 +284,7 @@ public class EncryptedData extends Abstr
buffer.put( ( byte ) 0xA0 );
buffer.put( TLV.getBytes( eTypeTagLength ) );
- Value.encode( buffer, eType.getValue() );
+ BerValue.encode( buffer, eType.getValue() );
// The kvno, if any, first the tag, then the value
if ( hasKvno )
@@ -292,13 +292,13 @@ public class EncryptedData extends Abstr
buffer.put( ( byte ) 0xA1 );
buffer.put( TLV.getBytes( kvnoTagLength ) );
- Value.encode( buffer, kvno );
+ BerValue.encode( buffer, kvno );
}
// The cipher tag
buffer.put( ( byte ) 0xA2 );
buffer.put( TLV.getBytes( cipherTagLength ) );
- Value.encode( buffer, cipher );
+ BerValue.encode( buffer, cipher );
}
catch ( BufferOverflowException boe )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java Tue May 1 13:29:22 2012
@@ -29,7 +29,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.util.Strings;
@@ -244,7 +244,7 @@ public class EncryptionKey extends Abstr
public int computeLength()
{
// Compute the keyType. The Length will always be cobntained in 1 byte
- keyTypeLength = 1 + 1 + Value.getNbBytes( keyType.getValue() );
+ keyTypeLength = 1 + 1 + BerValue.getNbBytes( keyType.getValue() );
encryptionKeyLength = 1 + TLV.getNbBytes( keyTypeLength ) + keyTypeLength;
// Compute the keyValue
@@ -260,7 +260,7 @@ public class EncryptionKey extends Abstr
encryptionKeyLength += 1 + TLV.getNbBytes( keyValueLength ) + keyValueLength;
// Compute the whole sequence length
- int encryptionKeySeqLength = 1 + Value.getNbBytes( encryptionKeyLength ) + encryptionKeyLength;
+ int encryptionKeySeqLength = 1 + BerValue.getNbBytes( encryptionKeyLength ) + encryptionKeyLength;
return encryptionKeySeqLength;
@@ -298,12 +298,12 @@ public class EncryptionKey extends Abstr
// The keyType, first the tag, then the value
buffer.put( ( byte ) KerberosConstants.ENCRYPTION_KEY_TYPE_TAG );
buffer.put( TLV.getBytes( keyTypeLength ) );
- Value.encode( buffer, keyType.getValue() );
+ BerValue.encode( buffer, keyType.getValue() );
// The keyValue, first the tag, then the value
buffer.put( ( byte ) KerberosConstants.ENCRYPTION_KEY_VALUE_TAG );
buffer.put( TLV.getBytes( keyValueLength ) );
- Value.encode( buffer, keyValue );
+ BerValue.encode( buffer, keyValue );
}
catch ( BufferOverflowException boe )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java Tue May 1 13:29:22 2012
@@ -31,7 +31,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.codec.types.HostAddrType;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -230,7 +230,7 @@ public class HostAddress extends Abstrac
public int computeLength()
{
// Compute the keyType. The Length will always be contained in 1 byte
- addrTypeLength = 1 + 1 + Value.getNbBytes( addrType.getValue() );
+ addrTypeLength = 1 + 1 + BerValue.getNbBytes( addrType.getValue() );
hostAddressLength = 1 + TLV.getNbBytes( addrTypeLength ) + addrTypeLength;
// Compute the keyValue
@@ -246,7 +246,7 @@ public class HostAddress extends Abstrac
hostAddressLength += 1 + TLV.getNbBytes( addressLength ) + addressLength;
// Compute the whole sequence length
- hostAddressSeqLength = 1 + Value.getNbBytes( hostAddressLength ) + hostAddressLength;
+ hostAddressSeqLength = 1 + BerValue.getNbBytes( hostAddressLength ) + hostAddressLength;
return hostAddressSeqLength;
}
@@ -283,12 +283,12 @@ public class HostAddress extends Abstrac
// The addr-type, first the tag, then the value
buffer.put( ( byte ) 0xA0 );
buffer.put( TLV.getBytes( addrTypeLength ) );
- Value.encode( buffer, addrType.getValue() );
+ BerValue.encode( buffer, addrType.getValue() );
// The address, first the tag, then the value
buffer.put( ( byte ) 0xA1 );
buffer.put( TLV.getBytes( addressLength ) );
- Value.encode( buffer, address );
+ BerValue.encode( buffer, address );
}
catch ( BufferOverflowException boe )
{
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.messages.KerberosMessage;
@@ -356,7 +356,7 @@ public class KdcRep extends KerberosMess
buffer.put( TLV.getBytes( pvnoLength ) );
// The value
- Value.encode( buffer, getProtocolVersionNumber() );
+ BerValue.encode( buffer, getProtocolVersionNumber() );
// The MSG-TYPE if any ------------------------------------------------
// The tag
@@ -364,7 +364,7 @@ public class KdcRep extends KerberosMess
buffer.put( TLV.getBytes( msgTypeLength ) );
// The value
- Value.encode( buffer, getMessageType().getValue() );
+ BerValue.encode( buffer, getMessageType().getValue() );
// The PD-DATA if any -------------------------------------------------
if ( paData.size() != 0 )
Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java?rev=1332645&r1=1332644&r2=1332645&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java (original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java Tue May 1 13:29:22 2012
@@ -28,7 +28,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import org.apache.directory.shared.asn1.ber.tlv.BerValue;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.messages.KerberosMessage;
@@ -223,7 +223,7 @@ public abstract class KdcReq extends Ker
buffer.put( TLV.getBytes( pvnoLength ) );
// The value
- Value.encode( buffer, getProtocolVersionNumber() );
+ BerValue.encode( buffer, getProtocolVersionNumber() );
// The msg-type if any ------------------------------------------------
// The tag
@@ -231,7 +231,7 @@ public abstract class KdcReq extends Ker
buffer.put( TLV.getBytes( msgTypeLength ) );
// The value
- Value.encode( buffer, getMessageType().getValue() );
+ BerValue.encode( buffer, getMessageType().getValue() );
// The PD-DATA if any -------------------------------------------------
if ( paData.size() > 0 )