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 2010/09/05 16:56:43 UTC
svn commit: r992800 [4/4] - in /directory:
apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/
apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/v...
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java?rev=992800&r1=992799&r2=992800&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/persistentSearch/PersistentSearchControlGrammar.java Sun Sep 5 14:56:40 2010
@@ -22,9 +22,9 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.States;
import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
import org.apache.directory.shared.asn1.ber.tlv.Value;
@@ -88,10 +88,10 @@ public class PersistentSearchControlGram
*
* Initialize the persistence search object
*/
- super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE_TAG] =
+ super.transitions[States.INIT_GRAMMAR_STATE][UniversalTag.SEQUENCE.getValue()] =
new GrammarTransition( States.INIT_GRAMMAR_STATE,
PersistentSearchControlStatesEnum.PSEARCH_SEQUENCE_STATE,
- UniversalTag.SEQUENCE_TAG, null );
+ UniversalTag.SEQUENCE.getValue(), null );
/**
@@ -102,10 +102,10 @@ public class PersistentSearchControlGram
*
* Stores the change types value
*/
- super.transitions[PersistentSearchControlStatesEnum.PSEARCH_SEQUENCE_STATE][UniversalTag.INTEGER_TAG] =
+ super.transitions[PersistentSearchControlStatesEnum.PSEARCH_SEQUENCE_STATE][UniversalTag.INTEGER.getValue()] =
new GrammarTransition( PersistentSearchControlStatesEnum.PSEARCH_SEQUENCE_STATE,
PersistentSearchControlStatesEnum.CHANGE_TYPES_STATE,
- UniversalTag.INTEGER_TAG,
+ UniversalTag.INTEGER.getValue(),
new GrammarAction( "Set PSearchControl changeTypes" )
{
public void action( IAsn1Container container ) throws DecoderException
@@ -145,9 +145,9 @@ public class PersistentSearchControlGram
*
* Stores the change only flag
*/
- super.transitions[PersistentSearchControlStatesEnum.CHANGE_TYPES_STATE][UniversalTag.BOOLEAN_TAG] =
+ super.transitions[PersistentSearchControlStatesEnum.CHANGE_TYPES_STATE][UniversalTag.BOOLEAN.getValue()] =
new GrammarTransition( PersistentSearchControlStatesEnum.CHANGE_TYPES_STATE,
- PersistentSearchControlStatesEnum.CHANGES_ONLY_STATE, UniversalTag.BOOLEAN_TAG,
+ PersistentSearchControlStatesEnum.CHANGES_ONLY_STATE, UniversalTag.BOOLEAN.getValue(),
new GrammarAction( "Set PSearchControl changesOnly" )
{
public void action( IAsn1Container container ) throws DecoderException
@@ -184,9 +184,9 @@ public class PersistentSearchControlGram
*
* Stores the return ECs flag
*/
- super.transitions[PersistentSearchControlStatesEnum.CHANGES_ONLY_STATE][UniversalTag.BOOLEAN_TAG] =
+ super.transitions[PersistentSearchControlStatesEnum.CHANGES_ONLY_STATE][UniversalTag.BOOLEAN.getValue()] =
new GrammarTransition( PersistentSearchControlStatesEnum.CHANGES_ONLY_STATE,
- PersistentSearchControlStatesEnum.RETURN_ECS_STATE, UniversalTag.BOOLEAN_TAG,
+ PersistentSearchControlStatesEnum.RETURN_ECS_STATE, UniversalTag.BOOLEAN.getValue(),
new GrammarAction( "Set PSearchControl returnECs" )
{
public void action( IAsn1Container container ) throws DecoderException
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControl.java?rev=992800&r1=992799&r2=992800&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControl.java Sun Sep 5 14:56:40 2010
@@ -106,7 +106,7 @@ public class SubentriesControl extends A
super.encode( buffer );
// Encode the OCTET_STRING tag
- buffer.put( UniversalTag.OCTET_STRING_TAG );
+ buffer.put( UniversalTag.OCTET_STRING.getValue() );
buffer.put( TLV.getBytes( valueLength ) );
// Now encode the Subentries specific part
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java?rev=992800&r1=992799&r2=992800&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subentries/SubentriesControlGrammar.java Sun Sep 5 14:56:40 2010
@@ -22,9 +22,9 @@ package org.apache.directory.shared.ldap
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
+import org.apache.directory.shared.asn1.ber.grammar.Grammar;
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
-import org.apache.directory.shared.asn1.ber.grammar.Grammar;
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;
@@ -63,9 +63,9 @@ public class SubentriesControlGrammar ex
// Create the transitions table
super.transitions = new GrammarTransition[SubentriesControlStatesEnum.LAST_SUB_ENTRY_STATE][256];
- super.transitions[SubentriesControlStatesEnum.START_STATE][UniversalTag.BOOLEAN_TAG] =
+ super.transitions[SubentriesControlStatesEnum.START_STATE][UniversalTag.BOOLEAN.getValue()] =
new GrammarTransition( SubentriesControlStatesEnum.START_STATE,
- SubentriesControlStatesEnum.SUB_ENTRY_VISIBILITY_STATE, UniversalTag.BOOLEAN_TAG,
+ SubentriesControlStatesEnum.SUB_ENTRY_VISIBILITY_STATE, UniversalTag.BOOLEAN.getValue(),
new GrammarAction( "SubEntryControl visibility" )
{
public void action( IAsn1Container container ) throws DecoderException
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java?rev=992800&r1=992799&r2=992800&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java Sun Sep 5 14:56:40 2010
@@ -107,7 +107,7 @@ public class LdapProtocolEncoder extends
try
{
// The LdapMessage Sequence
- buffer.put( UniversalTag.SEQUENCE_TAG );
+ buffer.put( UniversalTag.SEQUENCE.getValue() );
// The length has been calculated by the computeLength method
buffer.put( TLV.getBytes( ( ( AbstractMessage ) message ).getMessageLength() ) );
@@ -305,7 +305,7 @@ public class LdapProtocolEncoder extends
try
{
// The result code
- buffer.put( UniversalTag.ENUMERATED_TAG );
+ buffer.put( UniversalTag.ENUMERATED.getValue() );
buffer.put( ( byte ) 1 );
buffer.put( ( byte ) ldapResult.getResultCode().getValue() );
}
@@ -1410,7 +1410,7 @@ public class LdapProtocolEncoder extends
Value.encode( buffer, DN.getBytes( addRequest.getEntryDn() ) );
// The attributes sequence
- buffer.put( UniversalTag.SEQUENCE_TAG );
+ buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( addRequest.getEntryLength() ) );
// The partial attribute list
@@ -1424,7 +1424,7 @@ public class LdapProtocolEncoder extends
for ( EntryAttribute attribute : entry )
{
// The attributes list sequence
- buffer.put( UniversalTag.SEQUENCE_TAG );
+ buffer.put( UniversalTag.SEQUENCE.getValue() );
int localAttributeLength = addRequest.getAttributesLength().get( attributeNumber );
buffer.put( TLV.getBytes( localAttributeLength ) );
@@ -1432,7 +1432,7 @@ public class LdapProtocolEncoder extends
Value.encode( buffer, attribute.getId() );
// The values
- buffer.put( UniversalTag.SET_TAG );
+ buffer.put( UniversalTag.SET.getValue() );
int localValuesLength = addRequest.getValuesLength().get( attributeNumber );
buffer.put( TLV.getBytes( localValuesLength ) );
@@ -1650,7 +1650,7 @@ public class LdapProtocolEncoder extends
Value.encode( buffer, DN.getBytes( compareRequest.getName() ) );
// The attributeValueAssertion sequence Tag
- buffer.put( UniversalTag.SEQUENCE_TAG );
+ buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( compareRequest.getAvaLength() ) );
}
catch ( BufferOverflowException boe )
@@ -1944,7 +1944,7 @@ public class LdapProtocolEncoder extends
Value.encode( buffer, DN.getBytes( modifyRequest.getName() ) );
// The modifications sequence
- buffer.put( UniversalTag.SEQUENCE_TAG );
+ buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( modifyRequest.getChangesLength() ) );
// The modifications list
@@ -1958,18 +1958,18 @@ public class LdapProtocolEncoder extends
for ( Modification modification : modifications )
{
// The modification sequence
- buffer.put( UniversalTag.SEQUENCE_TAG );
+ buffer.put( UniversalTag.SEQUENCE.getValue() );
int localModificationSequenceLength = modifyRequest.getChangeLength().get( modificationNumber );
buffer.put( TLV.getBytes( localModificationSequenceLength ) );
// The operation. The value has to be changed, it's not
// the same value in DirContext and in RFC 2251.
- buffer.put( UniversalTag.ENUMERATED_TAG );
+ buffer.put( UniversalTag.ENUMERATED.getValue() );
buffer.put( ( byte ) 1 );
buffer.put( ( byte ) modification.getOperation().getValue() );
// The modification
- buffer.put( UniversalTag.SEQUENCE_TAG );
+ buffer.put( UniversalTag.SEQUENCE.getValue() );
int localModificationLength = modifyRequest.getModificationLength().get( modificationNumber );
buffer.put( TLV.getBytes( localModificationLength ) );
@@ -1977,7 +1977,7 @@ public class LdapProtocolEncoder extends
Value.encode( buffer, modification.getAttribute().getId() );
// The values
- buffer.put( UniversalTag.SET_TAG );
+ buffer.put( UniversalTag.SET.getValue() );
int localValuesLength = modifyRequest.getValuesLength().get( modificationNumber );
buffer.put( TLV.getBytes( localValuesLength ) );
@@ -2163,7 +2163,7 @@ public class LdapProtocolEncoder extends
searchRequest.getCurrentFilter().encode( buffer );
// The attributeDescriptionList
- buffer.put( UniversalTag.SEQUENCE_TAG );
+ buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( searchRequest.getAttributeDescriptionListLength() ) );
if ( ( searchRequest.getAttributes() != null ) && ( searchRequest.getAttributes().size() != 0 ) )
@@ -2245,7 +2245,7 @@ public class LdapProtocolEncoder extends
Value.encode( buffer, searchResultEntry.getObjectNameBytes() );
// The attributes sequence
- buffer.put( UniversalTag.SEQUENCE_TAG );
+ buffer.put( UniversalTag.SEQUENCE.getValue() );
buffer.put( TLV.getBytes( searchResultEntry.getAttributesLength() ) );
// The partial attribute list
@@ -2259,7 +2259,7 @@ public class LdapProtocolEncoder extends
for ( EntryAttribute attribute : entry )
{
// The partial attribute list sequence
- buffer.put( UniversalTag.SEQUENCE_TAG );
+ buffer.put( UniversalTag.SEQUENCE.getValue() );
int localAttributeLength = searchResultEntry.getAttributeLength().get( attributeNumber );
buffer.put( TLV.getBytes( localAttributeLength ) );
@@ -2267,7 +2267,7 @@ public class LdapProtocolEncoder extends
Value.encode( buffer, Asn1StringUtils.asciiStringToByte( attribute.getUpId() ) );
// The values
- buffer.put( UniversalTag.SET_TAG );
+ buffer.put( UniversalTag.SET.getValue() );
int localValuesLength = searchResultEntry.getValsLength().get( attributeNumber );
buffer.put( TLV.getBytes( localValuesLength ) );