directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1124671 [2/5] - in /directory/shared/trunk: ./ all/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml/parser/src/main/java/org/apache/direc...
Date Thu, 19 May 2011 10:29:08 GMT
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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.reponse;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.AddResponse;
 import org.apache.directory.shared.ldap.model.message.AddResponseImpl;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
@@ -42,7 +42,7 @@ public class AddResponseDsml extends Abs
     /**
      * Creates a new getDecoratedMessage() of AddResponseDsml.
      */
-    public AddResponseDsml( LdapCodecService codec )
+    public AddResponseDsml( LdapApiService codec )
     {
         super( codec, new AddResponseImpl() );
     }
@@ -54,7 +54,7 @@ public class AddResponseDsml extends Abs
      * @param ldapMessage
      *      the message to decorate
      */
-    public AddResponseDsml( LdapCodecService codec, AddResponse ldapMessage )
+    public AddResponseDsml( LdapApiService codec, AddResponse ldapMessage )
     {
         super( codec, ldapMessage );
     }

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BindResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BindResponseDsml.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BindResponseDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BindResponseDsml.java Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.reponse;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.BindResponse;
 import org.apache.directory.shared.ldap.model.message.BindResponseImpl;
 import org.dom4j.Element;
@@ -36,7 +36,7 @@ public class BindResponseDsml extends Ab
     /**
      * Creates a new getDecoratedMessage() of AuthResponseDsml.
      */
-    public BindResponseDsml( LdapCodecService codec )
+    public BindResponseDsml( LdapApiService codec )
     {
         super( codec, new BindResponseImpl() );
     }
@@ -48,7 +48,7 @@ public class BindResponseDsml extends Ab
      * @param ldapMessage
      *      the message to decorate
      */
