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 2008/05/12 13:49:46 UTC
svn commit: r655480 [5/11] - in /directory:
apacheds/trunk/apacheds-jdbm/src/examples/
apacheds/trunk/apacheds-jdbm/src/main/java/jdbm/btree/
apacheds/trunk/bootstrap-extract/src/main/java/org/apache/directory/server/schema/bootstrap/partition/
apached...
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/IAsn1Container.java Mon May 12 04:49:35 2008
@@ -29,6 +29,7 @@
* Every ASN1 container must implement this interface.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public interface IAsn1Container
{
@@ -57,7 +58,7 @@
*
* @param tlv The current TLV
*/
- public void setCurrentTLV( TLV tlv );
+ void setCurrentTLV( TLV tlv );
/**
@@ -65,7 +66,7 @@
*
* @return Returns the current TLV being decoded
*/
- public TLV getCurrentTLV();
+ TLV getCurrentTLV();
/**
@@ -73,7 +74,7 @@
*
* @return Returns the grammar used to decode a LdapMessage.
*/
- public IGrammar getGrammar();
+ IGrammar getGrammar();
/**
@@ -81,7 +82,7 @@
*
* @return Returns the transition from the previous state to the new state
*/
- public int getTransition();
+ int getTransition();
/**
@@ -89,18 +90,18 @@
*
* @param transition The transition to set
*/
- public void setTransition( int transition );
+ void setTransition( int transition );
/**
* @return Returns the states.
*/
- public IStates getStates();
+ IStates getStates();
/**
* @return get the parent TLV.
*/
- public TLV getParentTLV();
+ TLV getParentTLV();
/**
@@ -108,7 +109,7 @@
*
* @param parentTLV The new parent TLV
*/
- public void setParentTLV( TLV parentTLV );
+ void setParentTLV( TLV parentTLV );
/**
@@ -116,7 +117,7 @@
*
* @return true if this can be the last transition
*/
- public boolean isGrammarEndAllowed();
+ boolean isGrammarEndAllowed();
/**
@@ -125,17 +126,17 @@
* @param grammarEndAllowed true or false, depending on the next transition
* being an end or not.
*/
- public void grammarEndAllowed( boolean grammarEndAllowed );
+ void grammarEndAllowed( boolean grammarEndAllowed );
/**
* Get a new TLV id
* @return a unique value representing the current TLV id
*/
- public int getNewTlvId();
+ int getNewTlvId();
/**
* Get the current TLV id
* @return a unique value representing the current TLV id
*/
- public int getTlvId();
+ int getTlvId();
}
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java Mon May 12 04:49:35 2008
@@ -23,9 +23,9 @@
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.util.Asn1StringUtils;
-import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -33,6 +33,7 @@
* the transitions table.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public abstract class AbstractGrammar implements IGrammar
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarAction.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarAction.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarAction.java Mon May 12 04:49:35 2008
@@ -25,6 +25,7 @@
* Those informations are not mandatory, but they can be usefull for debugging.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public abstract class GrammarAction implements IAction
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/GrammarTransition.java Mon May 12 04:49:35 2008
@@ -28,6 +28,7 @@
* state, and the action to execute while transiting.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class GrammarTransition
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IAction.java Mon May 12 04:49:35 2008
@@ -29,6 +29,7 @@
* in all the implementong classes.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public interface IAction
{
@@ -43,5 +44,5 @@
* @throws DecoderException
* Thrown if something went wrong.
*/
- public void action( IAsn1Container container ) throws DecoderException;
+ void action( IAsn1Container container ) throws DecoderException;
}
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IGrammar.java Mon May 12 04:49:35 2008
@@ -28,6 +28,7 @@
* The interface which expose common behavior of a Gramar implementer.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public interface IGrammar
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IStates.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IStates.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IStates.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/IStates.java Mon May 12 04:49:35 2008
@@ -20,26 +20,24 @@
package org.apache.directory.shared.asn1.ber.grammar;
-import org.apache.directory.shared.asn1.ber.grammar.IGrammar;
-
-
/**
* This interface is used to store the different states of a grammar. While
* tracing debugging information, the methods to dump the current state as a
* string are called.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public interface IStates
{
/** The initial state of every grammar */
- static int INIT_GRAMMAR_STATE = 0;
+ int INIT_GRAMMAR_STATE = 0;
/** The ending state for every grammars */
- static int GRAMMAR_END = -1;
+ int GRAMMAR_END = -1;
/** The END_STATE */
- static int END_STATE = -1;
+ int END_STATE = -1;
/** Get the current state */
String getState( int state );
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/ITLVBerDecoderMBean.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/ITLVBerDecoderMBean.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/ITLVBerDecoderMBean.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/ITLVBerDecoderMBean.java Mon May 12 04:49:35 2008
@@ -25,6 +25,7 @@
/**
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public interface ITLVBerDecoderMBean
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLV.java Mon May 12 04:49:35 2008
@@ -27,6 +27,7 @@
* This class is used to store Tag, Length and Value decoded from a PDU.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class TLV
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLVStateEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLVStateEnum.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLVStateEnum.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/TLVStateEnum.java Mon May 12 04:49:35 2008
@@ -24,6 +24,7 @@
* Stores the different states of a PDU parsing.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class TLVStateEnum
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/UniversalTag.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/UniversalTag.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/UniversalTag.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/UniversalTag.java Mon May 12 04:49:35 2008
@@ -166,6 +166,7 @@
* </table>
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class UniversalTag
{
@@ -271,13 +272,13 @@
/** String representation of the tags */
private static final String[] UNIVERSAL_TAG_STRING =
{
- "RESERVED_0",
- "BOOLEAN",
- "INTEGER",
- "BIT_STRING",
- "OCTET_STRING",
- "NULL",
- "OBJECT_IDENTIFIER",
+ "RESERVED_0",
+ "BOOLEAN",
+ "INTEGER",
+ "BIT_STRING",
+ "OCTET_STRING",
+ "NULL",
+ "OBJECT_IDENTIFIER",
"OBJECT_DESCRIPTOR",
"EXTERNAL_INSTANCE_OF",
"REAL",
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/tlv/Value.java Mon May 12 04:49:35 2008
@@ -20,25 +20,25 @@
package org.apache.directory.shared.asn1.ber.tlv;
-import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
+import java.io.Serializable;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.asn1.primitives.BitString;
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.shared.asn1.util.Asn1StringUtils;
-import java.io.Serializable;
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-
/**
* This class stores the data decoded from a TLV.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class Value implements Cloneable, Serializable
{
- public static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
// ~ Instance fields
// ----------------------------------------------------------------------------
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderCallback.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderCallback.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderCallback.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderCallback.java Mon May 12 04:49:35 2008
@@ -24,7 +24,7 @@
* Document me.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
- * $Rev$
+ * @version $Rev$, $Date$
*/
public interface EncoderCallback
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderMonitor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderMonitor.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderMonitor.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderMonitor.java Mon May 12 04:49:35 2008
@@ -24,12 +24,12 @@
* Document me.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
- * $Rev$
+ * @version $Rev$, $Date$
*/
public interface EncoderMonitor
{
/** Use this if you don't want to recreate this as just a NOOP monitor */
- public EncoderMonitor INSTANCE = new EncoderMonitorAdapter();
+ EncoderMonitor INSTANCE = new EncoderMonitorAdapter();
/**
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderMonitorAdapter.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderMonitorAdapter.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderMonitorAdapter.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/EncoderMonitorAdapter.java Mon May 12 04:49:35 2008
@@ -24,7 +24,7 @@
* Document me.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
- * $Rev$
+ * @version $Rev$, $Date$
*/
public class EncoderMonitorAdapter implements EncoderMonitor
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulEncoder.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulEncoder.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulEncoder.java Mon May 12 04:49:35 2008
@@ -27,16 +27,16 @@
* The StatefulEncoder interface.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
- * $Rev$
+ * @version $Rev$, $Date$
*/
public interface StatefulEncoder
{
- public void encode( Object obj ) throws EncoderException;
+ void encode( Object obj ) throws EncoderException;
- public void setCallback( EncoderCallback cb );
+ void setCallback( EncoderCallback cb );
- public void setEncoderMonitor( EncoderMonitor monitor );
+ void setEncoderMonitor( EncoderMonitor monitor );
}
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/BitString.java Mon May 12 04:49:35 2008
@@ -28,6 +28,7 @@
* an array of int.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class BitString implements Serializable
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java Mon May 12 04:49:35 2008
@@ -58,6 +58,7 @@
* .2 -> 0x02
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class OID implements Serializable
{
@@ -83,7 +84,7 @@
{
// We should not create this kind of object directly, it must
// be created through the factory.
- hash = 0;
+ hash = 0;
}
@@ -531,17 +532,17 @@
*/
private int computeHashCode()
{
- int h = 37;
-
- for ( long val:oidValues )
- {
- int low = (int)(val & 0x0000FFFFL);
- int high = (int)(val >> 32);
- h = h*17 + high;
- h = h*17 + low;
- }
-
- return h;
+ int h = 37;
+
+ for ( long val:oidValues )
+ {
+ int low = (int)(val & 0x0000FFFFL);
+ int high = (int)(val >> 32);
+ h = h*17 + high;
+ h = h*17 + low;
+ }
+
+ return h;
}
/**
@@ -600,9 +601,10 @@
{
case '0': // itu-t
+ // fallthrough
case '1': // iso
ituOrIso = true;
- // fallthrough
+ // fallthrough
case '2': // joint-iso-itu-t
break;
@@ -690,7 +692,7 @@
*/
public int hashCode()
{
- return hash;
+ return hash;
}
public boolean equals( Object oid )
@@ -711,15 +713,15 @@
}
OID instance = (OID)oid;
-
- if ( instance.hash != hash )
- {
- return false;
- }
- else
- {
- return Arrays.equals( instance.oidValues, oidValues );
- }
+
+ if ( instance.hash != hash )
+ {
+ return false;
+ }
+ else
+ {
+ return Arrays.equals( instance.oidValues, oidValues );
+ }
}
}
\ No newline at end of file
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/Asn1StringUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/Asn1StringUtils.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/Asn1StringUtils.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/Asn1StringUtils.java Mon May 12 04:49:35 2008
@@ -27,6 +27,7 @@
* Little helper class.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class Asn1StringUtils
{
@@ -76,10 +77,10 @@
StringBuffer sb = new StringBuffer();
- for ( int i = 0; i < buffer.length; i++ )
+ for ( byte b:buffer )
{
- sb.append( "0x" ).append( ( char ) ( HEX_CHAR[( buffer[i] & 0x00F0 ) >> 4] ) ).append(
- ( char ) ( HEX_CHAR[buffer[i] & 0x000F] ) ).append( " " );
+ sb.append( "0x" ).append( ( char ) ( HEX_CHAR[( b & 0x00F0 ) >> 4] ) ).append(
+ ( char ) ( HEX_CHAR[b & 0x000F] ) ).append( " " );
}
return sb.toString();
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/BooleanDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/BooleanDecoder.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/BooleanDecoder.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/BooleanDecoder.java Mon May 12 04:49:35 2008
@@ -30,6 +30,7 @@
* Parse and decode a Boolean value.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class BooleanDecoder
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/BooleanDecoderException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/BooleanDecoderException.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/BooleanDecoderException.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/BooleanDecoderException.java Mon May 12 04:49:35 2008
@@ -26,6 +26,7 @@
* during a decode.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class BooleanDecoderException extends Exception
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/IntegerDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/IntegerDecoder.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/IntegerDecoder.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/IntegerDecoder.java Mon May 12 04:49:35 2008
@@ -27,6 +27,7 @@
* Parse and decode an Integer value.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class IntegerDecoder
{
Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/IntegerDecoderException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/IntegerDecoderException.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/IntegerDecoderException.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/util/IntegerDecoderException.java Mon May 12 04:49:35 2008
@@ -26,6 +26,7 @@
* decode.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class IntegerDecoderException extends Exception
{
Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/LengthTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/LengthTest.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/LengthTest.java (original)
+++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/LengthTest.java Mon May 12 04:49:35 2008
@@ -22,13 +22,13 @@
import java.util.Arrays;
-import junit.framework.Assert;
import junit.framework.TestCase;
/**
* This class is used to test the Length class
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class LengthTest extends TestCase
{
@@ -38,17 +38,17 @@
*/
public void testLengthGetNbBytes()
{
- Assert.assertEquals( 1, TLV.getNbBytes( 0 ) );
- Assert.assertEquals( 1, TLV.getNbBytes( 1 ) );
- Assert.assertEquals( 1, TLV.getNbBytes( 127 ) );
- Assert.assertEquals( 2, TLV.getNbBytes( 128 ) );
- Assert.assertEquals( 2, TLV.getNbBytes( 255 ) );
- Assert.assertEquals( 3, TLV.getNbBytes( 256 ) );
- Assert.assertEquals( 3, TLV.getNbBytes( 65535 ) );
- Assert.assertEquals( 4, TLV.getNbBytes( 65536 ) );
- Assert.assertEquals( 4, TLV.getNbBytes( 16777215 ) );
- Assert.assertEquals( 5, TLV.getNbBytes( 16777216 ) );
- Assert.assertEquals( 5, TLV.getNbBytes( 0xFFFFFFFF ) );
+ assertEquals( "1 expected", 1, TLV.getNbBytes( 0 ) );
+ assertEquals( "1 expected", 1, TLV.getNbBytes( 1 ) );
+ assertEquals( "1 expected", 1, TLV.getNbBytes( 127 ) );
+ assertEquals( "2 expected", 2, TLV.getNbBytes( 128 ) );
+ assertEquals( "2 expected", 2, TLV.getNbBytes( 255 ) );
+ assertEquals( "3 expected", 3, TLV.getNbBytes( 256 ) );
+ assertEquals( "3 expected", 3, TLV.getNbBytes( 65535 ) );
+ assertEquals( "4 expected", 4, TLV.getNbBytes( 65536 ) );
+ assertEquals( "4 expected", 4, TLV.getNbBytes( 16777215 ) );
+ assertEquals( "5 expected", 5, TLV.getNbBytes( 16777216 ) );
+ assertEquals( "5 expected", 5, TLV.getNbBytes( 0xFFFFFFFF ) );
}
Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java (original)
+++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ValueTest.java Mon May 12 04:49:35 2008
@@ -23,20 +23,21 @@
import java.math.BigInteger;
import java.nio.ByteBuffer;
-import org.apache.directory.shared.asn1.ber.tlv.Value;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.asn1.primitives.BitString;
import org.apache.directory.shared.asn1.util.Asn1StringUtils;
import org.apache.directory.shared.asn1.util.IntegerDecoder;
-import junit.framework.Assert;
-import junit.framework.TestCase;
/**
* This class is used to test the Value class
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class ValueTest extends TestCase
{
@@ -301,7 +302,7 @@
}
catch ( EncoderException ee )
{
-
+ fail();
}
assertEquals( "0x03 0x03 0x06 0x80 0x00 ", Asn1StringUtils.dumpBytes( buffer.array() ) );
Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java (original)
+++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java Mon May 12 04:49:35 2008
@@ -374,10 +374,10 @@
*/
public void testOidEqualsPerf() throws DecoderException
{
- String s1 = "1.2.840.113554.1.2.2.1.2.840.113554.1.2.2.1.2.840.113554.1.2.2";
- String s2 = "1.2.840.113554.1.2.2.1.2.840.113554.1.2.2.1.2.840.113554.1.2.2";
- String s3 = "1.3.6.1.5.5.2";
-
+ String s1 = "1.2.840.113554.1.2.2.1.2.840.113554.1.2.2.1.2.840.113554.1.2.2";
+ String s2 = "1.2.840.113554.1.2.2.1.2.840.113554.1.2.2.1.2.840.113554.1.2.2";
+ String s3 = "1.3.6.1.5.5.2";
+
OID oid1 = new OID( s1 );
OID oid2 = new OID( s2 );
OID oid3 = new OID( s3 );
Modified: directory/shared/trunk/convert/src/main/antlr/schema.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/convert/src/main/antlr/schema.g?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/convert/src/main/antlr/schema.g (original)
+++ directory/shared/trunk/convert/src/main/antlr/schema.g Mon May 12 04:49:35 2008
@@ -99,11 +99,6 @@
( 'a' .. 'z') ( 'a' .. 'z' | '0' .. '9' | '-' | ';' )*
;
-//XSTRING
-// :
-// "x-" ( 'a' .. 'z' ) ( 'a' .. 'z' | '-' | '_' )*
-// ;
-
DESC
:
"desc" WS QUOTE ( ~'\'' )+ QUOTE
Modified: directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/ParserException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/ParserException.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/ParserException.java (original)
+++ directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/ParserException.java Mon May 12 04:49:35 2008
@@ -22,10 +22,11 @@
/**
* An exception thrown if we have an error while parsing a schema file.
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class ParserException extends Exception
{
- public static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
/**
* A strandard constuctor
Modified: directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/Schema.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/Schema.java (original)
+++ directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/Schema.java Mon May 12 04:49:35 2008
@@ -29,6 +29,7 @@
* in which the ldif file will be dumped.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class Schema
{
Modified: directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java (original)
+++ directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java Mon May 12 04:49:35 2008
@@ -37,6 +37,7 @@
* description, names and extensions (not implemented)
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public abstract class SchemaElementImpl implements SchemaElement
{
Modified: directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaParser.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaParser.java (original)
+++ directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaParser.java Mon May 12 04:49:35 2008
@@ -19,12 +19,23 @@
*/
package org.apache.directory.shared.converter.schema;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.Writer;
+import java.text.ParseException;
+import java.util.List;
-import org.apache.directory.shared.converter.schema.antlrSchemaLexer;
-import org.apache.directory.shared.converter.schema.antlrSchemaParser;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
-import java.util.List;
+import antlr.RecognitionException;
+import antlr.TokenStreamException;
+
+/*
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -34,15 +45,20 @@
import java.io.PipedOutputStream;
import java.io.Writer;
import java.text.ParseException;
+import java.util.List;
import antlr.RecognitionException;
import antlr.TokenStreamException;
+import org.apache.directory.shared.ldap.util.ExceptionUtils;
+*/
+
/**
* A reusable wrapper for antlr generated schema parsers.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class SchemaParser
{
Modified: directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java (original)
+++ directory/shared/trunk/convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java Mon May 12 04:49:35 2008
@@ -23,7 +23,6 @@
import java.io.Writer;
import java.util.List;
-import org.apache.directory.shared.converter.schema.Schema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,6 +31,7 @@
* with the Apache DS meta schema format
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
*/
public class SchemaToLdif
{
Modified: directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java (original)
+++ directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java Mon May 12 04:49:35 2008
@@ -40,7 +40,7 @@
String[] ALL_OPERATIONAL_ATTRIBUTES_ARRAY = new String[]{ ALL_OPERATIONAL_ATTRIBUTES };
// ---- ObjectClasses -----------------------------------------------------
- // Krb5Principal
+ // Krb5Principal
String KRB5_PRINCIPAL_OC = "krb5Principal";
String KRB5_PRINCIPAL_OC_OID = "1.3.6.1.4.1.5322.10.2.1";
@@ -308,7 +308,7 @@
// Ref
String REF_AT = "ref";
String REF_AT_OID = "2.16.840.1.113730.3.1.34";
-
+
// DisplayName
String DISPLAY_NAME_AT = "displayName";
String DISPLAY_NAME_AT_OID = "2.16.840.1.113730.3.1.241";
Modified: directory/shared/trunk/ldap/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/ACIItem.g?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/ACIItem.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/ACIItem.g Mon May 12 04:49:35 2008
@@ -145,7 +145,7 @@
*/
public void init( Map<String, OidNormalizer> oidsMap )
{
- this.oidsMap = oidsMap;
+ this.oidsMap = oidsMap;
}
/**
Modified: directory/shared/trunk/ldap/src/main/antlr/ACIItemChecker.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/ACIItemChecker.g?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/ACIItemChecker.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/ACIItemChecker.g Mon May 12 04:49:35 2008
@@ -422,7 +422,7 @@
OPEN_CURLY ( SP )*
distinguishedName ( SP )*
( SEP ( SP )* distinguishedName ( SP )*
- )*
+ )*
CLOSE_CURLY
;
Modified: directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/SubtreeSpecificationChecker.g Mon May 12 04:49:35 2008
@@ -236,12 +236,12 @@
filter
{
- log.debug( "entered filter()" );
+ log.debug( "entered filter()" );
}
- :
- ( filterToken:FILTER { FilterParser.parse( filterToken.getText() ); } )
- ;
- exception
+ :
+ ( filterToken:FILTER { FilterParser.parse( filterToken.getText() ); } )
+ ;
+ exception
catch [Exception e]
{
throw new RecognitionException( "filterParser failed. " + e.getMessage() );
Modified: directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g Mon May 12 04:49:35 2008
@@ -79,9 +79,9 @@
private String triggerStoredProcedureName;
- private List<StoredProcedureParameter> triggerStoredProcedureParameters;
-
- private List<StoredProcedureOption> triggerStoredProcedureOptions;
+ private List<StoredProcedureParameter> triggerStoredProcedureParameters;
+
+ private List<StoredProcedureOption> triggerStoredProcedureOptions;
private List<SPSpec> spSpecs;
@@ -165,7 +165,7 @@
( modifyStoredProcedureParameterList )?
CLOSE_PARAN ( SP )* SEMI ( SP )*
{
- spSpecs.add( new SPSpec(triggerStoredProcedureName, triggerStoredProcedureOptions, triggerStoredProcedureParameters ) );
+ spSpecs.add( new SPSpec(triggerStoredProcedureName, triggerStoredProcedureOptions, triggerStoredProcedureParameters ) );
})+
;
@@ -180,7 +180,7 @@
( addStoredProcedureParameterList )?
CLOSE_PARAN ( SP )* SEMI ( SP )*
{
- spSpecs.add( new SPSpec(triggerStoredProcedureName, triggerStoredProcedureOptions, triggerStoredProcedureParameters ) );
+ spSpecs.add( new SPSpec(triggerStoredProcedureName, triggerStoredProcedureOptions, triggerStoredProcedureParameters ) );
}
)+
;
@@ -196,7 +196,7 @@
( deleteStoredProcedureParameterList )?
CLOSE_PARAN ( SP )* SEMI ( SP )*
{
- spSpecs.add( new SPSpec(triggerStoredProcedureName, triggerStoredProcedureOptions, triggerStoredProcedureParameters ) );
+ spSpecs.add( new SPSpec(triggerStoredProcedureName, triggerStoredProcedureOptions, triggerStoredProcedureParameters ) );
}
)+
;
@@ -215,7 +215,7 @@
( modifyDNStoredProcedureParameterList )?
CLOSE_PARAN ( SP )* SEMI ( SP )*
{
- spSpecs.add( new SPSpec(triggerStoredProcedureName, triggerStoredProcedureOptions, triggerStoredProcedureParameters ) );
+ spSpecs.add( new SPSpec(triggerStoredProcedureName, triggerStoredProcedureOptions, triggerStoredProcedureParameters ) );
}
)+
;
@@ -236,9 +236,9 @@
:
ID_CALL
{
- triggerStoredProcedureName = null;
- triggerStoredProcedureParameters = new ArrayList<StoredProcedureParameter>();
- triggerStoredProcedureOptions = new ArrayList<StoredProcedureOption>();
+ triggerStoredProcedureName = null;
+ triggerStoredProcedureParameters = new ArrayList<StoredProcedureParameter>();
+ triggerStoredProcedureOptions = new ArrayList<StoredProcedureOption>();
}
( SP )+ triggerStoredProcedureName=fullyQualifiedStoredProcedureName ( SP )*
( genericStoredProcedureOptionList ( SP )* )?
@@ -349,7 +349,7 @@
}
: ID_ldapContext ( SP )+ ldapContext=distinguishedName
{ triggerStoredProcedureParameters.add( StoredProcedureParameter.Generic_LDAP_CONTEXT.instance( ldapContext ) ); }
- ;
+ ;
// -----------------------------------------------------------------------------
Modified: directory/shared/trunk/ldap/src/main/antlr/schema-extension.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/schema-extension.g?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/schema-extension.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/schema-extension.g Mon May 12 04:49:35 2008
@@ -90,7 +90,7 @@
{
try
{
- AntlrSchemaQdstringLexer lexer = new AntlrSchemaQdstringLexer(new StringReader(s));
+ AntlrSchemaQdstringLexer lexer = new AntlrSchemaQdstringLexer(new StringReader(s));
AntlrSchemaQdstringParser parser = new AntlrSchemaQdstringParser(lexer);
qdstrings = parser.qdstrings();
}
Modified: directory/shared/trunk/ldap/src/main/antlr/schema-qdstring.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/schema-qdstring.g?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/schema-qdstring.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/schema-qdstring.g Mon May 12 04:49:35 2008
@@ -72,23 +72,23 @@
*/
qdstrings returns [List<String> qdstrings]
{
- qdstrings = new ArrayList<String>();
+ qdstrings = new ArrayList<String>();
String qdstring = null;
}
:
(
(
- q:QDSTRING
- {
- qdstring = q.getText();
- if(qdstring.startsWith("'")) {
- qdstring = qdstring.substring(1, qdstring.length());
- }
- if(qdstring.endsWith("'")) {
- qdstring = qdstring.substring(0, qdstring.length()-1);
- }
- qdstrings.add(qdstring);
- }
+ q:QDSTRING
+ {
+ qdstring = q.getText();
+ if(qdstring.startsWith("'")) {
+ qdstring = qdstring.substring(1, qdstring.length());
+ }
+ if(qdstring.endsWith("'")) {
+ qdstring = qdstring.substring(0, qdstring.length()-1);
+ }
+ qdstrings.add(qdstring);
+ }
)
|
( LPAR qdstring=qdstring { qdstrings.add(qdstring); } ( qdstring=qdstring { qdstrings.add(qdstring); } )* RPAR )
@@ -116,14 +116,14 @@
{
qdstring = q.getText();
if(qdstring.startsWith("'")) {
- qdstring = qdstring.substring(1, qdstring.length());
- }
- if(qdstring.endsWith("'")) {
- qdstring = qdstring.substring(0, qdstring.length()-1);
- }
- qdstring = qdstring.replaceAll("\\\\5C", "\\\\");
- qdstring = qdstring.replaceAll("\\\\5c", "\\\\");
- qdstring = qdstring.replaceAll("\\\\27", "'");
+ qdstring = qdstring.substring(1, qdstring.length());
+ }
+ if(qdstring.endsWith("'")) {
+ qdstring = qdstring.substring(0, qdstring.length()-1);
+ }
+ qdstring = qdstring.replaceAll("\\\\5C", "\\\\");
+ qdstring = qdstring.replaceAll("\\\\5c", "\\\\");
+ qdstring = qdstring.replaceAll("\\\\27", "'");
}
)
;
Modified: directory/shared/trunk/ldap/src/main/antlr/schema-value.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/schema-value.g?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/schema-value.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/schema-value.g Mon May 12 04:49:35 2008
@@ -120,11 +120,11 @@
:
(
(SP)?
- (
- n:NUMERICOID { oid = n.getText(); }
- |
- d:DESCR { oid = d.getText(); }
- )
+ (
+ n:NUMERICOID { oid = n.getText(); }
+ |
+ d:DESCR { oid = d.getText(); }
+ )
(SP)?
)
;
@@ -142,17 +142,17 @@
:
(
(
- oid=oid { oids.add(oid); }
- )
+ oid=oid { oids.add(oid); }
+ )
|
(
- LPAR
- oid=oid { oids.add(oid); }
- (
- DOLLAR
- oid=oid { oids.add(oid); }
- )*
- RPAR
+ LPAR
+ oid=oid { oids.add(oid); }
+ (
+ DOLLAR
+ oid=oid { oids.add(oid); }
+ )*
+ RPAR
)
)
;
@@ -164,7 +164,7 @@
qdescr returns [String qdescr=null]
:
(
- (SP)?
+ (SP)?
QUOTE
d:DESCR { qdescr = d.getText(); }
QUOTE
@@ -178,25 +178,25 @@
*/
qdescrs returns [List<String> qdescrs]
{
- qdescrs = new ArrayList<String>();
+ qdescrs = new ArrayList<String>();
String qdescr = null;
}
:
(
(
- qdescr=qdescr { qdescrs.add(qdescr); }
- )
+ qdescr=qdescr { qdescrs.add(qdescr); }
+ )
|
(
- LPAR
- qdescr=qdescr { qdescrs.add(qdescr); }
- (
- SP
- qdescr=qdescr { qdescrs.add(qdescr); }
- )*
- (SP)?
- RPAR
- )
+ LPAR
+ qdescr=qdescr { qdescrs.add(qdescr); }
+ (
+ SP
+ qdescr=qdescr { qdescrs.add(qdescr); }
+ )*
+ (SP)?
+ RPAR
+ )
)
;
@@ -226,18 +226,18 @@
:
(
(
- ruleid=ruleid { ruleids.add(ruleid); }
- )
+ ruleid=ruleid { ruleids.add(ruleid); }
+ )
|
(
- LPAR
- ruleid=ruleid { ruleids.add(ruleid); }
- (
- SP
- ruleid=ruleid { ruleids.add(ruleid); }
- )*
- (SP)?
- RPAR
+ LPAR
+ ruleid=ruleid { ruleids.add(ruleid); }
+ (
+ SP
+ ruleid=ruleid { ruleids.add(ruleid); }
+ )*
+ (SP)?
+ RPAR
)
)
;
Modified: directory/shared/trunk/ldap/src/main/antlr/schema.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/schema.g?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/schema.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/schema.g Mon May 12 04:49:35 2008
@@ -144,37 +144,37 @@
}
{
- static class Extension
- {
- String key = "";
- List<String> values = new ArrayList<String>();
-
- public void addValue( String value )
- {
- this.values.add( value );
- }
- }
- static class NoidLen
- {
- String noid = "";
- int len = 0;
- }
+ static class Extension
+ {
+ String key = "";
+ List<String> values = new ArrayList<String>();
+
+ public void addValue( String value )
+ {
+ this.values.add( value );
+ }
+ }
+ static class NoidLen
+ {
+ String noid = "";
+ int len = 0;
+ }
static class ElementTracker
- {
- Map<String, Integer> elementMap = new HashMap<String, Integer>();
- void track(String element, Token token) throws SemanticException
- {
- if(elementMap.containsKey(element))
- {
- throw new SemanticException( element + " appears twice.", token.getFilename(), token.getLine() , token.getColumn() );
- }
- elementMap.put(element, new Integer(1));
- }
- boolean contains(String element)
- {
- return elementMap.containsKey(element);
- }
- }
+ {
+ Map<String, Integer> elementMap = new HashMap<String, Integer>();
+ void track(String element, Token token) throws SemanticException
+ {
+ if(elementMap.containsKey(element))
+ {
+ throw new SemanticException( element + " appears twice.", token.getFilename(), token.getLine() , token.getColumn() );
+ }
+ elementMap.put(element, new Integer(1));
+ }
+ boolean contains(String element)
+ {
+ return elementMap.containsKey(element);
+ }
+ }
}
@@ -208,31 +208,31 @@
:
( oid:STARTNUMERICOID { ocd.setNumericOid(numericoid(oid.getText())); } )
(
- ( name:NAME { et.track("NAME", name); ocd.setNames(qdescrs(name.getText())); } )
- |
- ( desc:DESC { et.track("DESC", desc); ocd.setDescription(qdstring(desc.getText())); } )
- |
- ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); ocd.setObsolete( true ); } )
- |
- ( sup:SUP { et.track("SUP", sup); ocd.setSuperiorObjectClasses(oids(sup.getText())); } )
- |
- ( kind1:ABSTRACT { et.track("KIND", kind1); ocd.setKind( ObjectClassTypeEnum.ABSTRACT ); }
- |
- kind2:STRUCTURAL { et.track("KIND", kind2); ocd.setKind( ObjectClassTypeEnum.STRUCTURAL ); }
- |
- kind3:AUXILIARY { et.track("KIND", kind3); ocd.setKind( ObjectClassTypeEnum.AUXILIARY ); }
- )
- |
- ( must:MUST { et.track("MUST", must); ocd.setMustAttributeTypes(oids(must.getText())); } )
- |
- ( may:MAY { et.track("MAY", may); ocd.setMayAttributeTypes(oids(may.getText())); } )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- ocd.addExtension(ex.key, ex.values);
- } )
- )*
+ ( name:NAME { et.track("NAME", name); ocd.setNames(qdescrs(name.getText())); } )
+ |
+ ( desc:DESC { et.track("DESC", desc); ocd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); ocd.setObsolete( true ); } )
+ |
+ ( sup:SUP { et.track("SUP", sup); ocd.setSuperiorObjectClasses(oids(sup.getText())); } )
+ |
+ ( kind1:ABSTRACT { et.track("KIND", kind1); ocd.setKind( ObjectClassTypeEnum.ABSTRACT ); }
+ |
+ kind2:STRUCTURAL { et.track("KIND", kind2); ocd.setKind( ObjectClassTypeEnum.STRUCTURAL ); }
+ |
+ kind3:AUXILIARY { et.track("KIND", kind3); ocd.setKind( ObjectClassTypeEnum.AUXILIARY ); }
+ )
+ |
+ ( must:MUST { et.track("MUST", must); ocd.setMustAttributeTypes(oids(must.getText())); } )
+ |
+ ( may:MAY { et.track("MAY", may); ocd.setMayAttributeTypes(oids(may.getText())); } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ ocd.addExtension(ex.key, ex.values);
+ } )
+ )*
RPAR
;
@@ -274,14 +274,14 @@
:
( oid:STARTNUMERICOID { atd.setNumericOid(numericoid(oid.getText())); } )
(
- ( name:NAME { et.track("NAME", name); atd.setNames(qdescrs(name.getText())); } )
- |
- ( desc:DESC { et.track("DESC", desc); atd.setDescription(qdstring(desc.getText())); } )
- |
- ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); atd.setObsolete( true ); } )
- |
- ( sup:SUP { et.track("SUP", sup); atd.setSuperType(oid(sup.getText())); } )
- |
+ ( name:NAME { et.track("NAME", name); atd.setNames(qdescrs(name.getText())); } )
+ |
+ ( desc:DESC { et.track("DESC", desc); atd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); atd.setObsolete( true ); } )
+ |
+ ( sup:SUP { et.track("SUP", sup); atd.setSuperType(oid(sup.getText())); } )
+ |
( equality:EQUALITY { et.track("EQUALITY", equality); atd.setEqualityMatchingRule(oid(equality.getText())); } )
|
( ordering:ORDERING { et.track("ORDERING", ordering); atd.setOrderingMatchingRule(oid(ordering.getText())); } )
@@ -301,21 +301,21 @@
|
( noUserModification:NO_USER_MODIFICATION { et.track("NO_USER_MODIFICATION", noUserModification); atd.setUserModifiable( false ); } )
|
- ( usage1:USAGE (WHSP)* USER_APPLICATIONS { et.track("USAGE", usage1); atd.setUsage( UsageEnum.USER_APPLICATIONS ); }
- |
- usage2:USAGE DIRECTORY_OPERATION { et.track("USAGE", usage2); atd.setUsage( UsageEnum.DIRECTORY_OPERATION ); }
- |
- usage3:USAGE DISTRIBUTED_OPERATION { et.track("USAGE", usage3); atd.setUsage( UsageEnum.DISTRIBUTED_OPERATION ); }
- |
- usage4:USAGE DSA_OPERATION { et.track("USAGE", usage4); atd.setUsage( UsageEnum.DSA_OPERATION ); }
- )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- atd.addExtension(ex.key, ex.values);
- } )
- )*
+ ( usage1:USAGE (WHSP)* USER_APPLICATIONS { et.track("USAGE", usage1); atd.setUsage( UsageEnum.USER_APPLICATIONS ); }
+ |
+ usage2:USAGE DIRECTORY_OPERATION { et.track("USAGE", usage2); atd.setUsage( UsageEnum.DIRECTORY_OPERATION ); }
+ |
+ usage3:USAGE DISTRIBUTED_OPERATION { et.track("USAGE", usage3); atd.setUsage( UsageEnum.DISTRIBUTED_OPERATION ); }
+ |
+ usage4:USAGE DSA_OPERATION { et.track("USAGE", usage4); atd.setUsage( UsageEnum.DSA_OPERATION ); }
+ )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ atd.addExtension(ex.key, ex.values);
+ } )
+ )*
RPAR
{
// semantic check: required elements
@@ -357,13 +357,13 @@
:
( oid:STARTNUMERICOID { lsd.setNumericOid(numericoid(oid.getText())); } )
(
- ( desc:DESC { et.track("DESC", desc); lsd.setDescription(qdstring(desc.getText())); } )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- lsd.addExtension(ex.key, ex.values);
- } )
+ ( desc:DESC { et.track("DESC", desc); lsd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ lsd.addExtension(ex.key, ex.values);
+ } )
)*
RPAR
;
@@ -391,19 +391,19 @@
:
( oid:STARTNUMERICOID { mrd.setNumericOid(numericoid(oid.getText())); } )
(
- ( name:NAME { et.track("NAME", name); mrd.setNames(qdescrs(name.getText())); } )
- |
- ( desc:DESC { et.track("DESC", desc); mrd.setDescription(qdstring(desc.getText())); } )
- |
- ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); mrd.setObsolete( true ); } )
- |
+ ( name:NAME { et.track("NAME", name); mrd.setNames(qdescrs(name.getText())); } )
+ |
+ ( desc:DESC { et.track("DESC", desc); mrd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); mrd.setObsolete( true ); } )
+ |
( syntax:SYNTAX { et.track("SYNTAX", syntax); mrd.setSyntax(numericoid(syntax.getText())); } )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- mrd.addExtension(ex.key, ex.values);
- } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ mrd.addExtension(ex.key, ex.values);
+ } )
)*
RPAR
{
@@ -436,19 +436,19 @@
:
( oid:STARTNUMERICOID { mrud.setNumericOid(numericoid(oid.getText())); } )
(
- ( name:NAME { et.track("NAME", name); mrud.setNames(qdescrs(name.getText())); } )
- |
- ( desc:DESC { et.track("DESC", desc); mrud.setDescription(qdstring(desc.getText())); } )
- |
- ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); mrud.setObsolete( true ); } )
- |
+ ( name:NAME { et.track("NAME", name); mrud.setNames(qdescrs(name.getText())); } )
+ |
+ ( desc:DESC { et.track("DESC", desc); mrud.setDescription(qdstring(desc.getText())); } )
+ |
+ ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); mrud.setObsolete( true ); } )
+ |
( applies:APPLIES { et.track("APPLIES", applies); mrud.setApplicableAttributes(oids(applies.getText())); } )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- mrud.addExtension(ex.key, ex.values);
- } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ mrud.addExtension(ex.key, ex.values);
+ } )
)*
RPAR
{
@@ -484,25 +484,25 @@
:
( oid:STARTNUMERICOID { dcrd.setNumericOid(numericoid(oid.getText())); } )
(
- ( name:NAME { et.track("NAME", name); dcrd.setNames(qdescrs(name.getText())); } )
- |
- ( desc:DESC { et.track("DESC", desc); dcrd.setDescription(qdstring(desc.getText())); } )
- |
- ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); dcrd.setObsolete( true ); } )
- |
- ( aux:AUX { et.track("AUX", aux); dcrd.setAuxiliaryObjectClasses(oids(aux.getText())); } )
- |
- ( must:MUST { et.track("MUST", must); dcrd.setMustAttributeTypes(oids(must.getText())); } )
- |
- ( may:MAY { et.track("MAY", may); dcrd.setMayAttributeTypes(oids(may.getText())); } )
- |
- ( not:NOT { et.track("NOT", not); dcrd.setNotAttributeTypes(oids(not.getText())); } )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- dcrd.addExtension(ex.key, ex.values);
- } )
+ ( name:NAME { et.track("NAME", name); dcrd.setNames(qdescrs(name.getText())); } )
+ |
+ ( desc:DESC { et.track("DESC", desc); dcrd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); dcrd.setObsolete( true ); } )
+ |
+ ( aux:AUX { et.track("AUX", aux); dcrd.setAuxiliaryObjectClasses(oids(aux.getText())); } )
+ |
+ ( must:MUST { et.track("MUST", must); dcrd.setMustAttributeTypes(oids(must.getText())); } )
+ |
+ ( may:MAY { et.track("MAY", may); dcrd.setMayAttributeTypes(oids(may.getText())); } )
+ |
+ ( not:NOT { et.track("NOT", not); dcrd.setNotAttributeTypes(oids(not.getText())); } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ dcrd.addExtension(ex.key, ex.values);
+ } )
)*
RPAR
;
@@ -534,21 +534,21 @@
:
( ruleid:STARTNUMERICOID { dsrd.setRuleId(ruleid(ruleid.getText())); } )
(
- ( name:NAME { et.track("NAME", name); dsrd.setNames(qdescrs(name.getText())); } )
- |
- ( desc:DESC { et.track("DESC", desc); dsrd.setDescription(qdstring(desc.getText())); } )
- |
- ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); dsrd.setObsolete( true ); } )
- |
- ( form:FORM { et.track("FORM", form); dsrd.setForm(oid(form.getText())); } )
- |
- ( sup:SUP { et.track("SUP", sup); dsrd.setSuperRules(ruleids(sup.getText())); } )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- dsrd.addExtension(ex.key, ex.values);
- } )
+ ( name:NAME { et.track("NAME", name); dsrd.setNames(qdescrs(name.getText())); } )
+ |
+ ( desc:DESC { et.track("DESC", desc); dsrd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); dsrd.setObsolete( true ); } )
+ |
+ ( form:FORM { et.track("FORM", form); dsrd.setForm(oid(form.getText())); } )
+ |
+ ( sup:SUP { et.track("SUP", sup); dsrd.setSuperRules(ruleids(sup.getText())); } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ dsrd.addExtension(ex.key, ex.values);
+ } )
)*
RPAR
{
@@ -583,23 +583,23 @@
:
( oid:STARTNUMERICOID { nfd.setNumericOid(numericoid(oid.getText())); } )
(
- ( name:NAME { et.track("NAME", name); nfd.setNames(qdescrs(name.getText())); } )
- |
- ( desc:DESC { et.track("DESC", desc); nfd.setDescription(qdstring(desc.getText())); } )
- |
- ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); nfd.setObsolete( true ); } )
- |
- ( oc:OC { et.track("OC", oc); nfd.setStructuralObjectClass(oid(oc.getText())); } )
- |
- ( must:MUST { et.track("MUST", must); nfd.setMustAttributeTypes(oids(must.getText())); } )
- |
- ( may:MAY { et.track("MAY", may); nfd.setMayAttributeTypes(oids(may.getText())); } )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- nfd.addExtension(ex.key, ex.values);
- } )
+ ( name:NAME { et.track("NAME", name); nfd.setNames(qdescrs(name.getText())); } )
+ |
+ ( desc:DESC { et.track("DESC", desc); nfd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( obsolete:OBSOLETE { et.track("OBSOLETE", obsolete); nfd.setObsolete( true ); } )
+ |
+ ( oc:OC { et.track("OC", oc); nfd.setStructuralObjectClass(oid(oc.getText())); } )
+ |
+ ( must:MUST { et.track("MUST", must); nfd.setMustAttributeTypes(oids(must.getText())); } )
+ |
+ ( may:MAY { et.track("MAY", may); nfd.setMayAttributeTypes(oids(may.getText())); } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ nfd.addExtension(ex.key, ex.values);
+ } )
)*
RPAR
{
@@ -647,17 +647,17 @@
:
( oid:STARTNUMERICOID { cd.setNumericOid(numericoid(oid.getText())); } )
(
- ( desc:DESC { et.track("DESC", desc); cd.setDescription(qdstring(desc.getText())); } )
- |
- ( fqcn:FQCN { et.track("FQCN", fqcn); cd.setFqcn(fqcn.getText()); } )
- |
- ( bytecode:BYTECODE { et.track("BYTECODE", bytecode); cd.setBytecode(bytecode.getText()); } )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- cd.addExtension(ex.key, ex.values);
- } )
+ ( desc:DESC { et.track("DESC", desc); cd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( fqcn:FQCN { et.track("FQCN", fqcn); cd.setFqcn(fqcn.getText()); } )
+ |
+ ( bytecode:BYTECODE { et.track("BYTECODE", bytecode); cd.setBytecode(bytecode.getText()); } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ cd.addExtension(ex.key, ex.values);
+ } )
)*
RPAR
{
@@ -699,17 +699,17 @@
:
( oid:STARTNUMERICOID { nd.setNumericOid(numericoid(oid.getText())); } )
(
- ( desc:DESC { et.track("DESC", desc); nd.setDescription(qdstring(desc.getText())); } )
- |
- ( fqcn:FQCN { et.track("FQCN", fqcn); nd.setFqcn(fqcn.getText()); } )
- |
- ( bytecode:BYTECODE { et.track("BYTECODE", bytecode); nd.setBytecode(bytecode.getText()); } )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- nd.addExtension(ex.key, ex.values);
- } )
+ ( desc:DESC { et.track("DESC", desc); nd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( fqcn:FQCN { et.track("FQCN", fqcn); nd.setFqcn(fqcn.getText()); } )
+ |
+ ( bytecode:BYTECODE { et.track("BYTECODE", bytecode); nd.setBytecode(bytecode.getText()); } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ nd.addExtension(ex.key, ex.values);
+ } )
)*
RPAR
{
@@ -751,17 +751,17 @@
:
( oid:STARTNUMERICOID { scd.setNumericOid(numericoid(oid.getText())); } )
(
- ( desc:DESC { et.track("DESC", desc); scd.setDescription(qdstring(desc.getText())); } )
- |
- ( fqcn:FQCN { et.track("FQCN", fqcn); scd.setFqcn(fqcn.getText()); } )
- |
- ( bytecode:BYTECODE { et.track("BYTECODE", bytecode); scd.setBytecode(bytecode.getText()); } )
- |
- ( extension:EXTENSION {
- Extension ex = extension(extension.getText());
- et.track(ex.key, extension);
- scd.addExtension(ex.key, ex.values);
- } )
+ ( desc:DESC { et.track("DESC", desc); scd.setDescription(qdstring(desc.getText())); } )
+ |
+ ( fqcn:FQCN { et.track("FQCN", fqcn); scd.setFqcn(fqcn.getText()); } )
+ |
+ ( bytecode:BYTECODE { et.track("BYTECODE", bytecode); scd.setBytecode(bytecode.getText()); } )
+ |
+ ( extension:EXTENSION {
+ Extension ex = extension(extension.getText());
+ et.track(ex.key, extension);
+ scd.addExtension(ex.key, ex.values);
+ } )
)*
RPAR
{
@@ -802,7 +802,7 @@
numericoid [String s] returns [String numericoid]
{
- AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
+ AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
AntlrSchemaValueParser parser = new AntlrSchemaValueParser(lexer);
numericoid = parser.numericoid();
}
@@ -811,7 +811,7 @@
oid [String s] returns [String oid]
{
- AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
+ AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
AntlrSchemaValueParser parser = new AntlrSchemaValueParser(lexer);
oid = parser.oid();
}
@@ -820,7 +820,7 @@
oids [String s] returns [List<String> oids]
{
- AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
+ AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
AntlrSchemaValueParser parser = new AntlrSchemaValueParser(lexer);
oids = parser.oids();
}
@@ -829,7 +829,7 @@
qdescr [String s] returns [String qdescr]
{
- AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
+ AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
AntlrSchemaValueParser parser = new AntlrSchemaValueParser(lexer);
qdescr = parser.qdescr();
}
@@ -838,7 +838,7 @@
qdescrs [String s] returns [List<String> qdescrs]
{
- AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
+ AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
AntlrSchemaValueParser parser = new AntlrSchemaValueParser(lexer);
qdescrs = parser.qdescrs();
}
@@ -847,7 +847,7 @@
qdstring [String s] returns [String qdstring]
{
- AntlrSchemaQdstringLexer lexer = new AntlrSchemaQdstringLexer(new StringReader(s));
+ AntlrSchemaQdstringLexer lexer = new AntlrSchemaQdstringLexer(new StringReader(s));
AntlrSchemaQdstringParser parser = new AntlrSchemaQdstringParser(lexer);
qdstring = parser.qdstring();
}
@@ -856,7 +856,7 @@
qdstrings [String s] returns [List<String> qdstrings]
{
- AntlrSchemaQdstringLexer lexer = new AntlrSchemaQdstringLexer(new StringReader(s));
+ AntlrSchemaQdstringLexer lexer = new AntlrSchemaQdstringLexer(new StringReader(s));
AntlrSchemaQdstringParser parser = new AntlrSchemaQdstringParser(lexer);
qdstrings = parser.qdstrings();
}
@@ -865,7 +865,7 @@
ruleid [String s] returns [Integer ruleid]
{
- AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
+ AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
AntlrSchemaValueParser parser = new AntlrSchemaValueParser(lexer);
ruleid = parser.ruleid();
}
@@ -874,7 +874,7 @@
ruleids [String s] returns [List<Integer> ruleids]
{
- AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
+ AntlrSchemaValueLexer lexer = new AntlrSchemaValueLexer(new StringReader(s));
AntlrSchemaValueParser parser = new AntlrSchemaValueParser(lexer);
ruleids = parser.ruleids();
}
Modified: directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/subtree-specification.g Mon May 12 04:49:35 2008
@@ -100,19 +100,19 @@
*/
public void init( Map<String, OidNormalizer> oidsMap )
{
- this.oidsMap = oidsMap;
+ this.oidsMap = oidsMap;
}
public void setNormalizerMappingResolver( NormalizerMappingResolver resolver )
{
- this.resolver = resolver;
+ this.resolver = resolver;
}
public boolean isNormalizing()
{
- return this.resolver != null;
+ return this.resolver != null;
}
@@ -319,12 +319,12 @@
filter returns [ ExprNode filterExpr = null ]
{
- log.debug( "entered filter()" );
+ log.debug( "entered filter()" );
}
- :
- ( filterToken:FILTER { filterExpr=FilterParser.parse( filterToken.getText() ); } )
- ;
- exception
+ :
+ ( filterToken:FILTER { filterExpr=FilterParser.parse( filterToken.getText() ); } )
+ ;
+ exception
catch [Exception e]
{
throw new RecognitionException( "filterParser failed. " + e.getMessage() );
@@ -342,7 +342,7 @@
if ( isNormalizing() )
{
- name.normalize( oidsMap );
+ name.normalize( oidsMap );
}
log.debug( "recognized a DistinguishedName: " + token.getText() );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/MultiException.java Mon May 12 04:49:35 2008
@@ -20,12 +20,12 @@
package org.apache.directory.shared.ldap;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Collection;
-
-import java.io.PrintWriter;
-import java.io.PrintStream;
+import java.util.Iterator;
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/RuntimeMultiException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/RuntimeMultiException.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/RuntimeMultiException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/RuntimeMultiException.java Mon May 12 04:49:35 2008
@@ -21,12 +21,12 @@
package org.apache.directory.shared.ldap;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.Collection;
-
-import java.io.PrintWriter;
-import java.io.PrintStream;
+import java.util.Iterator;
/**
@@ -37,7 +37,7 @@
*/
public class RuntimeMultiException extends RuntimeException
{
- static final long serialVersionUID = 8582253398936366771L;
+ private static final long serialVersionUID = 8582253398936366771L;
/** Collection of nested exceptions. */
private Collection<Throwable> nestedExceptions = new ArrayList<Throwable>();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ItemFirstACIItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ItemFirstACIItem.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ItemFirstACIItem.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ItemFirstACIItem.java Mon May 12 04:49:35 2008
@@ -89,8 +89,8 @@
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
+ StringBuilder buf = new StringBuilder();
+
// identificationTag
buf.append( "{ identificationTag \"" );
buf.append( getIdentificationTag() );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java Mon May 12 04:49:35 2008
@@ -126,12 +126,12 @@
*/
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
- buf.append( "classes " );
- classes.printRefinementToBuffer( buf );
-
- return buf.toString();
+ StringBuilder buf = new StringBuilder();
+
+ buf.append( "classes " );
+ classes.printRefinementToBuffer( buf );
+
+ return buf.toString();
}
}
@@ -254,8 +254,8 @@
*/
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
+ StringBuilder buf = new StringBuilder();
+
buf.append( "{ " );
boolean isFirst = true;
@@ -274,8 +274,8 @@
}
buf.append( " }" );
-
- return buf.toString();
+
+ return buf.toString();
}
}
@@ -411,8 +411,8 @@
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
+ StringBuilder buf = new StringBuilder();
+
buf.append( "attributeValue {" );
for ( Iterator<Attribute> it = attributes.iterator(); it.hasNext(); )
@@ -498,23 +498,23 @@
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
- buf.append( "maxValueCount {" );
+ StringBuilder buf = new StringBuilder();
+
+ buf.append( "maxValueCount {" );
- boolean isFirst = true;
-
+ boolean isFirst = true;
+
for ( MaxValueCountItem item:items )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
-
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
+
buf.append( item.toString() );
}
@@ -580,7 +580,7 @@
public String toString()
{
- StringBuilder buf = new StringBuilder();
+ StringBuilder buf = new StringBuilder();
buf.append( "rangeOfValues " );
buf.append( filter.toString() );
@@ -705,23 +705,23 @@
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
+ StringBuilder buf = new StringBuilder();
+
buf.append( "restrictedBy {" );
boolean isFirst = true;
for ( RestrictedByItem item:items )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
-
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
+
buf.append( item.toString() );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserFirstACIItem.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserFirstACIItem.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserFirstACIItem.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserFirstACIItem.java Mon May 12 04:49:35 2008
@@ -89,8 +89,8 @@
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
+ StringBuilder buf = new StringBuilder();
+
// identificationTag
buf.append( "{ identificationTag \"" );
buf.append( getIdentificationTag() );
@@ -116,15 +116,15 @@
for ( UserClass userClass:userClasses )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
-
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
+
buf.append( userClass.toString() );
}
@@ -137,15 +137,15 @@
for ( UserPermission permission:userPermissions )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
-
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
+
buf.append( permission.toString() );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserPermission.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserPermission.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserPermission.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/aci/UserPermission.java Mon May 12 04:49:35 2008
@@ -68,8 +68,8 @@
public String toString()
{
- StringBuilder buf = new StringBuilder();
-
+ StringBuilder buf = new StringBuilder();
+
buf.append( "{ " );
if ( getPrecedence() >= 0 && getPrecedence() <= 255 )
@@ -85,15 +85,15 @@
for ( ProtectedItem item:protectedItems )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
-
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
+
buf.append( item.toString() );
}
@@ -103,16 +103,16 @@
for ( GrantAndDenial grantAndDenial:getGrantsAndDenials() )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- buf.append( ", " );
- }
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ buf.append( ", " );
+ }
- buf.append( grantAndDenial.toString() );
+ buf.append( grantAndDenial.toString() );
}
buf.append( " } }" );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java Mon May 12 04:49:35 2008
@@ -36,6 +36,7 @@
* AssertionValue ::= OCTET STRING
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class AttributeValueAssertion
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java Mon May 12 04:49:35 2008
@@ -36,6 +36,7 @@
* A Asn1Object to store a Control.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public class Control extends AbstractAsn1Object
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java?rev=655480&r1=655479&r2=655480&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java Mon May 12 04:49:35 2008
@@ -28,6 +28,7 @@
* An interface for decoders of controls.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$,
*/
public interface ControlDecoder
{