directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1086921 [1/2] - in /directory/shared/trunk: dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/ dsml/parser/src/test/java/org/apache/directory/shar...
Date Wed, 30 Mar 2011 12:14:40 GMT
Author: elecharny
Date: Wed Mar 30 12:14:39 2011
New Revision: 1086921

URL: http://svn.apache.org/viewvc?rev=1086921&view=rev
Log:
Moved and renamed the LdapURL class to the url package with the LdapUrl name

Added:
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/url/
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/url/LdapUrl.java
      - copied, changed from r1086907, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LdapURL.java
Removed:
    directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LdapURL.java
Modified:
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
    directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
    directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/AddReferral.java
    directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchResultReference/StoreReference.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnect.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectGrammar.java
    directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectResponseDecorator.java
    directory/shared/trunk/ldap/extras/trigger/src/main/antlr/TriggerSpecification.g
    directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java

Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Wed Mar 30 12:14:39 2011
@@ -45,7 +45,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.AddResponseImpl;
 import org.apache.directory.shared.ldap.model.message.BindResponseImpl;
 import org.apache.directory.shared.ldap.model.message.CompareResponseImpl;
@@ -67,6 +66,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.SearchResultReferenceImpl;
 import org.apache.directory.shared.ldap.model.message.controls.OpaqueControl;
 import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Base64;
 import org.apache.directory.shared.util.Strings;
 import org.xmlpull.v1.XmlPullParser;
@@ -1527,7 +1527,7 @@ public final class Dsmlv2ResponseGrammar
                     try
                     {
                         String urlStr = nextText.trim();
-                        LdapURL ldapUrl = new LdapURL( urlStr );
+                        LdapUrl ldapUrl = new LdapUrl( urlStr );
                         ldapResult.getReferral().addLdapUrl( ldapUrl.toString() );
                     }
                     catch ( LdapURLEncodingException e )
@@ -1800,7 +1800,7 @@ public final class Dsmlv2ResponseGrammar
 
                 if ( !nextText.equals( "" ) )
                 {
-                    LdapURL ldapUrl = new LdapURL( nextText );
+                    LdapUrl ldapUrl = new LdapUrl( nextText );
 
                     searchResultReference.getReferral().addLdapUrl( ldapUrl.toString() );
                 }

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=1086921&r1=1086920&r2=1086921&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 Wed Mar 30 12:14:39 2011
@@ -26,12 +26,12 @@ 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.model.filter.LdapURL;
 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;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.dom4j.Element;
 
 
@@ -185,7 +185,7 @@ public class LdapResultDsml implements D
      * 
      * @param referral The referral to add.
      */
-    public void addReferral( LdapURL referral )
+    public void addReferral( LdapUrl referral )
     {
         result.getReferral().addLdapUrl( referral.toString() );
     }

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=1086921&r1=1086920&r2=1086921&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 Wed Mar 30 12:14:39 2011
@@ -23,11 +23,11 @@ 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.model.filter.LdapURL;
 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;
 import org.apache.directory.shared.ldap.model.message.SearchResultReferenceImpl;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.dom4j.Element;
 import org.dom4j.tree.DefaultElement;
 
@@ -106,7 +106,7 @@ public class SearchResultReferenceDsml 
      * 
      * @param searchResultReference The search result reference
      */
