directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r188708 - in /directory/sandbox/trunk/asn1-new-codec/src: perfs/org/apache/ans1/ber/ test/org/apache/asn1/ldap/codec/ test/org/apache/asn1/spnego/codec/
Date Tue, 07 Jun 2005 06:37:03 GMT
Author: elecharny
Date: Mon Jun  6 23:37:02 2005
New Revision: 188708

URL: http://svn.apache.org/viewcvs?rev=188708&view=rev
Log:
Modified the names of decoded objects : no more POJOs

Modified:
    directory/sandbox/trunk/asn1-new-codec/src/perfs/org/apache/ans1/ber/LdapDecoderPerf.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/AbandonRequestTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/AddResponseTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/BindRequestTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/BindResponseTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/CompareResponseTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/DelResponseTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/LdapDecoderTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/ModifyDNResponseTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/ModifyResponseTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/SearchRequestTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/SearchResultDoneTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/UnBindRequestTest.java
    directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/spnego/codec/SpnegoTest.java

Modified: directory/sandbox/trunk/asn1-new-codec/src/perfs/org/apache/ans1/ber/LdapDecoderPerf.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/perfs/org/apache/ans1/ber/LdapDecoderPerf.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/perfs/org/apache/ans1/ber/LdapDecoderPerf.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/perfs/org/apache/ans1/ber/LdapDecoderPerf.java Mon Jun  6 23:37:02 2005
@@ -21,9 +21,9 @@
 import org.apache.asn1.ber.containers.IAsn1Container;
 import org.apache.asn1.ldap.codec.LdapDecoder;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
-import org.apache.asn1.ldap.pojo.BindRequestPOJO;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
-import org.apache.asn1.ldap.pojo.SimpleAuthenticationPOJO;
+import org.apache.asn1.ldap.pojo.BindRequest;
+import org.apache.asn1.ldap.pojo.LdapMessage;
+import org.apache.asn1.ldap.pojo.SimpleAuthentication;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
@@ -115,18 +115,18 @@
             // Free the BindRequest Container. It will be put back in the IPool
             // after being reset.
             //bindRequestContainer.free();
-            LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer )
+            LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer )
                 .getLdapMessage();
