Author: elecharny
Date: Thu May 5 08:28:07 2005
New Revision: 168339
URL: http://svn.apache.org/viewcvs?rev=168339&view=rev
Log:
Changed the inheritance graph, changing the SpnegoPOJO from a Class to an Interface.
Modified:
directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/Asn1POJO.java
directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/codec/grammars/SpnegoGrammar.java
directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoNegTokenInitPOJO.java
directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoNegTokenTargPOJO.java
directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoPOJO.java
Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/Asn1POJO.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/Asn1POJO.java?rev=168339&r1=168338&r2=168339&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/Asn1POJO.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/Asn1POJO.java Thu May 5 08:28:07 2005
@@ -29,4 +29,19 @@
/** The method used to free the object */
public void free();
+ /** Get the current length of the TLV */
+ public int getCurrentLength();
+
+ /** Get the expected object length. */
+ public int getExpectedLength();
+
+ /** Set the expectedLength. */
+ public void setExpectedLength( int expectedLength );
+
+ /** Set the currentLength. */
+ public void setCurrentLength( int currentLength );
+
+ /** Add a length to the object */
+ public void addLength( int length ) throws DecoderException;
+
}
Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/codec/grammars/SpnegoGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/codec/grammars/SpnegoGrammar.java?rev=168339&r1=168338&r2=168339&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/codec/grammars/SpnegoGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/codec/grammars/SpnegoGrammar.java Thu May 5 08:28:07 2005
@@ -95,7 +95,7 @@
SpnegoContainer spnegoContainer = ( SpnegoContainer ) container;
// First, create a empty Spnego POJO
- SpnegoPOJO spnegoPOJO = ( SpnegoNegTokenInitPOJO )
+ SpnegoPOJO spnegoPOJO = ( SpnegoPOJO )
spnegoContainer.getPoolManager().allocate(
SpnegoPoolEnum.SPNEGO_NEG_TOKEN_INIT_POJO_POOL );
Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoNegTokenInitPOJO.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoNegTokenInitPOJO.java?rev=168339&r1=168338&r2=168339&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoNegTokenInitPOJO.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoNegTokenInitPOJO.java Thu May 5 08:28:07 2005
@@ -16,6 +16,7 @@
*/
package org.apache.asn1.spnego.pojo;
+import org.apache.asn1.AbstractPOJO;
import org.apache.asn1.primitives.OID;
import org.apache.asn1.primitives.OctetString;
@@ -26,7 +27,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SpnegoNegTokenInitPOJO extends SpnegoPOJO
+public class SpnegoNegTokenInitPOJO extends AbstractPOJO implements SpnegoPOJO
{
//~ Instance fields ----------------------------------------------------------------------------
Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoNegTokenTargPOJO.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoNegTokenTargPOJO.java?rev=168339&r1=168338&r2=168339&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoNegTokenTargPOJO.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoNegTokenTargPOJO.java Thu May 5 08:28:07 2005
@@ -16,6 +16,7 @@
*/
package org.apache.asn1.spnego.pojo;
+import org.apache.asn1.AbstractPOJO;
import org.apache.asn1.primitives.OID;
import org.apache.asn1.primitives.OctetString;
@@ -25,7 +26,7 @@
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SpnegoNegTokenTargPOJO extends SpnegoPOJO
+public class SpnegoNegTokenTargPOJO extends AbstractPOJO implements SpnegoPOJO
{
//~ Instance fields ----------------------------------------------------------------------------
Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoPOJO.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoPOJO.java?rev=168339&r1=168338&r2=168339&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoPOJO.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/pojo/SpnegoPOJO.java Thu May 5 08:28:07 2005
@@ -16,41 +16,14 @@
*/
package org.apache.asn1.spnego.pojo;
-import org.apache.asn1.AbstractPOJO;
+import org.apache.asn1.Asn1POJO;
/**
- * The main POJO : every Ldap Message are encapsulated in it. It has a
- * messageId and Controls.
+ * The Spnego POJO interface is used as a simple way to access to the
+ * Asn1POJO members.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SpnegoPOJO extends AbstractPOJO
+public interface SpnegoPOJO extends Asn1POJO
{
- //~ Instance fields ----------------------------------------------------------------------------
-
- /** The controls */
-
-
- //~ Constructors -------------------------------------------------------------------------------
-
- /**
- * Creates a new SpnegoPOJO object.
- */
- public SpnegoPOJO()
- {
- // We should not create this kind of object directly
- }
-
- //~ Methods ------------------------------------------------------------------------------------
-
- /**
- * Free the SpnegoPOJO. we have to free the Authentication,
- * the ProtocolOp, the Controls and to reset members to their
- * initial values.
- */
- public void free()
- {
- // put back the object in the pool
- super.free();
- }
}