svn commit: r915790 - /directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g

[el...@apache.org]

Author: elecharny
Date: Wed Feb 24 13:37:36 2010
New Revision: 915790

URL: http://svn.apache.org/viewvc?rev=915790&view=rev
Log:
o Removed the SearchScope class from trigger package
o Reflected the change on all the code
o Modified the SearchScope enum not to use any reference to jndi SearchControls

Modified:
    directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g

Modified: directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g?rev=915790&r1=915789&r2=915790&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g (original)
+++ directory/shared/trunk/ldap/src/main/antlr/TriggerSpecification.g Wed Feb 24 13:37:36 2010
@@ -31,6 +31,7 @@
 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.filter.SearchScope;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -384,7 +385,7 @@
 {
     log.debug( "entered storedProcedureSearchContextOption()" );
     spSearchContextOption = null;
-    SearchScope searchScope = SearchScope.BASE; // default scope
+    SearchScope searchScope = SearchScope.OBJECT; // default scope
     LdapDN spSearchContext = null;
 }
     :
@@ -401,8 +402,8 @@
     log.debug( "entered storedProcedureSearchScope()" );
     scope = null;
 }
-    : ID_scope_base { scope = SearchScope.BASE; }
-    | ID_scope_one { scope = SearchScope.ONE; }
+    : ID_scope_base { scope = SearchScope.OBJECT; }
+    | ID_scope_one { scope = SearchScope.ONELEVEL; }
     | ID_scope_subtree { scope = SearchScope.SUBTREE; }
     ;