directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r188706 - in /directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec: ./ grammars/
Date Tue, 07 Jun 2005 06:35:55 GMT
Author: elecharny
Date: Mon Jun  6 23:35:53 2005
New Revision: 188706

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

Modified:
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/LdapMessageContainer.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/AbandonRequestGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/AddResponseGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/BindRequestGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/BindResponseGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/CompareResponseGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/DelResponseGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/FilterGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapMessageGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapResultGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/ModifyDNResponseGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/ModifyResponseGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/SearchRequestGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/SearchResultDoneGrammar.java
    directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/UnBindRequestGrammar.java

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/LdapMessageContainer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/LdapMessageContainer.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/LdapMessageContainer.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/LdapMessageContainer.java Mon Jun  6 23:35:53 2005
@@ -35,13 +35,13 @@
 import org.apache.asn1.ldap.codec.grammars.SearchRequestGrammar;
 import org.apache.asn1.ldap.codec.grammars.SearchResultDoneGrammar;
 import org.apache.asn1.ldap.codec.grammars.UnBindRequestGrammar;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
+import org.apache.asn1.ldap.pojo.LdapMessage;
 
 
 /**
  * The LdapMessage container stores all the messages decoded by the
  * Asn1Decoder. When dealing whith an incoding PDU, we will obtain
- * a LdapMessagePOJO in the ILdapContainer.
+ * a LdapMessage in the ILdapContainer.
  *  
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -50,7 +50,7 @@
     //~ Instance fields ----------------------------------------------------------------------------
 
     /** The ldap message */
-    private LdapMessagePOJO ldapMessage;
+    private LdapMessage ldapMessage;
     
     //~ Constructors -------------------------------------------------------------------------------
 
@@ -90,7 +90,7 @@
     /**
      * @return Returns the ldapMessage.
      */
