directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1086930 - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/replication/ core/src/main/java/org/apache/directory/server/core/ core/src/main/java/org/apache/directory/server/core/referral/ protocol-ldap/s...
Date Wed, 30 Mar 2011 12:31:02 GMT
Author: elecharny
Date: Wed Mar 30 12:31:02 2011
New Revision: 1086930

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

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/replication/ReplicationProvider.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/replication/ReplicationProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/replication/ReplicationProvider.java?rev=1086930&r1=1086929&r2=1086930&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/replication/ReplicationProvider.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/replication/ReplicationProvider.java
Wed Mar 30 12:31:02 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.server.core.replication;
 
 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;
 
 /**
  * The replication provider data structure.
@@ -42,7 +42,7 @@ public class ReplicationProvider
     private int timeLimit = 0;
     
     /** The search operation to conduct */
-    private LdapURL url;
+    private LdapUrl url;
     
     /** The connection to the replica */
     private ReplicaConnection connection;
@@ -147,7 +147,7 @@ public class ReplicationProvider
     /**
      * @return the url
      */
-    public LdapURL getUrl()
+    public LdapUrl getUrl()
     {
         return url;
     }
@@ -161,7 +161,7 @@ public class ReplicationProvider
     {
         try
         {
-            this.url = new LdapURL( url );
+            this.url = new LdapUrl( url );
         }
         catch ( LdapURLEncodingException luee )
         {

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java?rev=1086930&r1=1086929&r2=1086930&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultOperationManager.java
Wed Mar 30 12:31:02 2011
@@ -53,10 +53,10 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapReferralException;
 import org.apache.directory.shared.ldap.model.exception.LdapServiceUnavailableException;
 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.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.message.SearchScope;
 import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -98,7 +98,7 @@ public class DefaultOperationManager imp
             for ( Value<?> url : refs )
             {
                 // we have to replace the parent by the referral
-                LdapURL ldapUrl = new LdapURL( url.getString() );
+                LdapUrl ldapUrl = new LdapUrl( url.getString() );
     
                 // We have a problem with the Dn : we can't use the UpName,
                 // as we may have some spaces around the ',' and '+'.
@@ -140,7 +140,7 @@ public class DefaultOperationManager imp
             // we have to replace the parent by the referral
             try
             {
-                LdapURL ldapUrl = new LdapURL( url.getString() );
+                LdapUrl ldapUrl = new LdapUrl( url.getString() );
 
                 StringBuilder urlString = new StringBuilder();
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1086930&r1=1086929&r2=1086930&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
Wed Mar 30 12:31:02 2011
@@ -37,15 +37,15 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
+import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.model.message.SearchScope;
 import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -76,7 +76,7 @@ public class ReferralInterceptor extends
 
         String refVal = ref.getString();
 
-        LdapURL ldapUrl = new LdapURL( refVal );
+        LdapUrl ldapUrl = new LdapUrl( refVal );
 
         // We have a LDAP URL, we have to check that :
         // - we don't have scope specifier

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1086930&r1=1086929&r2=1086930&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
Wed Mar 30 12:31:02 2011
@@ -50,7 +50,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.OperationAbandonedException;
 import org.apache.directory.shared.ldap.model.filter.EqualityNode;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.filter.OrNode;
 import org.apache.directory.shared.ldap.model.filter.PresenceNode;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
@@ -71,6 +70,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -846,7 +846,7 @@ public class SearchHandler extends LdapR
                     respRef.getReferral().addLdapUrl( url );
                 }
 
-                LdapURL ldapUrl = new LdapURL();
+                LdapUrl ldapUrl = new LdapUrl();
                 ldapUrl.setForceScopeRendering( true );
                 try
                 {
@@ -1246,7 +1246,7 @@ public class SearchHandler extends LdapR
             }
 
             // parse the ref value and normalize the Dn
-            LdapURL ldapUrl = new LdapURL();
+            LdapUrl ldapUrl = new LdapUrl();
             try
             {
                 ldapUrl.parse( refstr.toCharArray() );
@@ -1375,7 +1375,7 @@ public class SearchHandler extends LdapR
             }
 
             // Parse the ref value
-            LdapURL ldapUrl = new LdapURL();
+            LdapUrl ldapUrl = new LdapUrl();
             try
             {
                 ldapUrl.parse( ref.toCharArray() );
@@ -1447,7 +1447,7 @@ public class SearchHandler extends LdapR
             }
 
             // parse the ref value and normalize the Dn
-            LdapURL ldapUrl = new LdapURL();
+            LdapUrl ldapUrl = new LdapUrl();
             try
             {
                 ldapUrl.parse( ref.toCharArray() );
@@ -1496,7 +1496,7 @@ public class SearchHandler extends LdapR
             }
 
             buf.append( "/" );
-            buf.append( LdapURL.urlEncode( urlDn.getName(), false ) );
+            buf.append( LdapUrl.urlEncode( urlDn.getName(), false ) );
             referral.addLdapUrl( buf.toString() );
         }
 

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=1086930&r1=1086929&r2=1086930&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
Wed Mar 30 12:31:02 2011
@@ -69,7 +69,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.filter.EqualityNode;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.GreaterEqNode;
-import org.apache.directory.shared.ldap.model.filter.LdapURL;
 import org.apache.directory.shared.ldap.model.filter.LessEqNode;
 import org.apache.directory.shared.ldap.model.filter.OrNode;
 import org.apache.directory.shared.ldap.model.filter.PresenceNode;
@@ -88,6 +87,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.SearchScope;
 import org.apache.directory.shared.ldap.model.message.controls.ManageDsaIT;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.url.LdapUrl;
 import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -627,7 +627,7 @@ public class SyncReplProvider implements
                     respRef.getReferral().addLdapUrl( url );
                 }
 
-                LdapURL ldapUrl = new LdapURL();
+                LdapUrl ldapUrl = new LdapUrl();
                 ldapUrl.setForceScopeRendering( true );
                 try
                 {



Mime
View raw message