directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1064650 - in /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2: reponse/ request/
Date Fri, 28 Jan 2011 12:56:13 GMT
Author: elecharny
Date: Fri Jan 28 12:56:12 2011
New Revision: 1064650

URL: http://svn.apache.org/viewvc?rev=1064650&view=rev
Log:
Removed the redundant LdapRequestDecorator and LdapResponseDecorator classes

Removed:
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResponseDecorator.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/LdapRequestDecorator.java
Modified:
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AuthResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java Fri Jan 28 12:56:12 2011
@@ -21,6 +21,7 @@ package org.apache.directory.shared.dsml
 
 
 import org.apache.directory.shared.dsmlv2.DsmlDecorator;
+import org.apache.directory.shared.ldap.codec.decorators.ResponseDecorator;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.Message;
 import org.dom4j.Element;
@@ -31,7 +32,7 @@ import org.dom4j.Element;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class AbstractResponseDsml extends LdapResponseDecorator implements DsmlDecorator
+public abstract class AbstractResponseDsml extends ResponseDecorator implements DsmlDecorator
 {
 
     /**

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java Fri Jan 28 12:56:12 2011
@@ -35,7 +35,7 @@ import org.dom4j.Element;
 public class AddResponseDsml extends AbstractResponseDsml
 {
     /**
-     * Creates a new instance of AddResponseDsml.
+     * Creates a new getDecoratedMessage() of AddResponseDsml.
      */
     public AddResponseDsml()
     {
@@ -44,7 +44,7 @@ public class AddResponseDsml extends Abs
 
 
     /**
-     * Creates a new instance of AddResponseDsml.
+     * Creates a new getDecoratedMessage() of AddResponseDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -60,7 +60,7 @@ public class AddResponseDsml extends Abs
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -71,7 +71,7 @@ public class AddResponseDsml extends Abs
     {
         Element element = root.addElement( "addResponse" );
 
-        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( ( AddResponse ) instance ).getLdapResult(), instance );
+        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( ( AddResponse ) getDecoratedMessage() ).getLdapResult(), getDecoratedMessage() );
         ldapResultDsml.toDsml( element );
         return element;
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AuthResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AuthResponseDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AuthResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AuthResponseDsml.java Fri Jan 28 12:56:12 2011
@@ -22,8 +22,8 @@ package org.apache.directory.shared.dsml
 
 
 import org.apache.directory.shared.ldap.model.message.BindResponse;
-import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.BindResponseImpl;
+import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.dom4j.Element;
 
 
@@ -35,7 +35,7 @@ import org.dom4j.Element;
 public class AuthResponseDsml extends AbstractResponseDsml
 {
     /**
-     * Creates a new instance of AuthResponseDsml.
+     * Creates a new getDecoratedMessage() of AuthResponseDsml.
      */
     public AuthResponseDsml()
     {
@@ -44,7 +44,7 @@ public class AuthResponseDsml extends Ab
 
 
     /**
-     * Creates a new instance of AuthResponseDsml.
+     * Creates a new getDecoratedMessage() of AuthResponseDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -60,7 +60,7 @@ public class AuthResponseDsml extends Ab
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -71,7 +71,7 @@ public class AuthResponseDsml extends Ab
     {
         Element element = root.addElement( "authResponse" );
 
-        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( ( BindResponse ) instance ).getLdapResult(), instance );
+        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( ( BindResponse ) getDecoratedMessage() ).getLdapResult(), getDecoratedMessage() );
         ldapResultDsml.toDsml( element );
         return element;
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java Fri Jan 28 12:56:12 2011
@@ -21,9 +21,9 @@
 package org.apache.directory.shared.dsmlv2.reponse;
 
 
+import org.apache.directory.shared.ldap.model.message.CompareResponse;
 import org.apache.directory.shared.ldap.model.message.CompareResponseImpl;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.model.message.CompareResponse;
 import org.dom4j.Element;
 
 
@@ -35,7 +35,7 @@ import org.dom4j.Element;
 public class CompareResponseDsml extends AbstractResponseDsml
 {
     /**
-     * Creates a new instance of CompareResponseDsml.
+     * Creates a new getDecoratedMessage() of CompareResponseDsml.
      */
     public CompareResponseDsml()
     {
@@ -44,7 +44,7 @@ public class CompareResponseDsml extends
 
 
     /**
-     * Creates a new instance of CompareResponseDsml.
+     * Creates a new getDecoratedMessage() of CompareResponseDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -60,7 +60,7 @@ public class CompareResponseDsml extends
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -71,7 +71,7 @@ public class CompareResponseDsml extends
     {
         Element element = root.addElement( "compareResponse" );
 
-        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( ( CompareResponse ) instance ).getLdapResult(), instance );
+        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( ( CompareResponse ) getDecoratedMessage() ).getLdapResult(), getDecoratedMessage() );
         ldapResultDsml.toDsml( element );
         return element;
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java Fri Jan 28 12:56:12 2011
@@ -22,8 +22,8 @@ package org.apache.directory.shared.dsml
 
 
 import org.apache.directory.shared.ldap.model.message.DeleteResponse;
-import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.DeleteResponseImpl;
+import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.dom4j.Element;
 
 
@@ -35,7 +35,7 @@ import org.dom4j.Element;
 public class DelResponseDsml extends AbstractResponseDsml
 {
     /**
-     * Creates a new instance of DelResponseDsml.
+     * Creates a new getDecoratedMessage() of DelResponseDsml.
      */
     public DelResponseDsml()
     {
@@ -44,7 +44,7 @@ public class DelResponseDsml extends Abs
 
 
     /**
-     * Creates a new instance of DelResponseDsml.
+     * Creates a new getDecoratedMessage() of DelResponseDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -60,7 +60,7 @@ public class DelResponseDsml extends Abs
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -71,7 +71,7 @@ public class DelResponseDsml extends Abs
     {
         Element element = root.addElement( "delResponse" );
 
-        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( (DeleteResponse) instance ).getLdapResult(), instance );
+        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( (DeleteResponse) getDecoratedMessage() ).getLdapResult(), getDecoratedMessage() );
         ldapResultDsml.toDsml( element );
         return element;
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java Fri Jan 28 12:56:12 2011
@@ -24,8 +24,8 @@ package org.apache.directory.shared.dsml
 import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
 import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.ExtendedResponseImpl;
+import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.util.Strings;
 import org.dom4j.Element;
 import org.dom4j.Namespace;
@@ -40,7 +40,7 @@ import org.dom4j.QName;
 public class ExtendedResponseDsml extends AbstractResponseDsml
 {
     /**
-     * Creates a new instance of ExtendedResponseDsml.
+     * Creates a new getDecoratedMessage() of ExtendedResponseDsml.
      */
     public ExtendedResponseDsml()
     {
@@ -49,7 +49,7 @@ public class ExtendedResponseDsml extend
 
 
     /**
-     * Creates a new instance of ExtendedResponseDsml.
+     * Creates a new getDecoratedMessage() of ExtendedResponseDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -65,7 +65,7 @@ public class ExtendedResponseDsml extend
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -75,10 +75,10 @@ public class ExtendedResponseDsml extend
     public Element toDsml( Element root )
     {
         Element element = root.addElement( "extendedResponse" );
-        ExtendedResponse extendedResponse = ( ExtendedResponse ) instance;
+        ExtendedResponse extendedResponse = ( ExtendedResponse ) getDecoratedMessage();
 
         // LDAP Result
-        LdapResultDsml ldapResultDsml = new LdapResultDsml( extendedResponse.getLdapResult(), instance );
+        LdapResultDsml ldapResultDsml = new LdapResultDsml( extendedResponse.getLdapResult(), getDecoratedMessage() );
         ldapResultDsml.toDsml( element );
 
         // ResponseName
@@ -122,7 +122,7 @@ public class ExtendedResponseDsml extend
      */
     public String getResponseName()
     {
-        return ( ( ExtendedResponse ) instance ).getResponseName();
+        return ( ( ExtendedResponse ) getDecoratedMessage() ).getResponseName();
     }
 
 
@@ -133,7 +133,7 @@ public class ExtendedResponseDsml extend
      */
     public void setResponseName( OID responseName )
     {
-        ( ( ExtendedResponse ) instance ).setResponseName( responseName.toString() );
+        ( ( ExtendedResponse ) getDecoratedMessage() ).setResponseName( responseName.toString() );
     }
 
 
@@ -144,7 +144,7 @@ public class ExtendedResponseDsml extend
      */
     public Object getResponseValue()
     {
-        return ( ( ExtendedResponse ) instance ).getResponseValue();
+        return ( ( ExtendedResponse ) getDecoratedMessage() ).getResponseValue();
     }
 
 
@@ -155,6 +155,6 @@ public class ExtendedResponseDsml extend
      */
     public void setResponseValue( byte[] response )
     {
-        ( ( ExtendedResponse ) instance ).setResponseValue( response );
+        ( ( ExtendedResponse ) getDecoratedMessage() ).setResponseValue( response );
     }
 }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java Fri Jan 28 12:56:12 2011
@@ -35,7 +35,7 @@ import org.dom4j.Element;
 public class ModDNResponseDsml extends AbstractResponseDsml
 {
     /**
-     * Creates a new instance of ModDNResponseDsml.
+     * Creates a new getDecoratedMessage() of ModDNResponseDsml.
      */
     public ModDNResponseDsml()
     {
@@ -44,7 +44,7 @@ public class ModDNResponseDsml extends A
 
 
     /**
-     * Creates a new instance of ModDNResponseDsml.
+     * Creates a new getDecoratedMessage() of ModDNResponseDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -60,7 +60,7 @@ public class ModDNResponseDsml extends A
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -71,7 +71,7 @@ public class ModDNResponseDsml extends A
     {
         Element element = root.addElement( "modDNResponse" );
 
-        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( ( ModifyDnResponse ) instance ).getLdapResult(), instance );
+        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( ( ModifyDnResponse ) getDecoratedMessage() ).getLdapResult(), getDecoratedMessage() );
         ldapResultDsml.toDsml( element );
         return element;
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java Fri Jan 28 12:56:12 2011
@@ -35,7 +35,7 @@ import org.dom4j.Element;
 public class ModifyResponseDsml extends AbstractResponseDsml
 {
     /**
-     * Creates a new instance of ModifyResponseDsml.
+     * Creates a new getDecoratedMessage() of ModifyResponseDsml.
      */
     public ModifyResponseDsml()
     {
@@ -44,7 +44,7 @@ public class ModifyResponseDsml extends 
 
 
     /**
-     * Creates a new instance of ModifyResponseDsml.
+     * Creates a new getDecoratedMessage() of ModifyResponseDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -60,7 +60,7 @@ public class ModifyResponseDsml extends 
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -71,7 +71,7 @@ public class ModifyResponseDsml extends 
     {
         Element element = root.addElement( "modifyResponse" );
 
-        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( (ModifyResponse) instance ).getLdapResult(), instance );
+        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( (ModifyResponse) getDecoratedMessage() ).getLdapResult(), getDecoratedMessage() );
         ldapResultDsml.toDsml( element );
         return element;
     }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java Fri Jan 28 12:56:12 2011
@@ -42,7 +42,7 @@ public class SearchResponseDsml extends 
 
 
     /**
-     * Creates a new instance of SearchResponseDsml.
+     * Creates a new getDecoratedMessage() of SearchResponseDsml.
      */
     public SearchResponseDsml()
     {
@@ -51,7 +51,7 @@ public class SearchResponseDsml extends 
 
 
     /**
-     * Creates a new instance of SearchResponseDsml.
+     * Creates a new getDecoratedMessage() of SearchResponseDsml.
      *
      * @param response the LDAP response message to decorate
      */
@@ -97,9 +97,9 @@ public class SearchResponseDsml extends 
         Element element = root.addElement( "searchResponse" );
 
         // RequestID
-        if ( instance != null )
+        if ( getDecoratedMessage() != null )
         {
-            int requestID = instance.getMessageId();
+            int requestID = getDecoratedMessage().getMessageId();
             if ( requestID > 0 )
             {
                 element.addAttribute( "requestID", "" + requestID );

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java Fri Jan 28 12:56:12 2011
@@ -35,7 +35,7 @@ import org.dom4j.Element;
 public class SearchResultDoneDsml extends AbstractResponseDsml
 {
     /**
-     * Creates a new instance of SearchResultDoneDsml.
+     * Creates a new getDecoratedMessage() of SearchResultDoneDsml.
      */
     public SearchResultDoneDsml()
     {
@@ -44,7 +44,7 @@ public class SearchResultDoneDsml extend
 
 
     /**
-     * Creates a new instance of SearchResultDoneDsml.
+     * Creates a new getDecoratedMessage() of SearchResultDoneDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -60,7 +60,7 @@ public class SearchResultDoneDsml extend
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -71,7 +71,7 @@ public class SearchResultDoneDsml extend
     {
         Element element = root.addElement( "searchResultDone" );
 
-        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( ( SearchResultDone ) instance ).getLdapResult(), instance );
+        LdapResultDsml ldapResultDsml = new LdapResultDsml( ( ( SearchResultDone ) getDecoratedMessage() ).getLdapResult(), getDecoratedMessage() );
         if ( ldapResultDsml != null )
         {
             ldapResultDsml.toDsml( element );

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java Fri Jan 28 12:56:12 2011
@@ -44,7 +44,7 @@ import org.dom4j.QName;
 public class SearchResultEntryDsml extends AbstractResponseDsml
 {
     /**
-     * Creates a new instance of SearchResultEntryDsml.
+     * Creates a new getDecoratedMessage() of SearchResultEntryDsml.
      */
     public SearchResultEntryDsml()
     {
@@ -53,7 +53,7 @@ public class SearchResultEntryDsml exten
 
 
     /**
-     * Creates a new instance of SearchResultEntryDsml.
+     * Creates a new getDecoratedMessage() of SearchResultEntryDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -69,7 +69,7 @@ public class SearchResultEntryDsml exten
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -79,7 +79,7 @@ public class SearchResultEntryDsml exten
     public Element toDsml( Element root )
     {
         Element element = root.addElement( "searchResultEntry" );
-        SearchResultEntry searchResultEntry = ( SearchResultEntry ) instance;
+        SearchResultEntry searchResultEntry = ( SearchResultEntry ) getDecoratedMessage();
         element.addAttribute( "dn", searchResultEntry.getObjectName().getName() );
 
         Entry entry = searchResultEntry.getEntry();
@@ -121,7 +121,7 @@ public class SearchResultEntryDsml exten
      */
     public Dn getObjectName()
     {
-        return ( ( SearchResultEntry ) instance ).getObjectName();
+        return ( ( SearchResultEntry ) getDecoratedMessage() ).getObjectName();
     }
 
 
@@ -132,7 +132,7 @@ public class SearchResultEntryDsml exten
      */
     public void setObjectName( Dn objectName )
     {
-        ( ( SearchResultEntry ) instance ).setObjectName( objectName );
+        ( ( SearchResultEntry ) getDecoratedMessage() ).setObjectName( objectName );
     }
 
 
@@ -143,7 +143,7 @@ public class SearchResultEntryDsml exten
      */
     public Entry getEntry()
     {
-        return ( ( SearchResultEntry ) instance ).getEntry();
+        return ( ( SearchResultEntry ) getDecoratedMessage() ).getEntry();
     }
 
 
@@ -154,7 +154,7 @@ public class SearchResultEntryDsml exten
      */
     public void setEntry( Entry entry )
     {
-        ( ( SearchResultEntry ) instance ).setEntry( entry );
+        ( ( SearchResultEntry ) getDecoratedMessage() ).setEntry( entry );
     }
 
 
@@ -166,7 +166,7 @@ public class SearchResultEntryDsml exten
      */
     public void addAttributeType( String type ) throws LdapException
     {
-        ( ( SearchResultEntryDecorator ) instance ).addAttribute( type );
+        ( ( SearchResultEntryDecorator ) getDecoratedMessage() ).addAttribute( type );
     }
 
 
@@ -177,6 +177,6 @@ public class SearchResultEntryDsml exten
      */
     public void addAttributeValue( Object value )
     {
-        ( ( SearchResultEntryDecorator ) instance ).addAttributeValue( value );
+        ( ( SearchResultEntryDecorator ) getDecoratedMessage() ).addAttributeValue( value );
     }
 }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java Fri Jan 28 12:56:12 2011
@@ -39,7 +39,7 @@ import org.dom4j.Element;
 public class SearchResultReferenceDsml extends AbstractResponseDsml
 {
     /**
-     * Creates a new instance of SearchResultReferenceDsml.
+     * Creates a new getDecoratedMessage() of SearchResultReferenceDsml.
      */
     public SearchResultReferenceDsml()
     {
@@ -48,7 +48,7 @@ public class SearchResultReferenceDsml e
 
 
     /**
-     * Creates a new instance of SearchResultReferenceDsml.
+     * Creates a new getDecoratedMessage() of SearchResultReferenceDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -64,7 +64,7 @@ public class SearchResultReferenceDsml e
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -74,7 +74,7 @@ public class SearchResultReferenceDsml e
     public Element toDsml( Element root )
     {
         Element element = root.addElement( "searchResultReference" );
-        SearchResultReference searchResultReference = ( SearchResultReference ) instance;
+        SearchResultReference searchResultReference = ( SearchResultReference ) getDecoratedMessage();
 
         // Adding References
         List<String> refsList = ( List<String> ) searchResultReference.getReferral().getLdapUrls();
@@ -95,7 +95,7 @@ public class SearchResultReferenceDsml e
      */
     public void addSearchResultReference( LdapURL searchResultReference )
     {
-        ( ( SearchResultReference ) instance ).getReferral().addLdapUrl( searchResultReference.toString() );
+        ( ( SearchResultReference ) getDecoratedMessage() ).getReferral().addLdapUrl( searchResultReference.toString() );
     }
 
 
@@ -106,6 +106,6 @@ public class SearchResultReferenceDsml e
      */
     public List<String> getSearchResultReferences()
     {
-        return ( List<String> ) ( ( SearchResultReference ) instance ).getReferral().getLdapUrls();
+        return ( List<String> ) ( ( SearchResultReference ) getDecoratedMessage() ).getReferral().getLdapUrls();
     }
 }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java Fri Jan 28 12:56:12 2011
@@ -58,7 +58,7 @@ public class AbandonRequestDsml extends 
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -69,7 +69,7 @@ public class AbandonRequestDsml extends 
     {
         Element element = super.toDsml( root );
 
-        AbandonRequest request = (AbandonRequest) instance;
+        AbandonRequest request = (AbandonRequest) getDecoratedMessage();
 
         // AbandonID
         if ( request.getAbandoned() != 0 )
@@ -88,7 +88,7 @@ public class AbandonRequestDsml extends 
      */
     public int getAbandonedMessageId()
     {
-        return ( ( AbandonRequest ) instance ).getAbandoned();
+        return ( ( AbandonRequest ) getDecoratedMessage() ).getAbandoned();
     }
 
 
@@ -99,6 +99,6 @@ public class AbandonRequestDsml extends 
      */
     public void setAbandonedMessageId( int abandonedMessageId )
     {
-        ( ( AbandonRequest ) instance ).setAbandoned( abandonedMessageId );
+        ( ( AbandonRequest ) getDecoratedMessage() ).setAbandoned( abandonedMessageId );
     }
 }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java Fri Jan 28 12:56:12 2011
@@ -22,6 +22,7 @@ package org.apache.directory.shared.dsml
 
 import org.apache.directory.shared.dsmlv2.DsmlDecorator;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
+import org.apache.directory.shared.ldap.codec.decorators.RequestDecorator;
 import org.apache.directory.shared.ldap.model.message.Message;
 import org.dom4j.Element;
 
@@ -31,7 +32,7 @@ import org.dom4j.Element;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class AbstractRequestDsml extends LdapRequestDecorator implements DsmlDecorator
+public abstract class AbstractRequestDsml extends RequestDecorator implements DsmlDecorator
 {
     /**
      * Creates a new instance of AbstractRequestDsml.
@@ -58,14 +59,14 @@ public abstract class AbstractRequestDsm
         Element element = root.addElement( getRequestName() );
 
         // Request ID
-        int requestID = instance.getMessageId();
+        int requestID = getDecoratedMessage().getMessageId();
         if ( requestID > 0 )
         {
             element.addAttribute( "requestID", "" + requestID );
         }
 
         // Controls
-        ParserUtils.addControls( element, instance.getControls().values() );
+        ParserUtils.addControls( element, getDecoratedMessage().getControls().values() );
 
         return element;
     }
@@ -79,7 +80,7 @@ public abstract class AbstractRequestDsm
      */
     private String getRequestName()
     {
-        switch ( instance.getType() )
+        switch ( getDecoratedMessage().getType() )
         {
             case ABANDON_REQUEST:
                 return "abandonRequest";

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java Fri Jan 28 12:56:12 2011
@@ -43,7 +43,7 @@ import org.dom4j.QName;
 public class AddRequestDsml extends AbstractRequestDsml
 {
     /**
-     * Creates a new instance of AddRequestDsml.
+     * Creates a new getDecoratedMessage() of AddRequestDsml.
      */
     public AddRequestDsml()
     {
@@ -52,7 +52,7 @@ public class AddRequestDsml extends Abst
 
 
     /**
-     * Creates a new instance of AddRequestDsml.
+     * Creates a new getDecoratedMessage() of AddRequestDsml.
     *
     * @param ldapMessage
     *      the message to decorate
@@ -68,7 +68,7 @@ public class AddRequestDsml extends Abst
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -79,7 +79,7 @@ public class AddRequestDsml extends Abst
     {
         Element element = super.toDsml( root );
 
-        AddRequest request = ( AddRequest ) instance;
+        AddRequest request = ( AddRequest ) getDecoratedMessage();
 
         // Dn
         if ( request.getEntry() != null )
@@ -127,7 +127,7 @@ public class AddRequestDsml extends Abst
      */
     public void initEntry()
     {
-        //( ( AddRequest ) instance ).initEntry();
+        //( ( AddRequest ) getDecoratedMessage() ).initEntry();
     }
 
 
@@ -138,7 +138,7 @@ public class AddRequestDsml extends Abst
      */
     public Entry getEntry()
     {
-        return ( ( AddRequest ) instance ).getEntry();
+        return ( ( AddRequest ) getDecoratedMessage() ).getEntry();
     }
 
 
@@ -150,7 +150,7 @@ public class AddRequestDsml extends Abst
      */
     public void addAttributeType( String type ) throws LdapException
     {
-        ( ( AddRequestDecorator ) instance ).addAttributeType( type );
+        ( ( AddRequestDecorator ) getDecoratedMessage() ).addAttributeType( type );
     }
 
 
@@ -163,15 +163,15 @@ public class AddRequestDsml extends Abst
     {
         if ( value instanceof Value<?> )
         {
-            ( ( AddRequestDecorator ) instance ).addAttributeValue( (Value<?>) value );
+            ( ( AddRequestDecorator ) getDecoratedMessage() ).addAttributeValue( (Value<?>) value );
         }
         else if ( value instanceof String )
         {
-            ( ( AddRequestDecorator ) instance ).addAttributeValue( ( String ) value );
+            ( ( AddRequestDecorator ) getDecoratedMessage() ).addAttributeValue( ( String ) value );
         }
         else if ( value instanceof byte[] )
         {
-            ( ( AddRequestDecorator ) instance ).addAttributeValue( ( byte[] ) value );
+            ( ( AddRequestDecorator ) getDecoratedMessage() ).addAttributeValue( ( byte[] ) value );
         }
     }
 
@@ -183,7 +183,7 @@ public class AddRequestDsml extends Abst
      */
     public Dn getEntryDn()
     {
-        return ( ( AddRequest ) instance ).getEntryDn();
+        return ( ( AddRequest ) getDecoratedMessage() ).getEntryDn();
     }
 
 
@@ -194,7 +194,7 @@ public class AddRequestDsml extends Abst
      */
     public void setEntryDn( Dn entryDn )
     {
-        ( ( AddRequest ) instance ).setEntryDn( entryDn );
+        ( ( AddRequest ) getDecoratedMessage() ).setEntryDn( entryDn );
     }
 
 
@@ -206,7 +206,7 @@ public class AddRequestDsml extends Abst
      */
     public void setEntry( Entry entry )
     {
-        ( ( AddRequest ) instance ).setEntry( entry );
+        ( ( AddRequest ) getDecoratedMessage() ).setEntry( entry );
     }
 
 
@@ -215,6 +215,6 @@ public class AddRequestDsml extends Abst
      */
     public String getCurrentAttributeType()
     {
-        return ( ( AddRequestDecorator ) instance ).getCurrentAttributeType();
+        return ( ( AddRequestDecorator ) getDecoratedMessage() ).getCurrentAttributeType();
     }
 }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java Fri Jan 28 12:56:12 2011
@@ -34,7 +34,7 @@ import org.dom4j.Element;
 public class AuthRequestDsml extends AbstractRequestDsml
 {
     /**
-     * Creates a new instance of AuthRequestDsml.
+     * Creates a new getDecoratedMessage() of AuthRequestDsml.
      */
     public AuthRequestDsml()
     {
@@ -43,7 +43,7 @@ public class AuthRequestDsml extends Abs
 
 
     /**
-     * Creates a new instance of AuthRequestDsml.
+     * Creates a new getDecoratedMessage() of AuthRequestDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -59,7 +59,7 @@ public class AuthRequestDsml extends Abs
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -70,7 +70,7 @@ public class AuthRequestDsml extends Abs
     {
         Element element = super.toDsml( root );
 
-        BindRequest request = ( BindRequest ) instance;
+        BindRequest request = ( BindRequest ) getDecoratedMessage();
 
         // AbandonID
         String name = request.getName().getName();

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java Fri Jan 28 12:56:12 2011
@@ -21,8 +21,8 @@ package org.apache.directory.shared.dsml
 
 
 import org.apache.directory.shared.ldap.model.message.CompareRequest;
-import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
+import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.dom4j.Element;
 
@@ -35,7 +35,7 @@ import org.dom4j.Element;
 public class CompareRequestDsml extends AbstractRequestDsml
 {
     /**
-     * Creates a new instance of CompareRequestDsml.
+     * Creates a new getDecoratedMessage() of CompareRequestDsml.
      */
     public CompareRequestDsml()
     {
@@ -44,7 +44,7 @@ public class CompareRequestDsml extends 
 
 
     /**
-     * Creates a new instance of CompareRequestDsml.
+     * Creates a new getDecoratedMessage() of CompareRequestDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -60,7 +60,7 @@ public class CompareRequestDsml extends 
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -71,7 +71,7 @@ public class CompareRequestDsml extends 
     {
         Element element = super.toDsml( root );
 
-        CompareRequest request = ( CompareRequest ) instance;
+        CompareRequest request = ( CompareRequest ) getDecoratedMessage();
 
         // Dn
         if ( request.getName() != null )
@@ -101,7 +101,7 @@ public class CompareRequestDsml extends 
      */
     public Dn getName()
     {
-        return ( (CompareRequest) instance ).getName();
+        return ( (CompareRequest) getDecoratedMessage() ).getName();
     }
 
 
@@ -112,7 +112,7 @@ public class CompareRequestDsml extends 
      */
     public void setName( Dn entry )
     {
-        ( ( CompareRequest ) instance ).setName( entry );
+        ( ( CompareRequest ) getDecoratedMessage() ).setName( entry );
     }
 
 
@@ -123,7 +123,7 @@ public class CompareRequestDsml extends 
      */
     public Object getAssertionValue()
     {
-        return ( ( CompareRequest ) instance ).getAssertionValue();
+        return ( ( CompareRequest ) getDecoratedMessage() ).getAssertionValue();
     }
 
 
@@ -136,11 +136,11 @@ public class CompareRequestDsml extends 
     {
         if ( assertionValue instanceof String )
         {
-            ( ( CompareRequest ) instance ).setAssertionValue( ( String ) assertionValue );
+            ( ( CompareRequest ) getDecoratedMessage() ).setAssertionValue( ( String ) assertionValue );
         }
         else
         {
-            ( ( CompareRequest ) instance ).setAssertionValue( ( byte[] ) assertionValue );
+            ( ( CompareRequest ) getDecoratedMessage() ).setAssertionValue( ( byte[] ) assertionValue );
         }
     }
 
@@ -152,7 +152,7 @@ public class CompareRequestDsml extends 
      */
     public String getAttributeDesc()
     {
-        return ( ( CompareRequest ) instance ).getAttributeId();
+        return ( ( CompareRequest ) getDecoratedMessage() ).getAttributeId();
     }
 
 
@@ -163,6 +163,6 @@ public class CompareRequestDsml extends 
      */
     public void setAttributeDesc( String attributeDesc )
     {
-        ( ( CompareRequest ) instance ).setAttributeId( attributeDesc );
+        ( ( CompareRequest ) getDecoratedMessage() ).setAttributeId( attributeDesc );
     }
 }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java Fri Jan 28 12:56:12 2011
@@ -35,7 +35,7 @@ import org.dom4j.Element;
 public class DelRequestDsml extends AbstractRequestDsml
 {
     /**
-     * Creates a new instance of DelRequestDsml.
+     * Creates a new getDecoratedMessage() of DelRequestDsml.
      */
     public DelRequestDsml()
     {
@@ -44,7 +44,7 @@ public class DelRequestDsml extends Abst
 
 
     /**
-     * Creates a new instance of DelRequestDsml.
+     * Creates a new getDecoratedMessage() of DelRequestDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -60,7 +60,7 @@ public class DelRequestDsml extends Abst
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -71,7 +71,7 @@ public class DelRequestDsml extends Abst
     {
         Element element = super.toDsml( root );
 
-        DeleteRequest request = ( DeleteRequest ) instance;
+        DeleteRequest request = ( DeleteRequest ) getDecoratedMessage();
 
         // Dn
         if ( request.getName() != null )
@@ -90,7 +90,7 @@ public class DelRequestDsml extends Abst
      */
     public Dn getEntry()
     {
-        return ( ( DeleteRequest ) instance ).getName();
+        return ( ( DeleteRequest ) getDecoratedMessage() ).getName();
     }
 
 
@@ -101,6 +101,6 @@ public class DelRequestDsml extends Abst
      */
     public void setEntry( Dn entry )
     {
-        ( (DeleteRequest) instance ).setName( entry );
+        ( (DeleteRequest) getDecoratedMessage() ).setName( entry );
     }
 }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java Fri Jan 28 12:56:12 2011
@@ -38,7 +38,7 @@ import org.dom4j.QName;
 public class ExtendedRequestDsml extends AbstractRequestDsml
 {
     /**
-     * Creates a new instance of ExtendedRequestDsml.
+     * Creates a new getDecoratedMessage() of ExtendedRequestDsml.
      */
     public ExtendedRequestDsml()
     {
@@ -47,7 +47,7 @@ public class ExtendedRequestDsml extends
 
 
     /**
-     * Creates a new instance of ExtendedRequestDsml.
+     * Creates a new getDecoratedMessage() of ExtendedRequestDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -63,7 +63,7 @@ public class ExtendedRequestDsml extends
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -74,7 +74,7 @@ public class ExtendedRequestDsml extends
     {
         Element element = super.toDsml( root );
 
-        ExtendedRequest request = ( ExtendedRequest ) instance;
+        ExtendedRequest request = ( ExtendedRequest ) getDecoratedMessage();
 
         // Request Name
         if ( request.getRequestName() != null )
@@ -103,7 +103,7 @@ public class ExtendedRequestDsml extends
      */
     public String getRequestName()
     {
-        return ( (ExtendedRequest) instance ).getRequestName();
+        return ( (ExtendedRequest) getDecoratedMessage() ).getRequestName();
     }
 
 
@@ -114,7 +114,7 @@ public class ExtendedRequestDsml extends
      */
     public void setRequestName( OID requestName )
     {
-        ( ( ExtendedRequest ) instance ).setRequestName( requestName.toString() );
+        ( ( ExtendedRequest ) getDecoratedMessage() ).setRequestName( requestName.toString() );
     }
 
 
@@ -125,7 +125,7 @@ public class ExtendedRequestDsml extends
      */
     public byte[] getRequestValue()
     {
-        return ( ( ExtendedRequest ) instance ).getRequestValue();
+        return ( ( ExtendedRequest ) getDecoratedMessage() ).getRequestValue();
     }
 
 
@@ -136,6 +136,6 @@ public class ExtendedRequestDsml extends
      */
     public void setRequestValue( byte[] requestValue )
     {
-        ( ( ExtendedRequest ) instance ).getRequestValue();
+        ( ( ExtendedRequest ) getDecoratedMessage() ).getRequestValue();
     }
 }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java Fri Jan 28 12:56:12 2011
@@ -36,7 +36,7 @@ import org.dom4j.Element;
 public class ModifyDNRequestDsml extends AbstractRequestDsml
 {
     /**
-     * Creates a new instance of ModifyDNRequestDsml.
+     * Creates a new getDecoratedMessage() of ModifyDNRequestDsml.
      */
     public ModifyDNRequestDsml()
     {
@@ -45,7 +45,7 @@ public class ModifyDNRequestDsml extends
 
 
     /**
-     * Creates a new instance of ModifyDNRequestDsml.
+     * Creates a new getDecoratedMessage() of ModifyDNRequestDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -61,7 +61,7 @@ public class ModifyDNRequestDsml extends
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -72,7 +72,7 @@ public class ModifyDNRequestDsml extends
     {
         Element element = super.toDsml( root );
 
-        ModifyDnRequest request = ( ModifyDnRequest ) instance;
+        ModifyDnRequest request = ( ModifyDnRequest ) getDecoratedMessage();
 
         // Dn
         if ( request.getName() != null )
@@ -106,7 +106,7 @@ public class ModifyDNRequestDsml extends
      */
     public Dn getName()
     {
-        return ( ( ModifyDnRequest ) instance ).getName();
+        return ( ( ModifyDnRequest ) getDecoratedMessage() ).getName();
     }
 
 
@@ -117,7 +117,7 @@ public class ModifyDNRequestDsml extends
      */
     public void setEntry( Dn name )
     {
-        ( ( ModifyDnRequest ) instance ).setName( name );
+        ( ( ModifyDnRequest ) getDecoratedMessage() ).setName( name );
     }
 
 
@@ -128,7 +128,7 @@ public class ModifyDNRequestDsml extends
      */
     public boolean isDeleteOldRDN()
     {
-        return ( ( ModifyDnRequest ) instance ).getDeleteOldRdn();
+        return ( ( ModifyDnRequest ) getDecoratedMessage() ).getDeleteOldRdn();
     }
 
 
@@ -139,7 +139,7 @@ public class ModifyDNRequestDsml extends
      */
     public void setDeleteOldRDN( boolean deleteOldRDN )
     {
-        ( ( ModifyDnRequest ) instance ).setDeleteOldRdn( deleteOldRDN );
+        ( ( ModifyDnRequest ) getDecoratedMessage() ).setDeleteOldRdn( deleteOldRDN );
     }
 
 
@@ -150,7 +150,7 @@ public class ModifyDNRequestDsml extends
      */
     public Rdn getNewRDN()
     {
-        return ( ( ModifyDnRequest ) instance ).getNewRdn();
+        return ( ( ModifyDnRequest ) getDecoratedMessage() ).getNewRdn();
     }
 
 
@@ -161,7 +161,7 @@ public class ModifyDNRequestDsml extends
      */
     public void setNewRDN( Rdn newRdn)
     {
-        ( ( ModifyDnRequest ) instance ).setNewRdn(newRdn);
+        ( ( ModifyDnRequest ) getDecoratedMessage() ).setNewRdn(newRdn);
     }
 
 
@@ -172,7 +172,7 @@ public class ModifyDNRequestDsml extends
      */
     public Dn getNewSuperior()
     {
-        return ( (ModifyDnRequest) instance ).getNewSuperior();
+        return ( (ModifyDnRequest) getDecoratedMessage() ).getNewSuperior();
     }
 
 
@@ -183,6 +183,6 @@ public class ModifyDNRequestDsml extends
      */
     public void setNewSuperior( Dn newSuperior )
     {
-        ( ( ModifyDnRequest ) instance ).setNewSuperior( newSuperior );
+        ( ( ModifyDnRequest ) getDecoratedMessage() ).setNewSuperior( newSuperior );
     }
 }

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java Fri Jan 28 12:56:12 2011
@@ -24,10 +24,10 @@ import java.util.Collection;
 import java.util.Iterator;
 
 import org.apache.directory.shared.dsmlv2.ParserUtils;
+import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.message.ModifyRequest;
 import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
 import org.dom4j.Element;
@@ -43,7 +43,7 @@ import org.dom4j.QName;
 public class ModifyRequestDsml extends AbstractRequestDsml
 {
     /**
-     * Creates a new instance of ModifyRequestDsml.
+     * Creates a new getDecoratedMessage() of ModifyRequestDsml.
      */
     public ModifyRequestDsml()
     {
@@ -52,7 +52,7 @@ public class ModifyRequestDsml extends A
 
 
     /**
-     * Creates a new instance of ModifyRequestDsml.
+     * Creates a new getDecoratedMessage() of ModifyRequestDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -68,7 +68,7 @@ public class ModifyRequestDsml extends A
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -79,7 +79,7 @@ public class ModifyRequestDsml extends A
     {
         Element element = super.toDsml( root );
 
-        ModifyRequest request = ( ModifyRequest ) instance;
+        ModifyRequest request = ( ModifyRequest ) getDecoratedMessage();
 
         // Dn
         if ( request.getName() != null )

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java?rev=1064650&r1=1064649&r2=1064650&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java Fri Jan 28 12:56:12 2011
@@ -25,17 +25,18 @@ import java.util.List;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
 import org.apache.directory.shared.ldap.codec.AttributeValueAssertion;
 import org.apache.directory.shared.ldap.codec.LdapConstants;
-import org.apache.directory.shared.ldap.model.filter.*;
-import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
 import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
 import org.apache.directory.shared.ldap.codec.search.PresentFilter;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.filter.AndNode;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.filter.NotNode;
+import org.apache.directory.shared.ldap.model.filter.OrNode;
 import org.apache.directory.shared.ldap.model.filter.SearchScope;
 import org.apache.directory.shared.ldap.model.filter.SubstringNode;
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
+import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.SearchRequest;
 import org.apache.directory.shared.ldap.model.message.SearchRequestImpl;
 import org.dom4j.Element;
@@ -51,7 +52,7 @@ import org.dom4j.QName;
 public class SearchRequestDsml extends AbstractRequestDsml
 {
     /**
-     * Creates a new instance of SearchRequestDsml.
+     * Creates a new getDecoratedMessage() of SearchRequestDsml.
      */
     public SearchRequestDsml()
     {
@@ -60,7 +61,7 @@ public class SearchRequestDsml extends A
 
 
     /**
-     * Creates a new instance of SearchRequestDsml.
+     * Creates a new getDecoratedMessage() of SearchRequestDsml.
      *
      * @param ldapMessage
      *      the message to decorate
@@ -76,7 +77,7 @@ public class SearchRequestDsml extends A
      */
     public MessageTypeEnum getType()
     {
-        return instance.getType();
+        return getDecoratedMessage().getType();
     }
 
 
@@ -87,7 +88,7 @@ public class SearchRequestDsml extends A
     {
         Element element = super.toDsml( root );
 
-        SearchRequest request = ( SearchRequest ) instance;
+        SearchRequest request = ( SearchRequest ) getDecoratedMessage();
 
         // Dn
         if ( request.getBase() != null )



Mime
View raw message