-    public LdapMessagePOJO getLdapMessage()
+    public LdapMessage getLdapMessage()
     {
 
         return ldapMessage;
@@ -102,7 +102,7 @@
      *
      * @param ldapMessage The ldapMessage to set.
      */
-    public void setLdapMessage( LdapMessagePOJO ldapMessage )
+    public void setLdapMessage( LdapMessage ldapMessage )
     {
         this.ldapMessage = ldapMessage;
     }

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/AbandonRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/AbandonRequestGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/AbandonRequestGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/AbandonRequestGrammar.java Mon Jun  6 23:35:53 2005
@@ -26,8 +26,8 @@
 import org.apache.asn1.ber.tlv.Value;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
 import org.apache.asn1.ldap.codec.utils.IntegerDecoder;
-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;
 
@@ -111,7 +111,7 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         // The current TLV should be a integer
@@ -133,7 +133,7 @@
                             // Ok, the Message ID is correct. We have to allocate an
                             // abandonRequest POJO to store the value, and store the
                             // POJO in the LDAPMessage
-                            AbandonRequestPOJO abandonRequest = new AbandonRequestPOJO();
+                            AbandonRequest abandonRequest = new AbandonRequest();
                             abandonRequest.setMessageId( messageId );
                             ldapMessage.setProtocolOP( abandonRequest );
 

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/AddResponseGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/AddResponseGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/AddResponseGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/AddResponseGrammar.java Mon Jun  6 23:35:53 2005
@@ -24,8 +24,8 @@
 import org.apache.asn1.ber.grammar.IGrammar;
 import org.apache.asn1.ber.tlv.TLV;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
-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;
 
@@ -71,7 +71,7 @@
         super.transitions[LdapStatesEnum.ADD_RESPONSE_TAG][0x69] = new GrammarTransition(
                 LdapStatesEnum.ADD_RESPONSE_TAG, LdapStatesEnum.ADD_RESPONSE_LENGTH, null );
 
-        // We have to allocate a AddResponsePOJO
+        // We have to allocate a AddResponse
         // LdapMessage ::= ... AddResponse ...
         // AddResponse ::= [APPLICATION 9] LDAPResult (Length)
         super.transitions[LdapStatesEnum.ADD_RESPONSE_LENGTH][0x69] = new GrammarTransition(
@@ -83,14 +83,14 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         checkLength( ldapMessageContainer.getLdapMessage(),
                             ldapMessageContainer.getCurrentTLV() );
 
                         // Now, we can allocate the AdddRequest POJO
-                        AddResponsePOJO addResponse = new AddResponsePOJO();
+                        AddResponse addResponse = new AddResponse();
 
                         // As this is a new Constructed object, we have to init its length
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/BindRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/BindRequestGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/BindRequestGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/BindRequestGrammar.java Mon Jun  6 23:35:53 2005
@@ -28,10 +28,10 @@
 import org.apache.asn1.ldap.codec.primitives.LdapDN;
 import org.apache.asn1.ldap.codec.primitives.LdapString;
 import org.apache.asn1.ldap.codec.utils.IntegerDecoder;
-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.asn1.util.MutableString;
 
 import org.apache.log4j.Logger;
@@ -88,7 +88,7 @@
         //============================================================================================
         // protocolOp : Bind Request
         //============================================================================================
-        // We have to allocate a BindRequestPOJO
+        // We have to allocate a BindRequest
         // LdapMessage ::= ... BindRequest ...
         // BindRequest ::= [APPLICATION 0] SEQUENCE { ... (Length)
         super.transitions[LdapStatesEnum.BIND_REQUEST_TAG][0x60]    = new GrammarTransition(
@@ -103,13 +103,13 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         checkLength( ldapMessage, ldapMessageContainer.getCurrentTLV() );
 
                         // Now, we can allocate the BindRequest POJO
-                        BindRequestPOJO bindRequest = new BindRequestPOJO();
+                        BindRequest bindRequest = new BindRequest();
 
                         // As this is a new Constructed object, we have to init its length
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();
@@ -164,7 +164,7 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        BindRequestPOJO      bindRequestMessage   = 
+                        BindRequest      bindRequestMessage   = 
                             ldapMessageContainer.getLdapMessage().getBindRequest();
 
                         // The current TLV should be a integer between 1 and 127
@@ -197,7 +197,7 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        BindRequestPOJO bindRequestMessage = 
+                        BindRequest bindRequestMessage = 
                         ldapMessageContainer.getLdapMessage().getBindRequest();
                         
                         TLV                  tlv                  =
@@ -228,7 +228,7 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        BindRequestPOJO bindRequestMessage = 
+                        BindRequest bindRequestMessage = 
                         ldapMessageContainer.getLdapMessage().getBindRequest();
 
                         // Get the Value and store it in the BindRequest
@@ -264,7 +264,7 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        BindRequestPOJO bindRequestMessage = 
+                        BindRequest bindRequestMessage = 
                         ldapMessageContainer.getLdapMessage().getBindRequest();
                         
                         TLV             tlv                = ldapMessageContainer.getCurrentTLV();
@@ -272,9 +272,9 @@
                         checkLength( bindRequestMessage, tlv );
 
                         // Allocate the Authentication POJO
-                        SimpleAuthenticationPOJO authentication = null;
+                        SimpleAuthentication authentication = null;
                         
-                        authentication = new SimpleAuthenticationPOJO();
+                        authentication = new SimpleAuthentication();
 
                         authentication.setFather( bindRequestMessage );
 
@@ -305,10 +305,10 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
                         
-                        BindRequestPOJO bindRequestMessage = 
+                        BindRequest bindRequestMessage = 
                         ldapMessageContainer.getLdapMessage().getBindRequest();
                         
-                        SimpleAuthenticationPOJO simpleAuthentication = bindRequestMessage.getSimpleAuthentication();
+                        SimpleAuthentication simpleAuthentication = bindRequestMessage.getSimpleAuthentication();
 
                         TLV           tlv    = ldapMessageContainer.getCurrentTLV();
 
@@ -352,7 +352,7 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        BindRequestPOJO bindRequestMessage = 
+                        BindRequest bindRequestMessage = 
                         ldapMessageContainer.getLdapMessage().getBindRequest();
 
                         TLV           tlv    = ldapMessageContainer.getCurrentTLV();
@@ -360,9 +360,9 @@
                         checkLength( bindRequestMessage, tlv );
 
                         // Create the SaslAuthentication POJO
-                        SaslAuthenticationPOJO authentication = null;
+                        SaslAuthentication authentication = null;
 
-                        authentication = new SaslAuthenticationPOJO();
+                        authentication = new SaslAuthentication();
 
                         authentication.setFather( bindRequestMessage );
 
@@ -396,10 +396,10 @@
                         LdapMessageContainer   ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        BindRequestPOJO        bindRequestMessage = 
+                        BindRequest        bindRequestMessage = 
                             ldapMessageContainer.getLdapMessage().getBindRequest();
                         
-                        SaslAuthenticationPOJO saslAuthentication = bindRequestMessage.getSaslAuthentication();
+                        SaslAuthentication saslAuthentication = bindRequestMessage.getSaslAuthentication();
 
                         MutableString mechanism = LdapString.parse(
                                 ldapMessageContainer.getCurrentTLV().getValue().getData() );
@@ -446,7 +446,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
                         
-                        BindRequestPOJO        bindRequestMessage = 
+                        BindRequest        bindRequestMessage = 
                         ldapMessageContainer.getLdapMessage().getBindRequest();
 
                         TLV           tlv    = ldapMessageContainer.getCurrentTLV();
@@ -456,7 +456,7 @@
                         // We have to handle the special case of a 0 length credentials
                         if (tlv.getLength().getLength() == 0)
                         {
-                            SaslAuthenticationPOJO saslAuthentication = bindRequestMessage
+                            SaslAuthentication saslAuthentication = bindRequestMessage
                                 .getSaslAuthentication();
 
                             saslAuthentication.setCredentials( new byte[]{} );
@@ -470,7 +470,7 @@
         //        ...
         //        credentials     OCTET STRING OPTIONAL } (Value)
         //
-        // We have to get the Credentials and store it in the SaslAuthenticationPOJO.
+        // We have to get the Credentials and store it in the SaslAuthentication.
         // Two different following states are possible :
         // - a Controls tag (0x80)
         // - or nothing at all (end of the BindRequest).
@@ -487,10 +487,10 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        BindRequestPOJO        bindRequestMessage = 
+                        BindRequest        bindRequestMessage = 
                         ldapMessageContainer.getLdapMessage().getBindRequest();
                         
-                        SaslAuthenticationPOJO saslAuthentication = bindRequestMessage
+                        SaslAuthentication saslAuthentication = bindRequestMessage
                                 .getSaslAuthentication();
 
                         // Get the Value and store it in the BindRequest

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/BindResponseGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/BindResponseGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/BindResponseGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/BindResponseGrammar.java Mon Jun  6 23:35:53 2005
@@ -24,8 +24,8 @@
 import org.apache.asn1.ber.grammar.IGrammar;
 import org.apache.asn1.ber.tlv.TLV;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
-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;
 
@@ -76,7 +76,7 @@
 
         // LdapMessage ::= ... BindResponse ...
         // BindResponse ::= [APPLICATION 1] SEQUENCE { ... (Length)
-        // We have to allocate a BindResponsePOJO
+        // We have to allocate a BindResponse
         super.transitions[LdapStatesEnum.BIND_RESPONSE_LENGTH][0x61] = new GrammarTransition(
                 LdapStatesEnum.BIND_RESPONSE_LENGTH, LdapStatesEnum.BIND_RESPONSE_VALUE,
                 new GrammarAction( "Init BindReponse" )
@@ -86,14 +86,14 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         checkLength( ldapMessageContainer.getLdapMessage(),
                             ldapMessageContainer.getCurrentTLV() );
 
                         // Now, we can allocate the BindRequest POJO
-                        BindResponsePOJO bindResponse = new BindResponsePOJO();
+                        BindResponse bindResponse = new BindResponse();
 
                         // As this is a new Constructed object, we have to init its length
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();
@@ -157,7 +157,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        BindResponsePOJO     bindResponseMessage =
+                        BindResponse     bindResponseMessage =
                             ldapMessageContainer.getLdapMessage().getBindResponse();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -195,7 +195,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        BindResponsePOJO     bindResponseMessage =
+                        BindResponse     bindResponseMessage =
                             ldapMessageContainer.getLdapMessage().getBindResponse();
 
                         // Get the Value and store it in the BindRequest

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/CompareResponseGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/CompareResponseGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/CompareResponseGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/CompareResponseGrammar.java Mon Jun  6 23:35:53 2005
@@ -24,8 +24,8 @@
 import org.apache.asn1.ber.grammar.IGrammar;
 import org.apache.asn1.ber.tlv.TLV;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
-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;
 
@@ -71,7 +71,7 @@
         super.transitions[LdapStatesEnum.COMPARE_RESPONSE_TAG][0x6F] = new GrammarTransition(
                 LdapStatesEnum.COMPARE_RESPONSE_TAG, LdapStatesEnum.COMPARE_RESPONSE_LENGTH, null );
 
-        // We have to allocate a CompareResponsePOJO
+        // We have to allocate a CompareResponse
         // LdapMessage ::= ... CompareResponse ...
         // CompareResponse ::= [APPLICATION 15] LDAPResult (Length)
         super.transitions[LdapStatesEnum.COMPARE_RESPONSE_LENGTH][0x6F] = new GrammarTransition(
@@ -83,14 +83,14 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         checkLength( ldapMessageContainer.getLdapMessage(),
                             ldapMessageContainer.getCurrentTLV() );
 
                         // Now, we can allocate the AdddRequest POJO
-                        CompareResponsePOJO compareResponse = new CompareResponsePOJO();
+                        CompareResponse compareResponse = new CompareResponse();
 
                         // As this is a new Constructed object, we have to init its length
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/DelResponseGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/DelResponseGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/DelResponseGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/DelResponseGrammar.java Mon Jun  6 23:35:53 2005
@@ -24,8 +24,8 @@
 import org.apache.asn1.ber.grammar.IGrammar;
 import org.apache.asn1.ber.tlv.TLV;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
-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;
 
@@ -71,7 +71,7 @@
         super.transitions[LdapStatesEnum.DEL_RESPONSE_TAG][0x6B] = new GrammarTransition(
                 LdapStatesEnum.DEL_RESPONSE_TAG, LdapStatesEnum.DEL_RESPONSE_LENGTH, null );
 
-        // We have to allocate a DelResponsePOJO
+        // We have to allocate a DelResponse
         // LdapMessage ::= ... DelResponse ...
         // DelResponse ::= [APPLICATION 11] LDAPResult (Length)
         super.transitions[LdapStatesEnum.DEL_RESPONSE_LENGTH][0x6B] = new GrammarTransition(
@@ -83,14 +83,14 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         checkLength( ldapMessageContainer.getLdapMessage(),
                             ldapMessageContainer.getCurrentTLV() );
 
                         // Now, we can allocate the DelResponse POJO
-                        DelResponsePOJO delResponse = new DelResponsePOJO();
+                        DelResponse delResponse = new DelResponse();
 
                         // As this is a new Constructed object, we have to init its length
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/FilterGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/FilterGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/FilterGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/FilterGrammar.java Mon Jun  6 23:35:53 2005
@@ -26,14 +26,14 @@
 import org.apache.asn1.ber.tlv.TLV;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
 import org.apache.asn1.ldap.codec.primitives.LdapString;
-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.FilterPOJO;
-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.Filter;
+import org.apache.asn1.ldap.pojo.filters.NotFilter;
+import org.apache.asn1.ldap.pojo.filters.OrFilter;
 import org.apache.asn1.primitives.OctetString;
 import org.apache.asn1.util.MutableString;
 
@@ -228,17 +228,17 @@
                     {
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        SearchRequestPOJO searchRequest = ldapMessage.getSearchRequest();
+                        SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();
 
-                        // We can allocate the SearchRequestPOJO
-                        FilterPOJO andFilter = new AndFilterPOJO();
+                        // We can allocate the SearchRequest
+                        Filter andFilter = new AndFilter();
                         
                         // Get the parent, if any
-                        FilterPOJO currentFilter = searchRequest.getCurrentFilter();
+                        Filter currentFilter = searchRequest.getCurrentFilter();
                         
                         if (currentFilter != null)
                         {
@@ -254,7 +254,7 @@
                             // No parent. This Filter will become the root.
                             // First, check the length to see if it does not exceed its father
                             // expected length. (If there is no parent, we have to check the
-                            // length against the SearchRequestPOJO )
+                            // length against the SearchRequest )
                             checkLength( searchRequest, tlv );
 
                             searchRequest.setCurrentFilter(andFilter);
@@ -290,17 +290,17 @@
                     {
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        SearchRequestPOJO searchRequest = ldapMessage.getSearchRequest();
+                        SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();
 
-                        // We can allocate the SearchRequestPOJO
-                        FilterPOJO orFilter = new OrFilterPOJO();
+                        // We can allocate the SearchRequest
+                        Filter orFilter = new OrFilter();
                         
                         // Get the parent, if any
-                        FilterPOJO currentFilter = searchRequest.getCurrentFilter();
+                        Filter currentFilter = searchRequest.getCurrentFilter();
                         
                         if (currentFilter != null)
                         {
@@ -316,7 +316,7 @@
                             // No parent. This Filter will become the root.
                             // First, check the length to see if it does not exceed its father
                             // expected length. (If there is no parent, we have to check the
-                            // length against the SearchRequestPOJO )
+                            // length against the SearchRequest )
                             checkLength( searchRequest, tlv );
                             searchRequest.setFilter(orFilter);
                             orFilter.setFather( searchRequest );
@@ -352,17 +352,17 @@
                     {
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        SearchRequestPOJO searchRequest = ldapMessage.getSearchRequest();
+                        SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();
 
-                        // We can allocate the SearchRequestPOJO
-                        FilterPOJO notFilter = new NotFilterPOJO();
+                        // We can allocate the SearchRequest
+                        Filter notFilter = new NotFilter();
                         
                         // Get the parent, if any
-                        FilterPOJO currentFilter = searchRequest.getCurrentFilter();
+                        Filter currentFilter = searchRequest.getCurrentFilter();
                         
                         if (currentFilter != null)
                         {
@@ -378,7 +378,7 @@
                             // No parent. This Filter will become the root.
                             // First, check the length to see if it does not exceed its father
                             // expected length. (If there is no parent, we have to check the
-                            // length against the SearchRequestPOJO )
+                            // length against the SearchRequest )
                             checkLength( searchRequest, tlv );
 
                             searchRequest.setCurrentFilter(notFilter);
@@ -416,17 +416,17 @@
                     {
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        SearchRequestPOJO searchRequest = ldapMessage.getSearchRequest();
+                        SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();
 
-                        // We can allocate the SearchRequestPOJO
-                        FilterPOJO equalityMatchFilter = new AttributeValueAssertionFilterPOJO();
+                        // We can allocate the SearchRequest
+                        Filter equalityMatchFilter = new AttributeValueAssertionFilter();
                         
                         // Get the parent, if any
-                        FilterPOJO currentFilter = searchRequest.getCurrentFilter();
+                        Filter currentFilter = searchRequest.getCurrentFilter();
                         
                         if (currentFilter != null)
                         {
@@ -442,7 +442,7 @@
                             // No parent. This Filter will become the root.
                             // First, check the length to see if it does not exceed its father
                             // expected length. (If there is no parent, we have to check the
-                            // length against the SearchRequestPOJO )
+                            // length against the SearchRequest )
                             checkLength( searchRequest, tlv );
 
                             searchRequest.setCurrentFilter(equalityMatchFilter);
@@ -464,7 +464,7 @@
         //     equalityMatch   [3] AttributeValueAssertion, (Value)
         //     ...
         // We will create the filter container (as this is an equalityMatch filter,
-        // we will create an AttributeValueAssertionFilterPOJO).
+        // we will create an AttributeValueAssertionFilter).
         super.transitions[LdapStatesEnum.FILTER_EQUALITY_MATCH_VALUE][0xA3] = new GrammarTransition(
                 LdapStatesEnum.FILTER_EQUALITY_MATCH_VALUE, LdapStatesEnum.FILTER_ATTRIBUTE_DESC_TAG, null); 
                 
@@ -488,11 +488,11 @@
                         // We will check the length against the current filter
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        SearchRequestPOJO searchRequest = ldapMessage.getSearchRequest();
+                        SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
-                        FilterPOJO     currentFilter =
+                        Filter     currentFilter =
                             searchRequest.getCurrentFilter();
                         
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -516,17 +516,17 @@
                     {
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        SearchRequestPOJO searchRequest = ldapMessage.getSearchRequest();
+                        SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();
                         MutableString attributeDesc = LdapString.parse(tlv.getValue().getData());
                         
-                        AttributeValueAssertionPOJO assertion = new AttributeValueAssertionPOJO();
+                        AttributeValueAssertion assertion = new AttributeValueAssertion();
                         assertion.setAttributeDesc(attributeDesc);
                         
-                        AttributeValueAssertionFilterPOJO currentFilter = (AttributeValueAssertionFilterPOJO)searchRequest.getCurrentFilter();
+                        AttributeValueAssertionFilter currentFilter = (AttributeValueAssertionFilter)searchRequest.getCurrentFilter();
                         currentFilter.setAssertion(assertion);
                     }
                 });
@@ -551,11 +551,11 @@
                         // We will check the length against the current filter
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        SearchRequestPOJO searchRequest = ldapMessage.getSearchRequest();
+                        SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
-                        FilterPOJO     currentFilter =
+                        Filter     currentFilter =
                             searchRequest.getCurrentFilter();
                         
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -580,16 +580,16 @@
                     {
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        SearchRequestPOJO searchRequest = ldapMessage.getSearchRequest();
+                        SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();
                         OctetString assertionValue = new OctetString();
                         assertionValue.setData(tlv.getValue().getData());
                         
-                        AttributeValueAssertionFilterPOJO currentFilter = (AttributeValueAssertionFilterPOJO)searchRequest.getCurrentFilter();
-                        AttributeValueAssertionPOJO assertion = currentFilter.getAssertion();
+                        AttributeValueAssertionFilter currentFilter = (AttributeValueAssertionFilter)searchRequest.getCurrentFilter();
+                        AttributeValueAssertion assertion = currentFilter.getAssertion();
                         assertion.setAssertionValue(assertionValue);
                         
                         // We now have to get back to the nearest filter which is not terminal.
@@ -619,13 +619,13 @@
      * 
      * @param searchRequest The request being decoded
      */
-    private void unstackCurrent(SearchRequestPOJO searchRequest)
+    private void unstackCurrent(SearchRequest searchRequest)
     {
-        FilterPOJO currentFilter = searchRequest.getCurrentFilter();
+        Filter currentFilter = searchRequest.getCurrentFilter();
         
         while (currentFilter != null)
         {
-            if ( ( currentFilter instanceof AndFilterPOJO ) | ( currentFilter instanceof OrFilterPOJO ) | ( currentFilter instanceof NotFilterPOJO ) )
+            if ( ( currentFilter instanceof AndFilter ) | ( currentFilter instanceof OrFilter ) | ( currentFilter instanceof NotFilter ) )
             {
                 if ( currentFilter.getExpectedLength() == currentFilter.getCurrentLength())
                 {
@@ -633,14 +633,14 @@
                     // so we will pop it from the stack
                     AbstractPOJO element = currentFilter.getFather();
                     
-                    // We have to check that the father is a FilterPOJO.
-                    if (element instanceof FilterPOJO)
+                    // We have to check that the father is a Filter.
+                    if (element instanceof Filter)
                     {
-                        currentFilter = (FilterPOJO)element;
+                        currentFilter = (Filter)element;
                     }
                     else
                     {
-                        // The element is a SearchRequestPOJO, so the stack is
+                        // The element is a SearchRequest, so the stack is
                         // empty. It's over !
                         currentFilter = null;
                         return;
@@ -656,7 +656,7 @@
             else
             {
                 // The current element is a terminal element
-                currentFilter = (FilterPOJO)currentFilter.getFather();
+                currentFilter = (Filter)currentFilter.getFather();
             }
         }
         

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapMessageGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapMessageGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapMessageGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapMessageGrammar.java Mon Jun  6 23:35:53 2005
@@ -26,7 +26,7 @@
 import org.apache.asn1.ber.tlv.Value;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
 import org.apache.asn1.ldap.codec.utils.IntegerDecoder;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
+import org.apache.asn1.ldap.pojo.LdapMessage;
 
 import org.apache.log4j.Logger;
 
@@ -82,7 +82,7 @@
                             container;
 
                         // First, create a empty LdapMessage POJO
-                        LdapMessagePOJO ldapMessage = new LdapMessagePOJO();
+                        LdapMessage ldapMessage = new LdapMessage();
 
                         // Then stores it into the container
                         ldapMessageContainer.setLdapMessage( ldapMessage );
@@ -103,7 +103,7 @@
                         // We have to store the expected Length of the PDU
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         ldapMessage.setExpectedLength( ldapMessageContainer.getCurrentTLV()
@@ -157,7 +157,7 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         // The current TLV should be a integer

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapResultGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapResultGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapResultGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/LdapResultGrammar.java Mon Jun  6 23:35:53 2005
@@ -29,9 +29,9 @@
 import org.apache.asn1.ldap.codec.primitives.LdapString;
 import org.apache.asn1.ldap.codec.utils.IntegerDecoder;
 import org.apache.asn1.ldap.codec.utils.LdapResultEnum;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
-import org.apache.asn1.ldap.pojo.LdapResultPOJO;
-import org.apache.asn1.ldap.pojo.ResponsePOJO;
+import org.apache.asn1.ldap.pojo.LdapMessage;
+import org.apache.asn1.ldap.pojo.LdapResult;
+import org.apache.asn1.ldap.pojo.Response;
 import org.apache.asn1.util.MutableString;
 
 import org.apache.log4j.Logger;
@@ -93,15 +93,15 @@
                         // We have to store the expected Length of the PDU
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        ResponsePOJO         response             = ( ResponsePOJO )
+                        Response         response             = ( Response )
                             ldapMessage.getProtocolOp();
 
-                        // We have to allocate a LdapResultPOJO now
-                        LdapResultPOJO ldapResult = null;
+                        // We have to allocate a LdapResult now
+                        LdapResult ldapResult = null;
 
-                        ldapResult = new LdapResultPOJO();
+                        ldapResult = new LdapResult();
                         response.setLdapResult( ldapResult );
 
                         TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -176,13 +176,13 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        ResponsePOJO         response             = ( ResponsePOJO )
+                        Response         response             = ( Response )
                             ldapMessage.getProtocolOp();
-                        LdapResultPOJO       ldapResult           = response.getLdapResult();
+                        LdapResult       ldapResult           = response.getLdapResult();
 
-                        // We don't have to allocate a LdapResultPOJO first.
+                        // We don't have to allocate a LdapResult first.
 
                         // The current TLV should be a integer
                         // We get it and store it in MessageId
@@ -268,11 +268,11 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        ResponsePOJO         response             = ( ResponsePOJO )
+                        Response         response             = ( Response )
                             ldapMessage.getProtocolOp();
-                        LdapResultPOJO       ldapResult           = response.getLdapResult();
+                        LdapResult       ldapResult           = response.getLdapResult();
 
                         TLV                  tlv                  =
                             ldapMessageContainer.getCurrentTLV();
@@ -302,11 +302,11 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        ResponsePOJO         response             = ( ResponsePOJO )
+                        Response         response             = ( Response )
                             ldapMessage.getProtocolOp();
-                        LdapResultPOJO       ldapResult           = response.getLdapResult();
+                        LdapResult       ldapResult           = response.getLdapResult();
 
                         // Get the Value and store it in the BindResponse
                         TLV           tlv       = ldapMessageContainer.getCurrentTLV();
@@ -342,11 +342,11 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        ResponsePOJO         response             = ( ResponsePOJO )
+                        Response         response             = ( Response )
                             ldapMessage.getProtocolOp();
-                        LdapResultPOJO       ldapResult           = response.getLdapResult();
+                        LdapResult       ldapResult           = response.getLdapResult();
 
                         TLV                  tlv                  =
                             ldapMessageContainer.getCurrentTLV();
@@ -375,11 +375,11 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        ResponsePOJO         response             = ( ResponsePOJO )
+                        Response         response             = ( Response )
                             ldapMessage.getProtocolOp();
-                        LdapResultPOJO       ldapResult           = response.getLdapResult();
+                        LdapResult       ldapResult           = response.getLdapResult();
 
                         // Get the Value and store it in the BindResponse
                         TLV           tlv          = ldapMessageContainer.getCurrentTLV();
@@ -430,11 +430,11 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        ResponsePOJO         response             = ( ResponsePOJO )
+                        Response         response             = ( Response )
                             ldapMessage.getProtocolOp();
-                        LdapResultPOJO       ldapResult           = response.getLdapResult();
+                        LdapResult       ldapResult           = response.getLdapResult();
 
                         TLV                  tlv                  =
                             ldapMessageContainer.getCurrentTLV();
@@ -472,11 +472,11 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        ResponsePOJO         response             = ( ResponsePOJO )
+                        Response         response             = ( Response )
                             ldapMessage.getProtocolOp();
-                        LdapResultPOJO       ldapResult           = response.getLdapResult();
+                        LdapResult       ldapResult           = response.getLdapResult();
 
                         TLV                  tlv                  =
                             ldapMessageContainer.getCurrentTLV();
@@ -507,11 +507,11 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
-                        ResponsePOJO         response             = ( ResponsePOJO )
+                        Response         response             = ( Response )
                             ldapMessage.getProtocolOp();
-                        LdapResultPOJO       ldapResult           = response.getLdapResult();
+                        LdapResult       ldapResult           = response.getLdapResult();
 
                         TLV                  tlv                  =
                             ldapMessageContainer.getCurrentTLV();

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/ModifyDNResponseGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/ModifyDNResponseGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/ModifyDNResponseGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/ModifyDNResponseGrammar.java Mon Jun  6 23:35:53 2005
@@ -24,8 +24,8 @@
 import org.apache.asn1.ber.grammar.IGrammar;
 import org.apache.asn1.ber.tlv.TLV;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
-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;
 
@@ -71,7 +71,7 @@
         super.transitions[LdapStatesEnum.MODIFY_RESPONSE_TAG][0x6D] = new GrammarTransition(
                 LdapStatesEnum.MODIFY_RESPONSE_TAG, LdapStatesEnum.MODIFY_RESPONSE_LENGTH, null );
 
-        // We have to allocate a ModifyDNResponsePOJO
+        // We have to allocate a ModifyDNResponse
         // LdapMessage ::= ... ModifyResponse ...
         // ModifyDNResponse ::= [APPLICATION 13] LDAPResult (Length)
         super.transitions[LdapStatesEnum.MODIFY_DN_RESPONSE_LENGTH][0x6D] = new GrammarTransition(
@@ -83,14 +83,14 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         checkLength( ldapMessageContainer.getLdapMessage(),
                             ldapMessageContainer.getCurrentTLV() );
 
                         // Now, we can allocate the ModifyDNResponse POJO
-                        ModifyDNResponsePOJO modifyDNResponse = new ModifyDNResponsePOJO();
+                        ModifyDNResponse modifyDNResponse = new ModifyDNResponse();
 
                         // As this is a new Constructed object, we have to init its length
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/ModifyResponseGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/ModifyResponseGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/ModifyResponseGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/ModifyResponseGrammar.java Mon Jun  6 23:35:53 2005
@@ -24,8 +24,8 @@
 import org.apache.asn1.ber.grammar.IGrammar;
 import org.apache.asn1.ber.tlv.TLV;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
-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;
 
@@ -71,7 +71,7 @@
         super.transitions[LdapStatesEnum.MODIFY_RESPONSE_TAG][0x67] = new GrammarTransition(
                 LdapStatesEnum.MODIFY_RESPONSE_TAG, LdapStatesEnum.MODIFY_RESPONSE_LENGTH, null );
 
-        // We have to allocate a ModifyResponsePOJO
+        // We have to allocate a ModifyResponse
         // LdapMessage ::= ... ModifyResponse ...
         // ModifyResponse ::= [APPLICATION 7] LDAPResult (Length)
         super.transitions[LdapStatesEnum.MODIFY_RESPONSE_LENGTH][0x67] = new GrammarTransition(
@@ -83,14 +83,14 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         checkLength( ldapMessageContainer.getLdapMessage(),
                             ldapMessageContainer.getCurrentTLV() );
 
                         // Now, we can allocate the ModifyResponse POJO
-                        ModifyResponsePOJO modifyResponse = new ModifyResponsePOJO();
+                        ModifyResponse modifyResponse = new ModifyResponse();
 
                         // As this is a new Constructed object, we have to init its length
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/SearchRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/SearchRequestGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/SearchRequestGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/SearchRequestGrammar.java Mon Jun  6 23:35:53 2005
@@ -28,8 +28,8 @@
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
 import org.apache.asn1.ldap.codec.primitives.LdapDN;
 import org.apache.asn1.ldap.codec.utils.IntegerDecoder;
-import org.apache.asn1.ldap.pojo.LdapMessagePOJO;
-import org.apache.asn1.ldap.pojo.SearchRequestPOJO;
+import org.apache.asn1.ldap.pojo.LdapMessage;
+import org.apache.asn1.ldap.pojo.SearchRequest;
 import org.apache.asn1.util.MutableString;
 
 import org.apache.log4j.Logger;
@@ -81,7 +81,7 @@
 
         // LdapMessage   ::= ... SearchRequest ...
         // SearchRequest ::= [APPLICATION 3] SEQUENCE { ... (Length)
-        // We have to allocate a SearchRequestPOJO.
+        // We have to allocate a SearchRequest.
         super.transitions[LdapStatesEnum.SEARCH_REQUEST_LENGTH][0x63] = new GrammarTransition(
                 LdapStatesEnum.SEARCH_REQUEST_LENGTH, LdapStatesEnum.SEARCH_REQUEST_VALUE,
                 new GrammarAction( "Init SearchRequest" )
@@ -91,14 +91,14 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         checkLength( ldapMessageContainer.getLdapMessage(),
                             ldapMessageContainer.getCurrentTLV() );
 
-                        // Now, we can allocate the SearchRequestPOJO
-                        SearchRequestPOJO searchRequest = new SearchRequestPOJO();
+                        // Now, we can allocate the SearchRequest
+                        SearchRequest searchRequest = new SearchRequest();
 
                         // As this is a new Constructed object, we have to init its length
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();
@@ -143,7 +143,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -176,7 +176,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -231,7 +231,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -260,7 +260,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -309,7 +309,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -339,7 +339,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -380,7 +380,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -406,7 +406,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -448,7 +448,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -474,7 +474,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -516,7 +516,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -544,7 +544,7 @@
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
 
-                        SearchRequestPOJO     searchRequest =
+                        SearchRequest     searchRequest =
                             ldapMessageContainer.getLdapMessage().getSearchRequest();
 
                         TLV                  tlv = ldapMessageContainer.getCurrentTLV();
@@ -565,8 +565,8 @@
                             log.warn("A boolean must be encoded with a 0x00 or a 0xFF value");
                         }
                         
-                        // Allocate the FilterPOJO now.
-                        // searchRequest.setFilter(new FilterPOJO());
+                        // Allocate the Filter now.
+                        // searchRequest.setFilter(new Filter());
                         
                         return;
                     }

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/SearchResultDoneGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/SearchResultDoneGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/SearchResultDoneGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/SearchResultDoneGrammar.java Mon Jun  6 23:35:53 2005
@@ -24,8 +24,8 @@
 import org.apache.asn1.ber.grammar.IGrammar;
 import org.apache.asn1.ber.tlv.TLV;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
-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;
 
@@ -71,7 +71,7 @@
         super.transitions[LdapStatesEnum.SEARCH_RESULT_DONE_TAG][0x65] = new GrammarTransition(
                 LdapStatesEnum.SEARCH_RESULT_DONE_TAG, LdapStatesEnum.SEARCH_RESULT_DONE_LENGTH, null );
 
-        // We have to allocate a SearchResultDonePOJO
+        // We have to allocate a SearchResultDone
         // LdapMessage ::= ... SearchResultDone ...
         // SearchResultDone ::= [APPLICATION 5] LDAPResult (Length)
         super.transitions[LdapStatesEnum.SEARCH_RESULT_DONE_LENGTH][0x65] = new GrammarTransition(
@@ -83,14 +83,14 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         checkLength( ldapMessageContainer.getLdapMessage(),
                             ldapMessageContainer.getCurrentTLV() );
 
                         // Now, we can allocate the SearchResultDone POJO
-                        SearchResultDonePOJO searchResultDone = new SearchResultDonePOJO();
+                        SearchResultDone searchResultDone = new SearchResultDone();
 
                         // As this is a new Constructed object, we have to init its length
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();

Modified: directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/UnBindRequestGrammar.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/UnBindRequestGrammar.java?rev=188706&r1=188705&r2=188706&view=diff
==============================================================================
--- directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/UnBindRequestGrammar.java (original)
+++ directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/ldap/codec/grammars/UnBindRequestGrammar.java Mon Jun  6 23:35:53 2005
@@ -24,8 +24,8 @@
 import org.apache.asn1.ber.grammar.IGrammar;
 import org.apache.asn1.ber.tlv.TLV;
 import org.apache.asn1.ldap.codec.LdapMessageContainer;
-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;
 
@@ -89,7 +89,7 @@
         // LdapMessage ::= ... UnBindRequest ...
         // UnbindRequest ::= [APPLICATION 2] NULL (Value)
         // We have to check that the length is null (the Value is empty). This is the end of this grammar.
-        // We also have to allocate a UnBindRequestPOJO
+        // We also have to allocate a UnBindRequest
         super.transitions[LdapStatesEnum.UNBIND_REQUEST_LENGTH][0x42] = new GrammarTransition(
                 LdapStatesEnum.UNBIND_REQUEST_LENGTH, LdapStatesEnum.GRAMMAR_END,
                 new GrammarAction( "Init UnBindRequest" )
@@ -99,13 +99,13 @@
 
                         LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
                             container;
-                        LdapMessagePOJO      ldapMessage          =
+                        LdapMessage      ldapMessage          =
                             ldapMessageContainer.getLdapMessage();
 
                         checkLength( ldapMessage, ldapMessageContainer.getCurrentTLV() );
 
                         // Now, we can allocate the UnBindRequest POJO
-                        UnBindRequestPOJO unBindRequest = new UnBindRequestPOJO();
+                        UnBindRequest unBindRequest = new UnBindRequest();
 
                         // As this is a new Constructed object, we have to init its length
                         TLV tlv            = ldapMessageContainer.getCurrentTLV();



Mime
View raw message