-            BindRequestPOJO br      = ( BindRequestPOJO ) ( message.getProtocolOp() );
+            BindRequest br      = ( BindRequest ) ( message.getProtocolOp() );
 
             System.out.println( "BindRequest decoded :" );
             System.out.println( "	MessageId 	= " + message.getMessageId() );
             System.out.println( "	Version 	= " + br.getVersion() );
             System.out.println( "	Name	 	= " + br.getName() );
             System.out.println( "	Authentication	= " +
-                ( ( br.getAuthentication() instanceof SimpleAuthenticationPOJO ) ? "Simple" : "sasl" ) );
+                ( ( br.getAuthentication() instanceof SimpleAuthentication ) ? "Simple" : "sasl" ) );
             System.out.println( "	simple		= " +
-                ( ( SimpleAuthenticationPOJO ) br.getAuthentication() ).getSimple() );
+                ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() );
         }
         catch ( DecoderException de )
         {

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/AbandonRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/AbandonRequestTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/AbandonRequestTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/AbandonRequestTest.java Mon Jun  6 23:37:02 2005
@@ -21,8 +21,8 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.AbandonRequestPOJO;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
+import org.apache.asn1.ldap.pojo.AbandonRequest;
+import org.apache.asn1.ldap.pojo.LdapMessage;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -74,8 +74,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        AbandonRequestPOJO abandonRequest = ( AbandonRequestPOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        AbandonRequest abandonRequest = ( AbandonRequest ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, abandonRequest.getMessageId() );
     }

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/AddResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/AddResponseTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/AddResponseTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/AddResponseTest.java Mon Jun  6 23:37:02 2005
@@ -21,8 +21,8 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.AddResponsePOJO;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
+import org.apache.asn1.ldap.pojo.AddResponse;
+import org.apache.asn1.ldap.pojo.LdapMessage;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -84,8 +84,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        AddResponsePOJO addResponse      = ( AddResponsePOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        AddResponse addResponse      = ( AddResponse ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 0, addResponse.getLdapResult().getResultCode() );

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/BindRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/BindRequestTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/BindRequestTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/BindRequestTest.java Mon Jun  6 23:37:02 2005
@@ -21,10 +21,10 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.BindRequestPOJO;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
-import org.apache.asn1.ldap.pojo.SaslAuthenticationPOJO;
-import org.apache.asn1.ldap.pojo.SimpleAuthenticationPOJO;
+import org.apache.asn1.ldap.pojo.BindRequest;
+import org.apache.asn1.ldap.pojo.LdapMessage;
+import org.apache.asn1.ldap.pojo.SaslAuthentication;
+import org.apache.asn1.ldap.pojo.SimpleAuthentication;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -83,14 +83,14 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        BindRequestPOJO br      = ( BindRequestPOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        BindRequest br      = ( BindRequest ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 3, br.getVersion() );
         Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
-        Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthenticationPOJO ) );
-        Assert.assertEquals( "password", new String(( ( SimpleAuthenticationPOJO ) br.getAuthentication() ).getSimple()) );
+        Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
+        Assert.assertEquals( "password", new String(( ( SimpleAuthentication ) br.getAuthentication() ).getSimple()) );
     }
 
     /**
@@ -176,14 +176,14 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        BindRequestPOJO br      = ( BindRequestPOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        BindRequest br      = ( BindRequest ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 3, br.getVersion() );
         Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
-        Assert.assertEquals( true, ( br.getAuthentication() instanceof SaslAuthenticationPOJO ) );
-        Assert.assertEquals( "KERBEROS_V4", ( ( SaslAuthenticationPOJO ) br.getAuthentication() ).getMechanism() );
+        Assert.assertEquals( true, ( br.getAuthentication() instanceof SaslAuthentication ) );
+        Assert.assertEquals( "KERBEROS_V4", ( ( SaslAuthentication ) br.getAuthentication() ).getMechanism() );
     }
 
     /**
@@ -234,14 +234,14 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        BindRequestPOJO br      = ( BindRequestPOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        BindRequest br      = ( BindRequest ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 3, br.getVersion() );
         Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
-        Assert.assertEquals( true, ( br.getAuthentication() instanceof SaslAuthenticationPOJO ) );
-        Assert.assertEquals( "KERBEROS_V4", ( ( SaslAuthenticationPOJO ) br.getAuthentication() ).getMechanism() );
-        Assert.assertEquals( "abcdef", new String( ( ( SaslAuthenticationPOJO ) br.getAuthentication() ).getCredentials() ) );
+        Assert.assertEquals( true, ( br.getAuthentication() instanceof SaslAuthentication ) );
+        Assert.assertEquals( "KERBEROS_V4", ( ( SaslAuthentication ) br.getAuthentication() ).getMechanism() );
+        Assert.assertEquals( "abcdef", new String( ( ( SaslAuthentication ) br.getAuthentication() ).getCredentials() ) );
     }
 }

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/BindResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/BindResponseTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/BindResponseTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/BindResponseTest.java Mon Jun  6 23:37:02 2005
@@ -21,8 +21,8 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.BindResponsePOJO;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
+import org.apache.asn1.ldap.pojo.BindResponse;
+import org.apache.asn1.ldap.pojo.LdapMessage;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -85,8 +85,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        BindResponsePOJO br      = ( BindResponsePOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        BindResponse br      = ( BindResponse ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 0, br.getLdapResult().getResultCode() );
@@ -138,8 +138,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        BindResponsePOJO br      = ( BindResponsePOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        BindResponse br      = ( BindResponse ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 0, br.getLdapResult().getResultCode() );

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/CompareResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/CompareResponseTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/CompareResponseTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/CompareResponseTest.java Mon Jun  6 23:37:02 2005
@@ -21,8 +21,8 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.CompareResponsePOJO;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
+import org.apache.asn1.ldap.pojo.CompareResponse;
+import org.apache.asn1.ldap.pojo.LdapMessage;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -84,8 +84,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        CompareResponsePOJO compareResponse      = ( CompareResponsePOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        CompareResponse compareResponse      = ( CompareResponse ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 0, compareResponse.getLdapResult().getResultCode() );

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/DelResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/DelResponseTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/DelResponseTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/DelResponseTest.java Mon Jun  6 23:37:02 2005
@@ -21,8 +21,8 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.DelResponsePOJO;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
+import org.apache.asn1.ldap.pojo.DelResponse;
+import org.apache.asn1.ldap.pojo.LdapMessage;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -86,8 +86,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        DelResponsePOJO delResponse      = ( DelResponsePOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        DelResponse delResponse      = ( DelResponse ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 0, delResponse.getLdapResult().getResultCode() );

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/LdapDecoderTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/LdapDecoderTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/LdapDecoderTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/LdapDecoderTest.java Mon Jun  6 23:37:02 2005
@@ -21,9 +21,9 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.BindRequestPOJO;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
-import org.apache.asn1.ldap.pojo.SimpleAuthenticationPOJO;
+import org.apache.asn1.ldap.pojo.BindRequest;
+import org.apache.asn1.ldap.pojo.LdapMessage;
+import org.apache.asn1.ldap.pojo.SimpleAuthentication;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -82,14 +82,14 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        BindRequestPOJO br      = ( BindRequestPOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        BindRequest br      = ( BindRequest ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 3, br.getVersion() );
         Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
-        Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthenticationPOJO ) );
-        Assert.assertEquals( "password", ( ( SimpleAuthenticationPOJO ) br.getAuthentication() ).getSimple() );
+        Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
+        Assert.assertEquals( "password", ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() );
     }
 
     /**
@@ -127,13 +127,13 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        BindRequestPOJO br      = ( BindRequestPOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        BindRequest br      = ( BindRequest ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 3, br.getVersion() );
         Assert.assertEquals( null, br.getName() );
-        Assert.assertEquals( false, ( br.getAuthentication() instanceof SimpleAuthenticationPOJO ) );
+        Assert.assertEquals( false, ( br.getAuthentication() instanceof SimpleAuthentication ) );
     }
 
     /**
@@ -196,14 +196,14 @@
             Assert.fail( de.getMessage() );
         }
 
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        BindRequestPOJO br      = ( BindRequestPOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        BindRequest br      = ( BindRequest ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 3, br.getVersion() );
         Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", br.getName() );
-        Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthenticationPOJO ) );
-        Assert.assertEquals( "password", ( ( SimpleAuthenticationPOJO ) br.getAuthentication() ).getSimple() );
+        Assert.assertEquals( true, ( br.getAuthentication() instanceof SimpleAuthentication ) );
+        Assert.assertEquals( "password", ( ( SimpleAuthentication ) br.getAuthentication() ).getSimple() );
     }
 
     /**

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/ModifyDNResponseTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/ModifyDNResponseTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/ModifyDNResponseTest.java Mon Jun  6 23:37:02 2005
@@ -21,8 +21,8 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
-import org.apache.asn1.ldap.pojo.ModifyDNResponsePOJO;
+import org.apache.asn1.ldap.pojo.LdapMessage;
+import org.apache.asn1.ldap.pojo.ModifyDNResponse;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -86,8 +86,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        ModifyDNResponsePOJO modifyDNResponse      = ( ModifyDNResponsePOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        ModifyDNResponse modifyDNResponse      = ( ModifyDNResponse ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 0, modifyDNResponse.getLdapResult().getResultCode() );

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/ModifyResponseTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/ModifyResponseTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/ModifyResponseTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/ModifyResponseTest.java Mon Jun  6 23:37:02 2005
@@ -21,8 +21,8 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
-import org.apache.asn1.ldap.pojo.ModifyResponsePOJO;
+import org.apache.asn1.ldap.pojo.LdapMessage;
+import org.apache.asn1.ldap.pojo.ModifyResponse;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -86,8 +86,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        ModifyResponsePOJO modifyResponse      = ( ModifyResponsePOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        ModifyResponse modifyResponse      = ( ModifyResponse ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 0, modifyResponse.getLdapResult().getResultCode() );

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/SearchRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/SearchRequestTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/SearchRequestTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/SearchRequestTest.java Mon Jun  6 23:37:02 2005
@@ -22,13 +22,13 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.AttributeValueAssertionPOJO;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
-import org.apache.asn1.ldap.pojo.SearchRequestPOJO;
-import org.apache.asn1.ldap.pojo.filters.AndFilterPOJO;
-import org.apache.asn1.ldap.pojo.filters.AttributeValueAssertionFilterPOJO;
-import org.apache.asn1.ldap.pojo.filters.NotFilterPOJO;
-import org.apache.asn1.ldap.pojo.filters.OrFilterPOJO;
+import org.apache.asn1.ldap.pojo.AttributeValueAssertion;
+import org.apache.asn1.ldap.pojo.LdapMessage;
+import org.apache.asn1.ldap.pojo.SearchRequest;
+import org.apache.asn1.ldap.pojo.filters.AndFilter;
+import org.apache.asn1.ldap.pojo.filters.AttributeValueAssertionFilter;
+import org.apache.asn1.ldap.pojo.filters.NotFilter;
+import org.apache.asn1.ldap.pojo.filters.OrFilter;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -120,8 +120,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        SearchRequestPOJO sr      = ( SearchRequestPOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        SearchRequest sr      = ( SearchRequest ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", sr.getBaseObject().toString() );
@@ -132,30 +132,30 @@
         Assert.assertEquals( true, sr.isTypesOnly() );
         
         // (& (...
-        AndFilterPOJO andFilter = (AndFilterPOJO)sr.getFilter();
+        AndFilter andFilter = (AndFilter)sr.getFilter();
         Assert.assertNotNull(andFilter);
         
         ArrayList andFilters = andFilter.getAndFilter();
         
         // (& (| (...
         Assert.assertEquals(2, andFilters.size());
-        OrFilterPOJO orFilter = (OrFilterPOJO)andFilters.get(0);
+        OrFilter orFilter = (OrFilter)andFilters.get(0);
         Assert.assertNotNull(orFilter);
         
         // (& (| (obectclass=top) (...
         ArrayList orFilters = orFilter.getOrFilter();
         Assert.assertEquals(2, orFilters.size());
-        AttributeValueAssertionFilterPOJO equalityMatch = (AttributeValueAssertionFilterPOJO)orFilters.get(0);  
+        AttributeValueAssertionFilter equalityMatch = (AttributeValueAssertionFilter)orFilters.get(0);  
         Assert.assertNotNull(equalityMatch);
         
-        AttributeValueAssertionPOJO assertion = equalityMatch.getAssertion();
+        AttributeValueAssertion assertion = equalityMatch.getAssertion();
         Assert.assertNotNull(assertion);
         
         Assert.assertEquals("objectclass", assertion.getAttributeDesc().toString());
         Assert.assertEquals("[74][6F][70]", assertion.getAssertionValue().toString());
         
         // (& (| (objectclass=top) (ou=contacts) ) (...
-        equalityMatch = (AttributeValueAssertionFilterPOJO)orFilters.get(1);  
+        equalityMatch = (AttributeValueAssertionFilter)orFilters.get(1);  
         Assert.assertNotNull(equalityMatch);
         
         assertion = equalityMatch.getAssertion();
@@ -165,11 +165,11 @@
         Assert.assertEquals("[63][6F][6E][74][61][63][74][73]", assertion.getAssertionValue().toString());
         
         // (& (| (objectclass=top) (ou=contacts) ) (! ...
-        NotFilterPOJO notFilter = (NotFilterPOJO)andFilters.get(1);
+        NotFilter notFilter = (NotFilter)andFilters.get(1);
         Assert.assertNotNull(notFilter);
         
         // (& (| (objectclass=top) (ou=contacts) ) (! (objectclass=ttt) ) )
-        equalityMatch = (AttributeValueAssertionFilterPOJO)notFilter.getNotFilter();  
+        equalityMatch = (AttributeValueAssertionFilter)notFilter.getNotFilter();  
         Assert.assertNotNull(equalityMatch);
         
         assertion = equalityMatch.getAssertion();
@@ -259,8 +259,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        SearchRequestPOJO sr      = ( SearchRequestPOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        SearchRequest sr      = ( SearchRequest ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( "uid=akarasulu,dc=example,dc=com", sr.getBaseObject().toString() );

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/SearchResultDoneTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/SearchResultDoneTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/SearchResultDoneTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/SearchResultDoneTest.java Mon Jun  6 23:37:02 2005
@@ -21,8 +21,8 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
-import org.apache.asn1.ldap.pojo.SearchResultDonePOJO;
+import org.apache.asn1.ldap.pojo.LdapMessage;
+import org.apache.asn1.ldap.pojo.SearchResultDone;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -86,8 +86,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        SearchResultDonePOJO searchResultDone      = ( SearchResultDonePOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        SearchResultDone searchResultDone      = ( SearchResultDone ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
         Assert.assertEquals( 0, searchResultDone.getLdapResult().getResultCode() );

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/UnBindRequestTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/UnBindRequestTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/UnBindRequestTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/ldap/codec/UnBindRequestTest.java Mon Jun  6 23:37:02 2005
@@ -21,8 +21,8 @@
 import org.apache.asn1.DecoderException;
 import org.apache.asn1.ber.Asn1Decoder;
 import org.apache.asn1.ber.containers.IAsn1Container;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
-import org.apache.asn1.ldap.pojo.UnBindRequestPOJO;
+import org.apache.asn1.ldap.pojo.LdapMessage;
+import org.apache.asn1.ldap.pojo.UnBindRequest;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -73,8 +73,8 @@
             Assert.fail( de.getMessage() );
         }
     	
-        LdapMessagePOJO message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
-        UnBindRequestPOJO br      = ( UnBindRequestPOJO ) ( message.getProtocolOp() );
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        UnBindRequest br      = ( UnBindRequest ) ( message.getProtocolOp() );
 
         Assert.assertEquals( 1, message.getMessageId() );
     }

Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/spnego/codec/SpnegoTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/spnego/codec/SpnegoTest.java?rev=188708&r1=188707&r2=188708&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/spnego/codec/SpnegoTest.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/spnego/codec/SpnegoTest.java Mon Jun  6 23:37:02 2005
@@ -24,9 +24,9 @@
 import org.apache.asn1.codec.EncoderException;
 import org.apache.asn1.primitives.OID;
 import org.apache.asn1.primitives.OctetString;
-import org.apache.asn1.spnego.pojo.SpnegoNegTokenInitPOJO;
-import org.apache.asn1.spnego.pojo.SpnegoNegTokenTargPOJO;
-import org.apache.asn1.spnego.pojo.SpnegoPOJO;
+import org.apache.asn1.spnego.pojo.SpnegoNegTokenInit;
+import org.apache.asn1.spnego.pojo.SpnegoNegTokenTarg;
+import org.apache.asn1.spnego.pojo.Spnego;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
@@ -49,7 +49,7 @@
      * Check the default value of Req Flags
      * @param spnego The spnego POJO to test
      */