-    public BindResponseDsml( LdapCodecService codec, BindResponse ldapMessage )
+    public BindResponseDsml( LdapApiService codec, BindResponse ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@
 package org.apache.directory.shared.dsmlv2.reponse;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 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;
@@ -42,7 +42,7 @@ public class CompareResponseDsml extends
     /**
      * Creates a new getDecoratedMessage() of CompareResponseDsml.
      */
-    public CompareResponseDsml( LdapCodecService codec )
+    public CompareResponseDsml( LdapApiService codec )
     {
         super( codec, new CompareResponseImpl() );
     }
@@ -54,7 +54,7 @@ public class CompareResponseDsml extends
      * @param ldapMessage
      *      the message to decorate
      */
-    public CompareResponseDsml( LdapCodecService codec, CompareResponse ldapMessage )
+    public CompareResponseDsml( LdapApiService codec, CompareResponse ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@
 package org.apache.directory.shared.dsmlv2.reponse;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.DeleteResponse;
 import org.apache.directory.shared.ldap.model.message.DeleteResponseImpl;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
@@ -43,7 +43,7 @@ public class DelResponseDsml extends Abs
     /**
      * Creates a new getDecoratedMessage() of DelResponseDsml.
      */
-    public DelResponseDsml( LdapCodecService codec )
+    public DelResponseDsml( LdapApiService codec )
     {
         super( codec, new DeleteResponseImpl() );
     }
@@ -55,7 +55,7 @@ public class DelResponseDsml extends Abs
      * @param ldapMessage
      *      the message to decorate
      */
-    public DelResponseDsml( LdapCodecService codec, DeleteResponse ldapMessage )
+    public DelResponseDsml( LdapApiService codec, DeleteResponse ldapMessage )
     {
         super( codec, ldapMessage );
     }

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.dsml
 
 
 import org.apache.directory.shared.dsmlv2.DsmlDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.AbstractResponse;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.Response;
@@ -276,7 +276,7 @@ public class ErrorResponse extends Abstr
     }
 
 
-    public LdapCodecService getCodecService()
+    public LdapApiService getCodecService()
     {
         throw new IllegalArgumentException( "This should not be a decorator " +
         		"but seems it was made into one. We need to do something about" +

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -22,7 +22,7 @@ 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.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
 import org.apache.directory.shared.ldap.model.message.ExtendedResponseImpl;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
@@ -49,7 +49,7 @@ public class ExtendedResponseDsml extend
     /**
      * Creates a new getDecoratedMessage() of ExtendedResponseDsml.
      */
-    public ExtendedResponseDsml( LdapCodecService codec )
+    public ExtendedResponseDsml( LdapApiService codec )
     {
         super( codec, new ExtendedResponseImpl( "" ) );
     }
@@ -61,7 +61,7 @@ public class ExtendedResponseDsml extend
      * @param ldapMessage
      *      the message to decorate
      */
-    public ExtendedResponseDsml( LdapCodecService codec, ExtendedResponse ldapMessage )
+    public ExtendedResponseDsml( LdapApiService codec, ExtendedResponse ldapMessage )
     {
         super( codec, ldapMessage );
     }

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java Thu May 19 10:28:59 2011
@@ -25,7 +25,7 @@ import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.DsmlDecorator;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.Message;
 import org.apache.directory.shared.ldap.model.message.Referral;
@@ -49,7 +49,7 @@ public class LdapResultDsml implements D
     private Message message;
     
     /** The ldap codec service */
-    private LdapCodecService codec;
+    private LdapApiService codec;
 
 
     /**
@@ -61,7 +61,7 @@ public class LdapResultDsml implements D
      *      the associated message
      * @param the ldap codec service 
      */
-    public LdapResultDsml( LdapCodecService codec, LdapResult result, Message message )
+    public LdapResultDsml( LdapApiService codec, LdapResult result, Message message )
     {
         this.codec = codec;
         this.result = result;

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.reponse;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
 import org.apache.directory.shared.ldap.model.message.ModifyDnResponseImpl;
@@ -42,7 +42,7 @@ public class ModDNResponseDsml extends A
     /**
      * Creates a new getDecoratedMessage() of ModDNResponseDsml.
      */
-    public ModDNResponseDsml( LdapCodecService codec )
+    public ModDNResponseDsml( LdapApiService codec )
     {
         super( codec, new ModifyDnResponseImpl() );
     }
@@ -54,7 +54,7 @@ public class ModDNResponseDsml extends A
      * @param ldapMessage
      *      the message to decorate
      */
-    public ModDNResponseDsml( LdapCodecService codec, ModifyDnResponse ldapMessage )
+    public ModDNResponseDsml( LdapApiService codec, ModifyDnResponse ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.reponse;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.ModifyResponse;
 import org.apache.directory.shared.ldap.model.message.ModifyResponseImpl;
@@ -42,7 +42,7 @@ public class ModifyResponseDsml extends 
     /**
      * Creates a new getDecoratedMessage() of ModifyResponseDsml.
      */
-    public ModifyResponseDsml( LdapCodecService codec )
+    public ModifyResponseDsml( LdapApiService codec )
     {
         super( codec, new ModifyResponseImpl() );
     }
@@ -54,7 +54,7 @@ public class ModifyResponseDsml extends 
      * @param ldapMessage
      *      the message to decorate
      */
-    public ModifyResponseDsml( LdapCodecService codec, ModifyResponse ldapMessage )
+    public ModifyResponseDsml( LdapApiService codec, ModifyResponse ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.DsmlDecorator;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.Message;
 import org.apache.directory.shared.ldap.model.message.Response;
 import org.apache.directory.shared.ldap.model.message.SearchResultDone;
@@ -53,7 +53,7 @@ public class SearchResponseDsml extends 
     /**
      * Creates a new getDecoratedMessage() of SearchResponseDsml.
      */
-    public SearchResponseDsml( LdapCodecService codec )
+    public SearchResponseDsml( LdapApiService codec )
     {
         super( codec, null );
     }
@@ -64,7 +64,7 @@ public class SearchResponseDsml extends 
      *
      * @param response the LDAP response message to decorate
      */
-    public SearchResponseDsml( LdapCodecService codec, Message response )
+    public SearchResponseDsml( LdapApiService codec, Message response )
     {
         super( codec, ( Response ) response );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.reponse;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.SearchResultDone;
 import org.apache.directory.shared.ldap.model.message.SearchResultDoneImpl;
@@ -42,7 +42,7 @@ public class SearchResultDoneDsml extend
     /**
      * Creates a new getDecoratedMessage() of SearchResultDoneDsml.
      */
-    public SearchResultDoneDsml( LdapCodecService codec )
+    public SearchResultDoneDsml( LdapApiService codec )
     {
         super( codec, new SearchResultDoneImpl() );
     }
@@ -54,7 +54,7 @@ public class SearchResultDoneDsml extend
      * @param ldapMessage
      *      the message to decorate
      */
-    public SearchResultDoneDsml( LdapCodecService codec, SearchResultDone ldapMessage )
+    public SearchResultDoneDsml( LdapApiService codec, SearchResultDone ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.dsml
 
 
 import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -57,7 +57,7 @@ public class SearchResultEntryDsml 
     /**
      * Creates a new getDecoratedMessage() of SearchResultEntryDsml.
      */
-    public SearchResultEntryDsml( LdapCodecService codec )
+    public SearchResultEntryDsml( LdapApiService codec )
     {
         super( codec, new SearchResultEntryImpl() );
     }
@@ -69,7 +69,7 @@ public class SearchResultEntryDsml 
      * @param ldapMessage
      *      the message to decorate
      */
-    public SearchResultEntryDsml( LdapCodecService codec, SearchResultEntry ldapMessage )
+    public SearchResultEntryDsml( LdapApiService codec, SearchResultEntry ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.dsml
 
 import java.util.Collection;
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.Referral;
 import org.apache.directory.shared.ldap.model.message.SearchResultReference;
@@ -47,7 +47,7 @@ public class SearchResultReferenceDsml 
     /**
      * Creates a new getDecoratedMessage() of SearchResultReferenceDsml.
      */
-    public SearchResultReferenceDsml( LdapCodecService codec )
+    public SearchResultReferenceDsml( LdapApiService codec )
     {
         super( codec, new SearchResultReferenceImpl() );
     }
@@ -59,7 +59,7 @@ public class SearchResultReferenceDsml 
      * @param ldapMessage
      *      the message to decorate
      */
-    public SearchResultReferenceDsml( LdapCodecService codec, SearchResultReference ldapMessage )
+    public SearchResultReferenceDsml( LdapApiService codec, SearchResultReference ldapMessage )
     {
         super( codec, ldapMessage );
     }

Propchange: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/request:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:965208-965686

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.request;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.AbandonRequest;
 import org.apache.directory.shared.ldap.model.message.AbandonRequestImpl;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
@@ -38,7 +38,7 @@ public class AbandonRequestDsml extends 
     /**
      * Creates a new instance of AbandonRequestDsml.
      */
-    public AbandonRequestDsml( LdapCodecService codec )
+    public AbandonRequestDsml( LdapApiService codec )
     {
         super( codec, new AbandonRequestImpl() );
     }
@@ -49,7 +49,7 @@ public class AbandonRequestDsml extends 
      *
      * @param ldapMessage the message to decorate
      */
-    public AbandonRequestDsml( LdapCodecService codec, AbandonRequest ldapMessage )
+    public AbandonRequestDsml( LdapApiService codec, AbandonRequest ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.dsmlv2.AbstractDsmlMessageDecorator;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.Request;
 import org.dom4j.Element;
 
@@ -45,7 +45,7 @@ public abstract class AbstractRequestDsm
      * @param ldapMessage
      *      the message to decorate
      */
-    public AbstractRequestDsml( LdapCodecService codec, E ldapMessage )
+    public AbstractRequestDsml( LdapApiService codec, E ldapMessage )
     {
         super( codec, ldapMessage );
     }

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractResultResponseRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractResultResponseRequestDsml.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractResultResponseRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractResultResponseRequestDsml.java Thu May 19 10:28:59 2011
@@ -24,7 +24,7 @@ import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.AbandonListener;
 import org.apache.directory.shared.ldap.model.message.AbandonableRequest;
 import org.apache.directory.shared.ldap.model.message.ResultResponse;
@@ -47,7 +47,7 @@ public abstract class AbstractResultResp
      * @param ldapMessage
      *      the message to decorate
      */
-    public AbstractResultResponseRequestDsml( LdapCodecService codec, E ldapMessage )
+    public AbstractResultResponseRequestDsml( LdapApiService codec, E ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.dsml
 
 
 import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -54,7 +54,7 @@ public class AddRequestDsml 
     /**
      * Creates a new getDecoratedMessage() of AddRequestDsml.
      */
-    public AddRequestDsml( LdapCodecService codec )
+    public AddRequestDsml( LdapApiService codec )
     {
         super( codec, new AddRequestImpl() );
     }
@@ -66,7 +66,7 @@ public class AddRequestDsml 
     * @param ldapMessage
     *      the message to decorate
     */
-    public AddRequestDsml( LdapCodecService codec, AddRequest ldapMessage )
+    public AddRequestDsml( LdapApiService codec, AddRequest ldapMessage )
     {
         super( codec, ldapMessage );
     }

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BindRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BindRequestDsml.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BindRequestDsml.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BindRequestDsml.java Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.request;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.BindRequest;
 import org.apache.directory.shared.ldap.model.message.BindRequestImpl;
 import org.apache.directory.shared.ldap.model.message.BindResponse;
@@ -41,7 +41,7 @@ public class BindRequestDsml 
     /**
      * Creates a new getDecoratedMessage() of AuthRequestDsml.
      */
-    public BindRequestDsml( LdapCodecService codec )
+    public BindRequestDsml( LdapApiService codec )
     {
         super( codec, new BindRequestImpl() );
     }
@@ -53,7 +53,7 @@ public class BindRequestDsml 
      * @param ldapMessage
      *      the message to decorate
      */
-    public BindRequestDsml( LdapCodecService codec, BindRequest ldapMessage )
+    public BindRequestDsml( LdapApiService codec, BindRequest ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.request;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.message.CompareRequest;
 import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
@@ -42,7 +42,7 @@ public class CompareRequestDsml 
     /**
      * Creates a new getDecoratedMessage() of CompareRequestDsml.
      */
-    public CompareRequestDsml( LdapCodecService codec )
+    public CompareRequestDsml( LdapApiService codec )
     {
         super( codec, new CompareRequestImpl() );
     }
@@ -54,7 +54,7 @@ public class CompareRequestDsml 
      * @param ldapMessage
      *      the message to decorate
      */
-    public CompareRequestDsml( LdapCodecService codec, CompareRequest ldapMessage )
+    public CompareRequestDsml( LdapApiService codec, CompareRequest ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.request;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.DeleteRequest;
 import org.apache.directory.shared.ldap.model.message.DeleteRequestImpl;
 import org.apache.directory.shared.ldap.model.message.DeleteResponse;
@@ -41,7 +41,7 @@ public class DelRequestDsml 
     /**
      * Creates a new getDecoratedMessage() of DelRequestDsml.
      */
-    public DelRequestDsml( LdapCodecService codec )
+    public DelRequestDsml( LdapApiService codec )
     {
         super( codec, new DeleteRequestImpl() );
     }
@@ -53,7 +53,7 @@ public class DelRequestDsml 
      * @param ldapMessage
      *      the message to decorate
      */
-    public DelRequestDsml( LdapCodecService codec, DeleteRequest ldapMessage )
+    public DelRequestDsml( LdapApiService codec, DeleteRequest ldapMessage )
     {
         super( codec, ldapMessage );
     }

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Thu May 19 10:28:59 2011
@@ -41,8 +41,8 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml.ResponseOrder;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.api.CodecControl;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
@@ -80,7 +80,7 @@ import org.xmlpull.v1.XmlPullParserExcep
  */
 public final class Dsmlv2Grammar extends AbstractGrammar implements Grammar
 {
-    private LdapCodecService codec = LdapCodecServiceFactory.getSingleton();
+    private LdapApiService codec = LdapApiServiceFactory.getSingleton();
     
 
     /**
@@ -1086,7 +1086,7 @@ public final class Dsmlv2Grammar extends
     /**
      * @return The LDAP codec service.
      */
-    public LdapCodecService getLdapCodecService()
+    public LdapApiService getLdapCodecService()
     {
         return codec;
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -22,7 +22,7 @@ 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.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
@@ -49,7 +49,7 @@ public class ExtendedRequestDsml<Q exten
      * @param ldapMessage
      *      the message to decorate
      */
-    public ExtendedRequestDsml( LdapCodecService codec, Q ldapMessage )
+    public ExtendedRequestDsml( LdapApiService codec, Q ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.dsmlv2.request;
 
 
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
 import org.apache.directory.shared.ldap.model.message.ModifyDnRequestImpl;
@@ -42,7 +42,7 @@ public class ModifyDNRequestDsml 
     /**
      * Creates a new getDecoratedMessage() of ModifyDNRequestDsml.
      */
-    public ModifyDNRequestDsml( LdapCodecService codec )
+    public ModifyDNRequestDsml( LdapApiService codec )
     {
         super( codec, new ModifyDnRequestImpl() );
     }
@@ -54,7 +54,7 @@ public class ModifyDNRequestDsml 
      * @param ldapMessage
      *      the message to decorate
      */
-    public ModifyDNRequestDsml( LdapCodecService codec, ModifyDnRequest ldapMessage )
+    public ModifyDNRequestDsml( LdapApiService codec, ModifyDnRequest ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.dsml
 import java.util.Collection;
 
 import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
@@ -61,7 +61,7 @@ public class ModifyRequestDsml 
     /**
      * Creates a new getDecoratedMessage() of ModifyRequestDsml.
      */
-    public ModifyRequestDsml( LdapCodecService codec )
+    public ModifyRequestDsml( LdapApiService codec )
     {
         super( codec, new ModifyRequestImpl() );
     }
@@ -73,7 +73,7 @@ public class ModifyRequestDsml 
      * @param ldapMessage
      *      the message to decorate
      */
-    public ModifyRequestDsml( LdapCodecService codec, ModifyRequest ldapMessage )
+    public ModifyRequestDsml( LdapApiService codec, ModifyRequest ldapMessage )
     {
         super( codec, ldapMessage );
     }

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=1124671&r1=1124670&r2=1124671&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 Thu May 19 10:28:59 2011
@@ -25,7 +25,7 @@ import java.util.List; 
 
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
 import org.apache.directory.shared.ldap.codec.api.LdapConstants;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -76,7 +76,7 @@ public class SearchRequestDsml 
     /**
      * Creates a new getDecoratedMessage() of SearchRequestDsml.
      */
-    public SearchRequestDsml( LdapCodecService codec )
+    public SearchRequestDsml( LdapApiService codec )
     {
         super( codec, new SearchRequestImpl() );
     }
@@ -88,7 +88,7 @@ public class SearchRequestDsml 
      * @param ldapMessage
      *      the message to decorate
      */
-    public SearchRequestDsml( LdapCodecService codec, SearchRequest ldapMessage )
+    public SearchRequestDsml( LdapApiService codec, SearchRequest ldapMessage )
     {
         super( codec, ldapMessage );
     }

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractResponseTest.java:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:965208-965686

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java?rev=1124671&r1=1124670&r2=1124671&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java Thu May 19 10:28:59 2011
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 
 import org.apache.directory.shared.dsmlv2.request.Dsmlv2Grammar;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
-import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.codec.api.LdapApiService;
+import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
@@ -37,7 +37,7 @@ import org.xmlpull.v1.XmlPullParserExcep
 public abstract class AbstractTest
 {
     /** The LDAP encoder decoder service */
-    private LdapCodecService codec = LdapCodecServiceFactory.getSingleton();
+    private LdapApiService codec = LdapApiServiceFactory.getSingleton();
     
     private Dsmlv2Grammar grammar = new Dsmlv2Grammar();
     
@@ -48,7 +48,7 @@ public abstract class AbstractTest
     }
     
     
-    public LdapCodecService getCodec()
+    public LdapApiService getCodec()
     {
         return codec;
     }

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AbstractTest.java:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/AllTests.java:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/abandonRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/addResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/authRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/authResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/batchRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/batchResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/compareRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/compareResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/delRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/delResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/errorResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/extendedRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/extendedResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modDNRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modDNResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modifyRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modifyResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/SearchResponseTest.java:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultDone:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultEntry:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultReference:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/abandonRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/addRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/addResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/authRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/authResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/batchRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/batchResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:965208-965686

Propchange: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 10:28:59 2011
@@ -2,6 +2,7 @@
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:980352-980933
+/directory/shared/branches/shared-osgi/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:1103720-1124653
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/compareRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:965208-965686



Mime
View raw message