-    public void addSearchResultReference( LdapURL searchResultReference )
+    public void addSearchResultReference( LdapUrl searchResultReference )
     {
         getDecorated().getReferral().addLdapUrl( searchResultReference.toString() );
     }

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java Wed Mar 30 12:14:39 2011
@@ -35,11 +35,11 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.AddResponse;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -470,7 +470,7 @@ public class AddResponseTest extends Abs
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java Wed Mar 30 12:14:39 2011
@@ -35,11 +35,11 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.BindResponse;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -373,7 +373,7 @@ public class AuthResponseTest extends Ab
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -444,7 +444,7 @@ public class AuthResponseTest extends Ab
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -453,7 +453,7 @@ public class AuthResponseTest extends Ab
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apple.com/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apple.com/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -493,7 +493,7 @@ public class AuthResponseTest extends Ab
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java Wed Mar 30 12:14:39 2011
@@ -35,11 +35,11 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.CompareResponse;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -374,7 +374,7 @@ public class CompareResponseTest extends
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -445,7 +445,7 @@ public class CompareResponseTest extends
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -454,7 +454,7 @@ public class CompareResponseTest extends
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apple.com/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apple.com/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -494,7 +494,7 @@ public class CompareResponseTest extends
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java Wed Mar 30 12:14:39 2011
@@ -35,11 +35,11 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.DeleteResponse;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -371,7 +371,7 @@ public class DelResponseTest extends Abs
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -442,7 +442,7 @@ public class DelResponseTest extends Abs
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -451,7 +451,7 @@ public class DelResponseTest extends Abs
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apple.com/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apple.com/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -491,7 +491,7 @@ public class DelResponseTest extends Abs
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Wed Mar 30 12:14:39 2011
@@ -38,11 +38,11 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.ExtendedResponseDsml;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -377,7 +377,7 @@ public class ExtendedResponseTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -448,7 +448,7 @@ public class ExtendedResponseTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -457,7 +457,7 @@ public class ExtendedResponseTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apple.com/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apple.com/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -497,7 +497,7 @@ public class ExtendedResponseTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java Wed Mar 30 12:14:39 2011
@@ -31,21 +31,22 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Modify Dn Response parsing
@@ -373,7 +374,7 @@ public class ModifyDNResponseTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -444,7 +445,7 @@ public class ModifyDNResponseTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -453,7 +454,7 @@ public class ModifyDNResponseTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apple.com/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apple.com/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -493,7 +494,7 @@ public class ModifyDNResponseTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java Wed Mar 30 12:14:39 2011
@@ -31,21 +31,22 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.ModifyResponse;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Modify Response parsing
@@ -373,7 +374,7 @@ public class ModifyResponseTest extends 
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -444,7 +445,7 @@ public class ModifyResponseTest extends 
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -453,7 +454,7 @@ public class ModifyResponseTest extends 
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apple.com/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apple.com/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -493,7 +494,7 @@ public class ModifyResponseTest extends 
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Wed Mar 30 12:14:39 2011
@@ -31,22 +31,23 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.message.SearchResultDone;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Search Result Done Response parsing
@@ -385,7 +386,7 @@ public class SearchResultDoneTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -459,7 +460,7 @@ public class SearchResultDoneTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -468,7 +469,7 @@ public class SearchResultDoneTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apple.com/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apple.com/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -509,7 +510,7 @@ public class SearchResultDoneTest extend
 
         try
         {
-            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
+            assertTrue( referrals.contains( new LdapUrl( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {

Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java (original)
+++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java Wed Mar 30 12:14:39 2011
@@ -30,20 +30,21 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.Control;
 import org.apache.directory.shared.ldap.model.message.SearchResultReference;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Search Result Reference Response parsing
@@ -275,7 +276,7 @@ public class SearchResultReferenceTest e
 
         try
         {
-            assertTrue( references.contains( new LdapURL( "ldap://localhost" ).toString() ) );
+            assertTrue( references.contains( new LdapUrl( "ldap://localhost" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -344,7 +345,7 @@ public class SearchResultReferenceTest e
 
         try
         {
-            assertTrue( references.contains( new LdapURL( "ldap://localhost" ).toString() ) );
+            assertTrue( references.contains( new LdapUrl( "ldap://localhost" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -353,7 +354,7 @@ public class SearchResultReferenceTest e
 
         try
         {
-            assertTrue( references.contains( new LdapURL( "ldap://www.apache.org" ).toString() ) );
+            assertTrue( references.contains( new LdapUrl( "ldap://www.apache.org" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/AddReferral.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/AddReferral.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/AddReferral.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/ldapResult/AddReferral.java Wed Mar 30 12:14:39 2011
@@ -27,12 +27,12 @@ import org.apache.directory.shared.i18n.
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 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;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.message.ResultResponse;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -85,7 +85,7 @@ public class AddReferral extends Grammar
             {
                 try
                 {
-                    referral.addLdapUrl( new LdapURL( tlv.getValue().getData() ).toString() );
+                    referral.addLdapUrl( new LdapUrl( tlv.getValue().getData() ).toString() );
                 }
                 catch ( LdapURLEncodingException luee )
                 {
@@ -97,7 +97,7 @@ public class AddReferral extends Grammar
             else
             {
                 LOG.warn( "The Referral error message is not allowed when havind an error code no equals to REFERRAL" );
-                referral.addLdapUrl( LdapURL.EMPTY_URL.toString() );
+                referral.addLdapUrl( LdapUrl.EMPTY_URL.toString() );
             }
         }
 

Modified: directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchResultReference/StoreReference.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchResultReference/StoreReference.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchResultReference/StoreReference.java (original)
+++ directory/shared/trunk/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/actions/searchResultReference/StoreReference.java Wed Mar 30 12:14:39 2011
@@ -27,10 +27,10 @@ import org.apache.directory.shared.i18n.
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.SearchResultReferenceDecorator;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.Referral;
 import org.apache.directory.shared.ldap.model.message.ReferralImpl;
 import org.apache.directory.shared.ldap.model.message.SearchResultReference;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -82,7 +82,7 @@ public class StoreReference extends Gram
         }
 
         // We have to handle the special case of a 0 length list of referrals
-        LdapURL url = LdapURL.EMPTY_URL;
+        LdapUrl url = LdapUrl.EMPTY_URL;
 
         if ( tlv.getLength() == 0 )
         {
@@ -94,7 +94,7 @@ public class StoreReference extends Gram
 
             try
             {
-                url = new LdapURL( urlStr );
+                url = new LdapUrl( urlStr );
                 referral.addLdapUrl( urlStr );
             }
             catch ( LdapURLEncodingException luee )

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnect.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnect.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnect.java Wed Mar 30 12:14:39 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 
 
 /**
@@ -49,7 +49,7 @@ public class GracefulDisconnect extends 
 {
     /** List of the alternate servers to use */
     // Two urls will be enough, generally
-    private List<LdapURL> replicatedContexts = new ArrayList<LdapURL>( 2 );
+    private List<LdapUrl> replicatedContexts = new ArrayList<LdapUrl>( 2 );
 
     /** Length of the sequence */
     private int gracefulDisconnectSequenceLength;
@@ -84,7 +84,7 @@ public class GracefulDisconnect extends 
      * 
      * @return The list of replicated servers
      */
-    public List<LdapURL> getReplicatedContexts()
+    public List<LdapUrl> getReplicatedContexts()
     {
         return replicatedContexts;
     }
@@ -95,7 +95,7 @@ public class GracefulDisconnect extends 
      * 
      * @param replicatedContext The replictaed server to add.
      */
-    public void addReplicatedContexts( LdapURL replicatedContext )
+    public void addReplicatedContexts( LdapUrl replicatedContext )
     {
         replicatedContexts.add( replicatedContext );
     }
@@ -131,7 +131,7 @@ public class GracefulDisconnect extends 
             replicatedContextsLength = 0;
 
             // We may have more than one reference.
-            for ( LdapURL replicatedContext:replicatedContexts )
+            for ( LdapUrl replicatedContext:replicatedContexts )
             {
                 int ldapUrlLength = replicatedContext.getNbBytes();
                 replicatedContextsLength += 1 + TLV.getNbBytes( ldapUrlLength ) + ldapUrlLength;
@@ -177,7 +177,7 @@ public class GracefulDisconnect extends 
             bb.put( TLV.getBytes( replicatedContextsLength ) );
 
             // We may have more than one reference.
-            for ( LdapURL replicatedContext:replicatedContexts )
+            for ( LdapUrl replicatedContext:replicatedContexts )
             {
                 Value.encode( bb, replicatedContext.getBytesReference() );
             }
@@ -203,7 +203,7 @@ public class GracefulDisconnect extends 
             sb.append( "    Replicated contexts :" );
 
             // We may have more than one reference.
-            for ( LdapURL url:replicatedContexts )
+            for ( LdapUrl url:replicatedContexts )
             {
                 sb.append( "\n        " ).append( url );
             }

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectGrammar.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectGrammar.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectGrammar.java Wed Mar 30 12:14:39 2011
@@ -24,13 +24,13 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarTransition;
+import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoderException;
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
-import org.apache.directory.shared.asn1.ber.tlv.IntegerDecoder;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -112,7 +112,7 @@ public final class GracefulDisconnectGra
 
             try
             {
-                LdapURL url = new LdapURL( value.getData() );
+                LdapUrl url = new LdapUrl( value.getData() );
                 container.getGracefulDisconnect().addReplicatedContexts( url );
                 container.setGrammarEndAllowed( true );
                 

Modified: directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectResponseDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectResponseDecorator.java?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectResponseDecorator.java (original)
+++ directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/extended/ads_impl/GracefulDisconnectResponseDecorator.java Wed Mar 30 12:14:39 2011
@@ -32,10 +32,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponse;
 import org.apache.directory.shared.ldap.extras.extended.GracefulDisconnectResponseImpl;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.message.Referral;
 import org.apache.directory.shared.ldap.model.message.ReferralImpl;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -91,9 +91,9 @@ public class GracefulDisconnectResponseD
             getDecorated().setTimeOffline( codec.getTimeOffline() );
             getDecorated().setDelay( codec.getDelay() );
             getDecorated().getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
-            List<LdapURL> contexts = codec.getReplicatedContexts();
+            List<LdapUrl> contexts = codec.getReplicatedContexts();
 
-            for ( LdapURL ldapUrl : contexts )
+            for ( LdapUrl ldapUrl : contexts )
             {
                 getDecorated().getLdapResult().getReferral().addLdapUrl( ldapUrl.toString() );
             }
@@ -115,11 +115,11 @@ public class GracefulDisconnectResponseD
 
         for ( String ldapUrlStr : getDecorated().getLdapResult().getReferral().getLdapUrls() )
         {
-            LdapURL ldapUrl = null;
+            LdapUrl ldapUrl = null;
 
             try
             {
-                ldapUrl = new LdapURL( ldapUrlStr );
+                ldapUrl = new LdapUrl( ldapUrlStr );
             }
             catch ( LdapURLEncodingException e )
             {
@@ -200,7 +200,7 @@ public class GracefulDisconnectResponseD
         getDecorated().setDelay( codec.getDelay() );
         getDecorated().setTimeOffline( codec.getTimeOffline() );
 
-        for ( LdapURL ldapUrl : codec.getReplicatedContexts() )
+        for ( LdapUrl ldapUrl : codec.getReplicatedContexts() )
         {
             getDecorated().getLdapResult().getReferral().addLdapUrl( ldapUrl.toString() );
         }

Modified: directory/shared/trunk/ldap/extras/trigger/src/main/antlr/TriggerSpecification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/extras/trigger/src/main/antlr/TriggerSpecification.g?rev=1086921&r1=1086920&r2=1086921&view=diff
==============================================================================
--- directory/shared/trunk/ldap/extras/trigger/src/main/antlr/TriggerSpecification.g (original)
+++ directory/shared/trunk/ldap/extras/trigger/src/main/antlr/TriggerSpecification.g Wed Mar 30 12:14:39 2011
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.trigger.StoredProcedureOption;
 import org.apache.directory.shared.ldap.trigger.StoredProcedureParameter;
 import org.apache.directory.shared.ldap.trigger.TriggerSpecification.SPSpec;
-import org.apache.directory.shared.ldap.model.filter.SearchScope;
+import org.apache.directory.shared.ldap.model.message.SearchScope;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/url/LdapUrl.java (from r1086907, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LdapURL.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/url/LdapUrl.java?p2=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/url/LdapUrl.java&p1=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LdapURL.java&r1=1086907&r2=1086921&rev=1086921&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/filter/LdapURL.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/url/LdapUrl.java Wed Mar 30 12:14:39 2011
@@ -17,7 +17,7 @@
  *  under the License.
  *
  */
-package org.apache.directory.shared.ldap.model.filter;
+package org.apache.directory.shared.ldap.model.url;
 
 
 import java.io.ByteArrayOutputStream;
@@ -33,6 +33,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.model.exception.LdapUriException;
 import org.apache.directory.shared.ldap.model.exception.UrlDecoderException;
+import org.apache.directory.shared.ldap.model.filter.FilterParser;
 import org.apache.directory.shared.ldap.model.message.SearchScope;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.util.Chars;
@@ -64,7 +65,7 @@ import org.apache.directory.shared.util.
  * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LdapURL
+public class LdapUrl
 {
 
     // ~ Static fields/initializers
@@ -76,8 +77,8 @@ public class LdapURL
     /** The constant for "ldap://" scheme. */
     public static final String LDAP_SCHEME = "ldap://";
 
-    /** A null LdapURL */
-    public static final LdapURL EMPTY_URL = new LdapURL();
+    /** A null LdapUrl */
+    public static final LdapUrl EMPTY_URL = new LdapUrl();
 
     // ~ Instance fields
     // ----------------------------------------------------------------------------
@@ -106,23 +107,20 @@ public class LdapURL
     /** The extensions. */
     private List<Extension> extensionList;
 
-    /** Stores the LdapURL as a String */
+    /** Stores the LdapUrl as a String */
     private String string;
 
-    /** Stores the LdapURL as a byte array */
+    /** Stores the LdapUrl as a byte array */
     private byte[] bytes;
 
     /** modal parameter that forces explicit scope rendering in toString */
     private boolean forceScopeRendering;
 
 
-    // ~ Constructors
-    // -------------------------------------------------------------------------------
-
     /**
-     * Construct an empty LdapURL
+     * Construct an empty LdapUrl
      */
-    public LdapURL()
+    public LdapUrl()
     {
         scheme = LDAP_SCHEME;
         host = null;
@@ -136,7 +134,7 @@ public class LdapURL
 
 
     /**
-     * Parse a LdapURL
+     * Parse a LdapUrl
      * @param chars The chars containing the URL
      * @throws org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException If the URL is invalid
      */
@@ -294,12 +292,12 @@ public class LdapURL
 
 
     /**
-     * Create a new LdapURL from a String after having parsed it.
+     * Create a new LdapUrl from a String after having parsed it.
      *
-     * @param string TheString that contains the LDAPURL
+     * @param string TheString that contains the LdapUrl
      * @throws LdapURLEncodingException If the String does not comply with RFC 2255
      */
-    public LdapURL( String string ) throws LdapURLEncodingException
+    public LdapUrl( String string ) throws LdapURLEncodingException
     {
         if ( string == null )
         {
@@ -320,12 +318,12 @@ public class LdapURL
 
 
     /**
-     * Create a new LdapURL after having parsed it.
+     * Create a new LdapUrl after having parsed it.
      *
      * @param bytes The byte buffer that contains the LDAPURL
      * @throws LdapURLEncodingException If the byte array does not comply with RFC 2255
      */
-    public LdapURL( byte[] bytes ) throws LdapURLEncodingException
+    public LdapUrl( byte[] bytes ) throws LdapURLEncodingException
     {
         if ( ( bytes == null ) || ( bytes.length == 0 ) )
         {
@@ -1316,10 +1314,10 @@ public class LdapURL
 
 
     /**
-     * Get a string representation of a LdapURL.
+     * Get a string representation of a LdapUrl.
      *
-     * @return A LdapURL string
-     * @see LdapURL#forceScopeRendering
+     * @return A LdapUrl string
+     * @see LdapUrl#forceScopeRendering
      */
     @Override
     public String toString()
@@ -1558,7 +1556,7 @@ public class LdapURL
 
 
     /**
-     * @return the number of bytes for this LdapURL
+     * @return the number of bytes for this LdapUrl
      */
     public int getNbBytes()
     {
@@ -1567,7 +1565,7 @@ public class LdapURL
 
 
     /**
-     * @return a reference on the interned bytes representing this LdapURL
+     * @return a reference on the interned bytes representing this LdapUrl
      */
     public byte[] getBytesReference()
     {
@@ -1576,7 +1574,7 @@ public class LdapURL
 
 
     /**
-     * @return a copy of the bytes representing this LdapURL
+     * @return a copy of the bytes representing this LdapUrl
      */
     public byte[] getBytesCopy()
     {
@@ -1594,7 +1592,7 @@ public class LdapURL
 
 
     /**
-     * @return the LdapURL as a String
+     * @return the LdapUrl as a String
      */
     public String getString()
     {
@@ -1631,7 +1629,7 @@ public class LdapURL
             return false;
         }
 
-        final LdapURL other = ( LdapURL ) obj;
+        final LdapUrl other = ( LdapUrl ) obj;
         return this.toString().equals( other.toString() );
     }
 



Mime
View raw message