directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r477198 - in /directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core: event/ partition/impl/btree/ partition/impl/btree/gui/
Date Mon, 20 Nov 2006 14:32:11 GMT
Author: elecharny
Date: Mon Nov 20 06:32:10 2006
New Revision: 477198

URL: http://svn.apache.org/viewvc?view=rev&rev=477198
Log:
Changed the DerefAliasTypeEnum to become an enum instead of an subclass
of ValuedEnum (Java 5 migration)
Fixed the velocity templates to fix some bug related to enum switch

Modified:
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java?view=diff&rev=477198&r1=477197&r2=477198
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/event/EventService.java
Mon Nov 20 06:32:10 2006
@@ -144,7 +144,7 @@
         }
         
         
-        ScopeNode scope = new ScopeNode( DerefAliasesEnum.NEVERDEREFALIASES, normalizedBaseDn.toNormName(),

+        ScopeNode scope = new ScopeNode( DerefAliasesEnum.NEVER_DEREF_ALIASES, normalizedBaseDn.toNormName(),

             searchControls.getSearchScope() );
         
         if ( filter != null )

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java?view=diff&rev=477198&r1=477197&r2=477198
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
Mon Nov 20 06:32:10 2006
@@ -104,7 +104,7 @@
          * occur on finding the base then we set the effective base to the
          * given base.
          */
-        if ( null == aliasedBase || !mode.derefFindingBase() )
+        if ( ( null == aliasedBase ) || !mode.isDerefFindingBase() )
         {
             effectiveBase = base;
         }

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java?view=diff&rev=477198&r1=477197&r2=477198
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
Mon Nov 20 06:32:10 2006
@@ -74,7 +74,7 @@
                 record.setIndexKey( snode.getBaseDn() );
                 return new SingletonEnumeration( record );
             case ( SearchControls.ONELEVEL_SCOPE  ):
-                return enumerateChildren( snode.getBaseDn(), snode.getDerefAliases().derefInSearching()
);
+                return enumerateChildren( snode.getBaseDn(), snode.getDerefAliases().isDerefInSearching()
);
             case ( SearchControls.SUBTREE_SCOPE  ):
                 return enumerateDescendants( snode );
             default:
@@ -152,7 +152,7 @@
          * If we do not dereference while searching then we simply return any
          * entry that is not a descendant of the base.
          */
-        if ( !node.getDerefAliases().derefInSearching() )
+        if ( !node.getDerefAliases().isDerefInSearching() )
         {
             // Gets a NamingEnumeration over all elements
             idx = db.getNdnIndex();

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java?view=diff&rev=477198&r1=477197&r2=477198
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
Mon Nov 20 06:32:10 2006
@@ -97,7 +97,7 @@
          * dereferencing is not enabled then we return the results of the 
          * descendant test.
          */
-        if ( !mode.derefInSearching() )
+        if ( !mode.isDerefInSearching() )
         {
             return isDescendant;
         }
@@ -162,7 +162,7 @@
          * dereferencing is not enabled then we return the results of the child 
          * test. 
          */
-        if ( !mode.derefInSearching() )
+        if ( !mode.isDerefInSearching() )
         {
             return isChild;
         }

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?view=diff&rev=477198&r1=477197&r2=477198
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
Mon Nov 20 06:32:10 2006
@@ -647,7 +647,7 @@
 
         Hashtable env = new Hashtable();
 
-        env.put( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.DEREFALWAYS_NAME );
+        env.put( DerefAliasesEnum.JNDI_DEREF_ALIAS_PROP, DerefAliasesEnum.DEREF_ALWAYS_NAME
);
 
         NamingEnumeration cursor = eng.search( new LdapDN( base ), env, root, ctls );
         String[] cols = new String[2];



Mime
View raw message