-    private boolean checkDefaultReqFlags(SpnegoNegTokenInitPOJO spnegoNegTokenInit)
+    private boolean checkDefaultReqFlags(SpnegoNegTokenInit spnegoNegTokenInit)
     {
         return 	!spnegoNegTokenInit.isAnonFlag() &&
                 !spnegoNegTokenInit.isConfFlag() &&
@@ -92,10 +92,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -111,13 +111,13 @@
         Assert.assertEquals(0, nbOids);
         
         // Check the reqFlags
-        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spnego));
+        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInit)spnego));
 
         // Check the mech token
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechToken());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechToken());
 
         // Check the mech list MIC
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechListMIC());
     }
 
     /**
@@ -155,10 +155,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -175,13 +175,13 @@
         Assert.assertEquals("1.2.840.48018.1.2.2", oids[0].toString());
         
         // Check the reqFlags
-        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spnego));
+        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInit)spnego));
 
         // Check the mech token
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechToken());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechToken());
 
         // Check the mech list MIC
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechListMIC());
     }
 
     /**
@@ -228,10 +228,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -252,13 +252,13 @@
         }
         
         // Check the reqFlags
-        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spnego));
+        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInit)spnego));
 
         // Check the mech token
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechToken());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechToken());
 
         // Check the mech list MIC
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechListMIC());
     }
 
     /**
@@ -302,10 +302,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -326,13 +326,13 @@
         }
         
         // Check the reqFlags
-        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spnego));
+        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInit)spnego));
 
         // Check the mech token
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechToken());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechToken());
 
         // Check the mech list MIC
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechListMIC());
     }
 
     /**
@@ -375,10 +375,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -394,21 +394,21 @@
         Assert.assertEquals(0, nbOids);
         
         // Check the reqFlags
-        Assert.assertEquals(true, ((SpnegoNegTokenInitPOJO)spnego).isAnonFlag());
-        Assert.assertEquals(true, ((SpnegoNegTokenInitPOJO)spnego).isConfFlag());
-        Assert.assertEquals(true, ((SpnegoNegTokenInitPOJO)spnego).isDelegFlag());
-        Assert.assertEquals(true, ((SpnegoNegTokenInitPOJO)spnego).isIntegFlag());
-        Assert.assertEquals(true, ((SpnegoNegTokenInitPOJO)spnego).isMutualFlag());
-        Assert.assertEquals(true, ((SpnegoNegTokenInitPOJO)spnego).isReplayFlag());
-        Assert.assertEquals(true, ((SpnegoNegTokenInitPOJO)spnego).isSequenceFlag());
+        Assert.assertEquals(true, ((SpnegoNegTokenInit)spnego).isAnonFlag());
+        Assert.assertEquals(true, ((SpnegoNegTokenInit)spnego).isConfFlag());
+        Assert.assertEquals(true, ((SpnegoNegTokenInit)spnego).isDelegFlag());
+        Assert.assertEquals(true, ((SpnegoNegTokenInit)spnego).isIntegFlag());
+        Assert.assertEquals(true, ((SpnegoNegTokenInit)spnego).isMutualFlag());
+        Assert.assertEquals(true, ((SpnegoNegTokenInit)spnego).isReplayFlag());
+        Assert.assertEquals(true, ((SpnegoNegTokenInit)spnego).isSequenceFlag());
 
         // Check the mech token
-        OctetString mechToken = ((SpnegoNegTokenInitPOJO)spnego).getMechToken();
+        OctetString mechToken = ((SpnegoNegTokenInit)spnego).getMechToken();
         
         Assert.assertEquals(null, mechToken);
 
         // Check the mech list MIC
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechListMIC());
     }
 
     
@@ -445,10 +445,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -464,16 +464,16 @@
         Assert.assertEquals(0, nbOids);
         
         // Check the reqFlags
-        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spnego));
+        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInit)spnego));
 
         // Check the mech token
-        OctetString mechToken = ((SpnegoNegTokenInitPOJO)spnego).getMechToken();
+        OctetString mechToken = ((SpnegoNegTokenInit)spnego).getMechToken();
         
         Assert.assertEquals(OctetString.EMPTY_STRING, mechToken);
         Assert.assertEquals( "" , mechToken.toString() );
 
         // Check the mech list MIC
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechListMIC());
     }
 
     /**
@@ -509,10 +509,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -528,13 +528,13 @@
         Assert.assertEquals(0, nbOids);
         
         // Check the reqFlags
-        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spnego));
+        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInit)spnego));
 
         // Check the mech token
-        Assert.assertEquals("[61][62][63][64]", ((SpnegoNegTokenInitPOJO)spnego).getMechToken().toString());
+        Assert.assertEquals("[61][62][63][64]", ((SpnegoNegTokenInit)spnego).getMechToken().toString());
 
         // Check the mech list MIC
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechListMIC());
     }
 
     /**
@@ -576,10 +576,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -595,10 +595,10 @@
         Assert.assertEquals(0, nbOids);
         
         // Check the reqFlags
-        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spnego));
+        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInit)spnego));
 
         // Check the mech token
-        OctetString mechToken = ((SpnegoNegTokenInitPOJO)spnego).getMechToken();
+        OctetString mechToken = ((SpnegoNegTokenInit)spnego).getMechToken();
         
         Assert.assertEquals(2048, mechToken.getValue().length);
         
@@ -608,7 +608,7 @@
         }
 
         // Check the mech list MIC
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechListMIC());
     }
 
     /**
@@ -644,10 +644,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -663,13 +663,13 @@
         Assert.assertEquals(0, nbOids);
         
         // Check the reqFlags
-        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spnego));
+        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInit)spnego));
 
         // Check the mech token
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechToken());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechToken());
         
         // Check the mech list MIC
-        OctetString mechListMIC = ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC();
+        OctetString mechListMIC = ((SpnegoNegTokenInit)spnego).getMechListMIC();
 
         Assert.assertEquals(OctetString.EMPTY_STRING, mechListMIC);
         Assert.assertEquals( "" , mechListMIC.toString() );
@@ -708,10 +708,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -727,13 +727,13 @@
         Assert.assertEquals(0, nbOids);
         
         // Check the reqFlags
-        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spnego));
+        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInit)spnego));
 
         // Check the mech token
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechToken());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechToken());
 
         // Check the mech list MIC
-        Assert.assertEquals("[61][62][63][64]", ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC().toString());
+        Assert.assertEquals("[61][62][63][64]", ((SpnegoNegTokenInit)spnego).getMechListMIC().toString());
     }
 
     /**
@@ -775,10 +775,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -796,13 +796,13 @@
         Assert.assertEquals("1.2.840.113554.1.2.2", oids[1].toString());
         
         // Check the reqFlags
-        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spnego));
+        Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInit)spnego));
 
         // Check the mech token
-        Assert.assertEquals("[61][62][63][64]", ((SpnegoNegTokenInitPOJO)spnego).getMechToken().toString());
+        Assert.assertEquals("[61][62][63][64]", ((SpnegoNegTokenInit)spnego).getMechToken().toString());
 
         // Check the mech list MIC
-        Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC());
+        Assert.assertEquals(null, ((SpnegoNegTokenInit)spnego).getMechListMIC());
     }
 
     /**
@@ -860,10 +860,10 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoPOJO spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        Spnego spnego = ( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the Oids
-        OID oids[] = ((SpnegoNegTokenInitPOJO)spnego).getMechTypeList();
+        OID oids[] = ((SpnegoNegTokenInit)spnego).getMechTypeList();
         int nbOids = 0;
         
         for ( int i = 0 ; i < oids.length ; i++ )
@@ -881,16 +881,16 @@
         Assert.assertEquals("1.2.840.113554.1.2.2", oids[1].toString());
         
         // Check the reqFlags
-        Assert.assertEquals(false, ((SpnegoNegTokenInitPOJO)spnego).isAnonFlag());
-        Assert.assertEquals(true,  ((SpnegoNegTokenInitPOJO)spnego).isConfFlag());
-        Assert.assertEquals(true,  ((SpnegoNegTokenInitPOJO)spnego).isDelegFlag());
-        Assert.assertEquals(false, ((SpnegoNegTokenInitPOJO)spnego).isIntegFlag());
-        Assert.assertEquals(true,  ((SpnegoNegTokenInitPOJO)spnego).isMutualFlag());
-        Assert.assertEquals(false, ((SpnegoNegTokenInitPOJO)spnego).isReplayFlag());
-        Assert.assertEquals(true,  ((SpnegoNegTokenInitPOJO)spnego).isSequenceFlag());
+        Assert.assertEquals(false, ((SpnegoNegTokenInit)spnego).isAnonFlag());
+        Assert.assertEquals(true,  ((SpnegoNegTokenInit)spnego).isConfFlag());
+        Assert.assertEquals(true,  ((SpnegoNegTokenInit)spnego).isDelegFlag());
+        Assert.assertEquals(false, ((SpnegoNegTokenInit)spnego).isIntegFlag());
+        Assert.assertEquals(true,  ((SpnegoNegTokenInit)spnego).isMutualFlag());
+        Assert.assertEquals(false, ((SpnegoNegTokenInit)spnego).isReplayFlag());
+        Assert.assertEquals(true,  ((SpnegoNegTokenInit)spnego).isSequenceFlag());
 
         // Check the mech token
-        OctetString mechToken = ((SpnegoNegTokenInitPOJO)spnego).getMechToken();
+        OctetString mechToken = ((SpnegoNegTokenInit)spnego).getMechToken();
         byte[] mechTochenBytes = mechToken.getValue();
         
         for ( int i = 0; i < 0x5B2; i++ )
@@ -899,11 +899,11 @@
         }
 
         // Check the mechListMIC
-        Assert.assertEquals("[61][62][63][64][65][66][67][68][69][6A][6B][6C]", ((SpnegoNegTokenInitPOJO)spnego).getMechListMIC().toString());
+        Assert.assertEquals("[61][62][63][64][65][66][67][68][69][6A][6B][6C]", ((SpnegoNegTokenInit)spnego).getMechListMIC().toString());
 
         try
         {
-            ByteBuffer res = (ByteBuffer)((SpnegoNegTokenInitPOJO)spnego).encode(this);
+            ByteBuffer res = (ByteBuffer)((SpnegoNegTokenInit)spnego).encode(this);
             stream.flip();
             res.flip();
             
@@ -977,7 +977,7 @@
             Assert.fail( de.getMessage() );
         }
     	
-        SpnegoNegTokenTargPOJO spnego = (SpnegoNegTokenTargPOJO)( ( SpnegoContainer ) spnegoContainer ).getSpnego();
+        SpnegoNegTokenTarg spnego = (SpnegoNegTokenTarg)( ( SpnegoContainer ) spnegoContainer ).getSpnego();
 
         // Checks the result
         Assert.assertEquals(1, spnego.getNegResult());



Mime
View raw message