You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/01/03 08:55:00 UTC
svn commit: r365566 - in /directory/trunk/asn1/src:
main/java/org/apache/asn1/ main/java/org/apache/asn1/ber/
main/java/org/apache/asn1/ber/grammar/ main/java/org/apache/asn1/ber/tlv/
main/java/org/apache/asn1/codec/util/ main/java/org/apache/asn1/prim...
Author: akarasulu
Date: Mon Jan 2 23:54:30 2006
New Revision: 365566
URL: http://svn.apache.org/viewcvs?rev=365566&view=rev
Log:
moved asn1new to asn1
Added:
directory/trunk/asn1/src/main/java/org/apache/asn1/Asn1Object.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/Asn1Object.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/AbstractContainer.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/AbstractContainer.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/Asn1Decoder.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/IAsn1Container.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/containers/IAsn1Container.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/AbstractGrammar.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/AbstractGrammar.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/GrammarAction.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/GrammarAction.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/GrammarTransition.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/GrammarTransition.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IAction.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IAction.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IGrammar.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IGrammar.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IStates.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IStates.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/ITLVBerDecoderMBean.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/ITLVBerDecoderMBean.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Length.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Length.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/TLV.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/TLV.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/TLVStateEnum.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/TLVStateEnum.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Tag.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Tag.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/UniversalTag.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/UniversalTag.java
directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Value.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Value.java
directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/
directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/BitString.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/primitives/BitString.java
directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/OID.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/primitives/OID.java
directory/trunk/asn1/src/main/java/org/apache/asn1/util/
directory/trunk/asn1/src/main/java/org/apache/asn1/util/Asn1StringUtils.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1/codec/util/Asn1StringUtils.java
directory/trunk/asn1/src/main/java/org/apache/asn1/util/BooleanDecoder.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/util/BooleanDecoder.java
directory/trunk/asn1/src/main/java/org/apache/asn1/util/BooleanDecoderException.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/util/BooleanDecoderException.java
directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoder.java
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/util/IntegerDecoder.java
directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoderException.java (contents, props changed)
- copied, changed from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/util/IntegerDecoderException.java
directory/trunk/asn1/src/test/java/org/apache/asn1/ber/
directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/
directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/LengthTest.java
- copied, changed from r365563, directory/trunk/asn1/src/test/java/org/apache/asn1new/ber/tlv/LengthTest.java
directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/ValueTest.java
- copied, changed from r365563, directory/trunk/asn1/src/test/java/org/apache/asn1new/ber/tlv/ValueTest.java
directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/
directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/BitStringTest.java
- copied, changed from r365563, directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/BitStringTest.java
directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/OIDTest.java
- copied, changed from r365563, directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/OIDTest.java
directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/PrimitivesTest.java
- copied, changed from r365563, directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java
Removed:
directory/trunk/asn1/src/main/java/org/apache/asn1/codec/util/Asn1StringUtils.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/Asn1Object.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/AbstractContainer.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/containers/IAsn1Container.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/AbstractGrammar.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/GrammarAction.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/GrammarTransition.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IAction.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IGrammar.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IStates.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/ITLVBerDecoderMBean.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Length.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/TLV.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/TLVStateEnum.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Tag.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/UniversalTag.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Value.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/primitives/BitString.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/primitives/OID.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/util/BooleanDecoder.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/util/BooleanDecoderException.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/util/IntegerDecoder.java
directory/trunk/asn1/src/main/java/org/apache/asn1new/util/IntegerDecoderException.java
directory/trunk/asn1/src/test/java/org/apache/asn1new/ber/tlv/LengthTest.java
directory/trunk/asn1/src/test/java/org/apache/asn1new/ber/tlv/ValueTest.java
directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/BitStringTest.java
directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/OIDTest.java
directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/Asn1Object.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/Asn1Object.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/Asn1Object.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/Asn1Object.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/Asn1Object.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/Asn1Object.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/Asn1Object.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.asn1new;
+package org.apache.asn1;
import java.nio.ByteBuffer;
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/AbstractContainer.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/AbstractContainer.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/AbstractContainer.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/AbstractContainer.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/AbstractContainer.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/AbstractContainer.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/AbstractContainer.java Mon Jan 2 23:54:30 2006
@@ -14,13 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber;
+package org.apache.asn1.ber;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ber.grammar.IGrammar;
-import org.apache.asn1new.ber.grammar.IStates;
-import org.apache.asn1new.ber.tlv.TLV;
-import org.apache.asn1new.ber.tlv.TLVStateEnum;
+import org.apache.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.IStates;
+import org.apache.asn1.ber.tlv.TLV;
+import org.apache.asn1.ber.tlv.TLVStateEnum;
/**
@@ -62,10 +61,10 @@
/** Store the different states for debug purpose */
protected IStates states;
-
+
/** The parent TLV */
protected TLV parentTLV;
-
+
//~ Methods ------------------------------------------------------------------------------------
/**
@@ -224,7 +223,7 @@
{
return this.tlv;
}
-
+
/**
* Get the states for this container's grammars
*
@@ -233,7 +232,7 @@
public IStates getStates() {
return states;
}
-
+
/**
* Get the parent TLV;
*
@@ -249,11 +248,11 @@
*
* @param The parent TLV to set.
*/
- public void setParentTLV(TLV parentTLV)
+ public void setParentTLV( TLV parentTLV)
{
this.parentTLV = parentTLV;
}
-
+
/**
* Clean the container for the next usage.
*
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/Asn1Decoder.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/Asn1Decoder.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/Asn1Decoder.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/Asn1Decoder.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/Asn1Decoder.java Mon Jan 2 23:54:30 2006
@@ -14,19 +14,18 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber;
+package org.apache.asn1.ber;
import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ber.tlv.Length;
-import org.apache.asn1new.ber.tlv.TLV;
-import org.apache.asn1new.ber.tlv.ITLVBerDecoderMBean;
-import org.apache.asn1new.ber.tlv.TLVStateEnum;
-import org.apache.asn1new.ber.tlv.Tag;
-import org.apache.asn1new.ber.tlv.UniversalTag;
-import org.apache.asn1new.ber.tlv.Value;
-import org.apache.asn1.codec.util.Asn1StringUtils;
+import org.apache.asn1.ber.tlv.TLV;
+import org.apache.asn1.ber.tlv.TLVStateEnum;
+import org.apache.asn1.ber.tlv.Tag;
+import org.apache.asn1.ber.tlv.UniversalTag;
+import org.apache.asn1.ber.tlv.Value;
+import org.apache.asn1.util.Asn1StringUtils;
+import org.apache.asn1.ber.tlv.ITLVBerDecoderMBean;
+import org.apache.asn1.ber.tlv.Length;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -228,7 +227,7 @@
TLV current = container.getCurrentTLV();
sb.append("TLV").
- append(Asn1StringUtils.dumpByte(current.getTag().getTagBytes()[0])).
+ append( Asn1StringUtils.dumpByte(current.getTag().getTagBytes()[0])).
append("(").
append(current.getExpectedLength()).
append(")");
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/IAsn1Container.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/containers/IAsn1Container.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/IAsn1Container.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/IAsn1Container.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/containers/IAsn1Container.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/containers/IAsn1Container.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/IAsn1Container.java Mon Jan 2 23:54:30 2006
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.containers;
+package org.apache.asn1.ber;
-import org.apache.asn1new.ber.grammar.IGrammar;
-import org.apache.asn1new.ber.grammar.IStates;
-import org.apache.asn1new.ber.tlv.TLV;
+import org.apache.asn1.ber.grammar.IGrammar;
+import org.apache.asn1.ber.grammar.IStates;
+import org.apache.asn1.ber.tlv.TLV;
/**
@@ -112,17 +112,17 @@
* @param transition The transition to set
*/
public void setTransition( int transition );
-
+
/**
* @return Returns the current Grammar type, or -1 if not found.
*/
public int getCurrentGrammarType();
-
+
/**
* @return Returns the states.
*/
public IStates getStates();
-
+
/**
* @return get the parent TLV.
*/
@@ -132,5 +132,5 @@
* Set the parent TLV
* @param The new parent TLV
*/
- public void setParentTLV(TLV parentTLV);
+ public void setParentTLV( TLV parentTLV);
}
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/AbstractGrammar.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/AbstractGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/AbstractGrammar.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/AbstractGrammar.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/AbstractGrammar.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/AbstractGrammar.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/AbstractGrammar.java Mon Jan 2 23:54:30 2006
@@ -14,14 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.grammar;
+package org.apache.asn1.ber.grammar;
-import org.apache.asn1new.Asn1Object;
+import org.apache.asn1.Asn1Object;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.ber.tlv.Tag;
import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ber.tlv.TLV;
-import org.apache.asn1new.ber.tlv.Tag;
-import org.apache.asn1.codec.util.Asn1StringUtils;
+import org.apache.asn1.ber.tlv.TLV;
+import org.apache.asn1.util.Asn1StringUtils;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/GrammarAction.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/GrammarAction.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/GrammarAction.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/GrammarAction.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/GrammarAction.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/GrammarAction.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/GrammarAction.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.grammar;
+package org.apache.asn1.ber.grammar;
/**
* A top level grammar class that store meta informations about the actions.
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/GrammarTransition.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/GrammarTransition.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/GrammarTransition.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/GrammarTransition.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/GrammarTransition.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/GrammarTransition.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/GrammarTransition.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.grammar;
+package org.apache.asn1.ber.grammar;
+
+
+import org.apache.asn1.ber.grammar.GrammarAction;
+
/**
* Define a transition between two states of a grammar. It stores the
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IAction.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IAction.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IAction.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IAction.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IAction.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IAction.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IAction.java Mon Jan 2 23:54:30 2006
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.grammar;
+package org.apache.asn1.ber.grammar;
import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1new.ber.containers.IAsn1Container;
+import org.apache.asn1.ber.IAsn1Container;
/**
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IGrammar.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IGrammar.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IGrammar.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IGrammar.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IGrammar.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IGrammar.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IGrammar.java Mon Jan 2 23:54:30 2006
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.grammar;
+package org.apache.asn1.ber.grammar;
import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1new.ber.containers.IAsn1Container;
+import org.apache.asn1.ber.IAsn1Container;
/**
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IStates.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IStates.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IStates.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IStates.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IStates.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/grammar/IStates.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/grammar/IStates.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.grammar;
+package org.apache.asn1.ber.grammar;
+
+
+import org.apache.asn1.ber.grammar.IGrammar;
+
/**
* This interface is used to store the different states of a grammar. While
@@ -29,22 +33,22 @@
/** The ending state for every grammars */
static int GRAMMAR_END = -1;
-
+
/** The END_STATE */
static int END_STATE = -1;
/** The mask to filter grammar switch */
final static int GRAMMAR_SWITCH_MASK = 0xFF00;
-
+
/** The mask to filter states transition */
final static int STATES_SWITCH_MASK = 0x00FF;
-
+
/** Get the current state for a specified grammar */
String getState( int grammar, int state );
-
- /** Return the grammar name from a grammar */
- String getGrammarName(IGrammar grammar);
- /** Return the grammar name from a grammar number */
+ /** Return the grammar name from a grammar */
+ String getGrammarName( IGrammar grammar);
+
+ /** Return the grammar name from a grammar number */
String getGrammarName(int grammar);
}
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/ITLVBerDecoderMBean.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/ITLVBerDecoderMBean.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/ITLVBerDecoderMBean.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/ITLVBerDecoderMBean.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/ITLVBerDecoderMBean.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/ITLVBerDecoderMBean.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/ITLVBerDecoderMBean.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.tlv;
+package org.apache.asn1.ber.tlv;
import org.apache.asn1.codec.DecoderException;
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Length.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Length.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Length.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Length.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Length.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Length.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Length.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.tlv;
+package org.apache.asn1.ber.tlv;
import java.io.Serializable;
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/TLV.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/TLV.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/TLV.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/TLV.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/TLV.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/TLV.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/TLV.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.tlv;
+package org.apache.asn1.ber.tlv;
+
+
+import org.apache.asn1.ber.tlv.Length;
+import org.apache.asn1.ber.tlv.Tag;
+
/**
* This class is used to store Tag, Length and Value decoded from a PDU.
@@ -41,7 +46,7 @@
* As the enclosing TLV of a PDU does not have parent, it can be
* null in this case. Otherwise, it must point to a constructed TLV */
private TLV parent;
-
+
/** The expected length of the TLV's elements, if the current TLV is
* a constructed TLV.
*/
@@ -57,7 +62,7 @@
tag = new Tag();
length = new Length();
value = new Value();
-
+
expectedLength = 0;
}
@@ -91,7 +96,7 @@
public void setLength( Length length )
{
this.length = length;
-
+
expectedLength = length.getLength();
}
@@ -130,47 +135,47 @@
return sb.toString();
}
- /**
+ /**
* The TLV size is calculated by adding the Tag's size, the Length's
* size and the Value's length, if any.
*
- * @return Returns the size of the TLV.
- */
- public int getSize() {
- return tag.getSize() + length.getSize() + length.getLength();
- }
-
+ * @return Returns the size of the TLV.
+ */
+ public int getSize() {
+ return tag.getSize() + length.getSize() + length.getLength();
+ }
+
/**
* @return Returns the parent.
*/
- public TLV getParent()
+ public TLV getParent()
{
return parent;
}
-
+
/**
* @param parent The parent to set.
*/
- public void setParent(TLV parent)
+ public void setParent(TLV parent)
{
this.parent = parent;
}
-
+
/**
* Get the TLV expected length.
*
* @return Returns the expectedLength.
*/
- public int getExpectedLength()
+ public int getExpectedLength()
{
return expectedLength;
}
-
+
/**
* Set the new expected length of the current TLV.
* @param expectedLength The expectedLength to set.
*/
- public void setExpectedLength(int expectedLength)
+ public void setExpectedLength(int expectedLength)
{
this.expectedLength = expectedLength;
}
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/TLVStateEnum.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/TLVStateEnum.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/TLVStateEnum.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/TLVStateEnum.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/TLVStateEnum.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/TLVStateEnum.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/TLVStateEnum.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.tlv;
+package org.apache.asn1.ber.tlv;
/**
* Stores the different states of a PDU parsing.
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Tag.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Tag.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Tag.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Tag.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Tag.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Tag.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Tag.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.tlv;
+package org.apache.asn1.ber.tlv;
import java.io.Serializable;
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/UniversalTag.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/UniversalTag.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/UniversalTag.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/UniversalTag.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/UniversalTag.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/UniversalTag.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/UniversalTag.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.tlv;
+package org.apache.asn1.ber.tlv;
/**
* Enum for ASN.1 UNIVERSAL class tags. The tags values are
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Value.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Value.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Value.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Value.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Value.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/ber/tlv/Value.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/ber/tlv/Value.java Mon Jan 2 23:54:30 2006
@@ -14,11 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.tlv;
+package org.apache.asn1.ber.tlv;
import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.primitives.OID;
-import org.apache.asn1.codec.util.Asn1StringUtils;
+import org.apache.asn1.primitives.OID;
+import org.apache.asn1.util.Asn1StringUtils;
+import org.apache.asn1.ber.tlv.Length;
+import org.apache.asn1.ber.tlv.UniversalTag;
import java.io.Serializable;
import java.nio.BufferOverflowException;
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/BitString.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/primitives/BitString.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/BitString.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/BitString.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/primitives/BitString.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/primitives/BitString.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/BitString.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.primitives;
+package org.apache.asn1.primitives;
import java.io.Serializable;
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/OID.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/primitives/OID.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/OID.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/OID.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/primitives/OID.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/primitives/OID.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/primitives/OID.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.primitives;
+package org.apache.asn1.primitives;
import java.io.Serializable;
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/util/Asn1StringUtils.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1/codec/util/Asn1StringUtils.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/util/Asn1StringUtils.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/util/Asn1StringUtils.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1/codec/util/Asn1StringUtils.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1/codec/util/Asn1StringUtils.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/util/Asn1StringUtils.java Mon Jan 2 23:54:30 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
-package org.apache.asn1.codec.util;
+package org.apache.asn1.util;
import java.io.UnsupportedEncodingException;
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/util/BooleanDecoder.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/util/BooleanDecoder.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/util/BooleanDecoder.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/util/BooleanDecoder.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/util/BooleanDecoder.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/util/BooleanDecoder.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/util/BooleanDecoder.java Mon Jan 2 23:54:30 2006
@@ -14,10 +14,10 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.util;
+package org.apache.asn1.util;
import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1new.ber.tlv.Value;
+import org.apache.asn1.ber.tlv.Value;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/util/BooleanDecoderException.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/util/BooleanDecoderException.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/util/BooleanDecoderException.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/util/BooleanDecoderException.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/util/BooleanDecoderException.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/util/BooleanDecoderException.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/util/BooleanDecoderException.java Mon Jan 2 23:54:30 2006
@@ -15,7 +15,7 @@
*
*/
-package org.apache.asn1new.util;
+package org.apache.asn1.util;
/**
* Thrown when a BooleanDecoderException has encountered a failure condition during a decode.
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoder.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/util/IntegerDecoder.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoder.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoder.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/util/IntegerDecoder.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/util/IntegerDecoder.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoder.java Mon Jan 2 23:54:30 2006
@@ -14,9 +14,9 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.util;
+package org.apache.asn1.util;
-import org.apache.asn1new.ber.tlv.Value;
+import org.apache.asn1.ber.tlv.Value;
/**
@@ -27,7 +27,7 @@
public class IntegerDecoder
{
private static final int[] MASK = new int[]{ 0x000000FF, 0x0000FFFF, 0x00FFFFFF, 0xFFFFFFFF};
-
+
//~ Methods ------------------------------------------------------------------------------------
/**
@@ -73,7 +73,7 @@
throw new IntegerDecoderException( "The value is not in the range [" + min + ", " + max + "]" );
}
}
-
+
/**
* Parse a byte buffer and send back an integer
*
@@ -85,6 +85,6 @@
*/
public static int parse( Value value ) throws IntegerDecoderException
{
- return parse( value, Integer.MIN_VALUE, Integer.MAX_VALUE );
+ return parse( value, Integer.MIN_VALUE, Integer.MAX_VALUE );
}
}
Copied: directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoderException.java (from r365563, directory/trunk/asn1/src/main/java/org/apache/asn1new/util/IntegerDecoderException.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoderException.java?p2=directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoderException.java&p1=directory/trunk/asn1/src/main/java/org/apache/asn1new/util/IntegerDecoderException.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/main/java/org/apache/asn1new/util/IntegerDecoderException.java (original)
+++ directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoderException.java Mon Jan 2 23:54:30 2006
@@ -15,7 +15,7 @@
*
*/
-package org.apache.asn1new.util;
+package org.apache.asn1.util;
/**
* Thrown when a IntegerDecoder has encountered a failure condition during a decode.
Propchange: directory/trunk/asn1/src/main/java/org/apache/asn1/util/IntegerDecoderException.java
------------------------------------------------------------------------------
svn:executable = *
Copied: directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/LengthTest.java (from r365563, directory/trunk/asn1/src/test/java/org/apache/asn1new/ber/tlv/LengthTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/LengthTest.java?p2=directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/LengthTest.java&p1=directory/trunk/asn1/src/test/java/org/apache/asn1new/ber/tlv/LengthTest.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/test/java/org/apache/asn1new/ber/tlv/LengthTest.java (original)
+++ directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/LengthTest.java Mon Jan 2 23:54:30 2006
@@ -14,12 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.tlv;
+package org.apache.asn1.ber.tlv;
import java.util.Arrays;
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.asn1.ber.tlv.Length;
+
/**
* This class is used to test the Length class
@@ -30,7 +32,7 @@
/**
* Test the getNbBytes method
*/
- public void testLengthGetNbBytes()
+ public void testLengthGetNbBytes()
{
Assert.assertEquals(1, Length.getNbBytes(0));
Assert.assertEquals(1, Length.getNbBytes(1));
@@ -48,7 +50,7 @@
/**
* Test the getBytes method
*/
- public void testLengthGetBytes()
+ public void testLengthGetBytes()
{
assertTrue(Arrays.equals(new byte[]{0x01}, Length.getBytes(1)));
assertTrue(Arrays.equals(new byte[]{0x7F}, Length.getBytes(127)));
Copied: directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/ValueTest.java (from r365563, directory/trunk/asn1/src/test/java/org/apache/asn1new/ber/tlv/ValueTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/ValueTest.java?p2=directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/ValueTest.java&p1=directory/trunk/asn1/src/test/java/org/apache/asn1new/ber/tlv/ValueTest.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/test/java/org/apache/asn1new/ber/tlv/ValueTest.java (original)
+++ directory/trunk/asn1/src/test/java/org/apache/asn1/ber/tlv/ValueTest.java Mon Jan 2 23:54:30 2006
@@ -14,11 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.ber.tlv;
+package org.apache.asn1.ber.tlv;
import java.math.BigInteger;
-import org.apache.asn1new.util.IntegerDecoder;
+import org.apache.asn1.util.IntegerDecoder;
+import org.apache.asn1.ber.tlv.Value;
import junit.framework.Assert;
import junit.framework.TestCase;
Copied: directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/BitStringTest.java (from r365563, directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/BitStringTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/BitStringTest.java?p2=directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/BitStringTest.java&p1=directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/BitStringTest.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/BitStringTest.java (original)
+++ directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/BitStringTest.java Mon Jan 2 23:54:30 2006
@@ -14,12 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.primitives;
+package org.apache.asn1.primitives;
import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.asn1.codec.DecoderException;
+import org.apache.asn1.primitives.BitString;
/**
Copied: directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/OIDTest.java (from r365563, directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/OIDTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/OIDTest.java?p2=directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/OIDTest.java&p1=directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/OIDTest.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/OIDTest.java (original)
+++ directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/OIDTest.java Mon Jan 2 23:54:30 2006
@@ -14,12 +14,13 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.primitives;
+package org.apache.asn1.primitives;
import junit.framework.Assert;
import junit.framework.TestCase;
import org.apache.asn1.codec.DecoderException;
+import org.apache.asn1.primitives.OID;
/**
Copied: directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/PrimitivesTest.java (from r365563, directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/PrimitivesTest.java?p2=directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/PrimitivesTest.java&p1=directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java&r1=365563&r2=365566&rev=365566&view=diff
==============================================================================
--- directory/trunk/asn1/src/test/java/org/apache/asn1new/primitives/PrimitivesTest.java (original)
+++ directory/trunk/asn1/src/test/java/org/apache/asn1/primitives/PrimitivesTest.java Mon Jan 2 23:54:30 2006
@@ -14,14 +14,15 @@
* limitations under the License.
*
*/
-package org.apache.asn1new.primitives;
+package org.apache.asn1.primitives;
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.asn1new.ber.tlv.Value;
-import org.apache.asn1new.util.IntegerDecoder;
-import org.apache.asn1new.util.IntegerDecoderException;
+import org.apache.asn1.ber.tlv.Value;
+import org.apache.asn1.util.IntegerDecoder;
+import org.apache.asn1.util.IntegerDecoderException;
+
/**
* Test the Primitives