directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1424451 [1/2] - in /directory: apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authz/support/ apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/a...
Date Thu, 20 Dec 2012 13:17:22 GMT
Author: elecharny
Date: Thu Dec 20 13:17:20 2012
New Revision: 1424451

URL: http://svn.apache.org/viewvc?rev=1424451&view=rev
Log:
Renamed the shared-ldap-extras-aci package

Added:
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItem.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemChecker.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemChecker.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemParser.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemSyntaxChecker.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACITuple.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACITuple.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/GrantAndDenial.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ItemFirstACIItem.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemFirstACIItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ItemPermission.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemPermission.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/MicroOperation.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/MicroOperation.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/Permission.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/Permission.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ProtectedItem.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemChecker.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ReusableAntlrACIItemChecker.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemCheckerLexer.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ReusableAntlrACIItemCheckerLexer.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemLexer.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ReusableAntlrACIItemLexer.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemParser.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ReusableAntlrACIItemParser.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/UserClass.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/UserFirstACIItem.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserFirstACIItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/UserPermission.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserPermission.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/
      - copied from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/ProtectedItem_AllAttributeValuesTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/ProtectedItem_AttributeTypeTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/ProtectedItem_AttributeValueTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/ProtectedItem_ClassesTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/ProtectedItem_MaxImmSubTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxImmSubTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/ProtectedItem_MaxValueCountTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/ProtectedItem_RangeOfValuesTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/ProtectedItem_RestrictedByTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/ProtectedItem_SelfValueTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/UserClass_NameTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/UserClass_SubtreeTest.java
      - copied, changed from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/protectedItem/
      - copied from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/
Removed:
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/
Modified:
    directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterIT.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
    directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
    directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/aci/ACIItemChekerTest.java
    directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/aci/ACIItemParserTest.java
    directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/schema/syntaxCheckers/ACIItemSyntaxCheckerTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/antlr/ACIItem.g
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/antlr/ACIItemChecker.g
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AllAttributeValuesItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AllUserAttributeTypesAndValuesItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AllUserAttributeTypesItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AttributeTypeItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/AttributeValueItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/ClassesItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/EntryItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/MaxImmSubItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/MaxValueCountElem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/MaxValueCountItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/RangeOfValuesItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/RestrictedByElem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/RestrictedByItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/protectedItem/SelfValueItem.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/protectedItem/AttributeValueItemTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/protectedItem/ClassesItemTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/protectedItem/MaxImmSubItemTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/protectedItem/MaxValueCountItemTest.java
    directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/api/ldap/aci/protectedItem/RestrictedByItemTest.java
    directory/shared/branches/shared-refact/ldap/schema/data/pom.xml
    directory/shared/branches/shared-refact/ldap/schema/data/src/main/resources/schema/ou=schema/cn=system/ou=syntaxcheckers/m-oid=1.3.6.1.4.1.1466.115.121.1.1.ldif
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/ItemPermissionDialog.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapper.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemGrantsAndDenialsComposite.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemItemPermissionsComposite.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemProtectedItemsComposite.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemSourceEditorComposite.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserClassesComposite.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemUserPermissionsComposite.java
    directory/studio/branches/studio-refact/plugins/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/widgets/ACIItemVisualEditorComposite.java

Modified: directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterIT.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterIT.java (original)
+++ directory/apacheds/branches/apacheds-refact/core-integ/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterIT.java Thu Dec 20 13:17:20 2012
@@ -28,6 +28,11 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.UserClass;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxImmSubItem;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.api.ldap.model.entry.DefaultEntry;
 import org.apache.directory.api.ldap.model.entry.Entry;
@@ -37,11 +42,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.UserClass;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Thu Dec 20 13:17:20 2012
@@ -30,6 +30,10 @@ import java.util.Set;
 
 import javax.naming.directory.SearchControls;
 
+import org.apache.directory.api.ldap.aci.ACIItem;
+import org.apache.directory.api.ldap.aci.ACIItemParser;
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.api.ldap.model.constants.Loggers;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
@@ -77,10 +81,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.authz.support.AciContext;
 import org.apache.directory.server.core.shared.DefaultCoreSession;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.aci.ACIItem;
-import org.apache.directory.shared.ldap.aci.ACIItemParser;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/TupleCache.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/TupleCache.java Thu Dec 20 13:17:20 2012
@@ -30,6 +30,9 @@ import java.util.Set;
 
 import javax.naming.directory.SearchControls;
 
+import org.apache.directory.api.ldap.aci.ACIItem;
+import org.apache.directory.api.ldap.aci.ACIItemParser;
+import org.apache.directory.api.ldap.aci.ACITuple;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
 import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.api.ldap.model.entry.Entry;
@@ -54,9 +57,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.api.partition.PartitionNexus;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.aci.ACIItem;
-import org.apache.directory.shared.ldap.aci.ACIItemParser;
-import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACDFEngine.java Thu Dec 20 13:17:20 2012
@@ -23,6 +23,7 @@ package org.apache.directory.server.core
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -35,7 +36,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.subtree.SubtreeEvaluator;
 import org.apache.directory.server.core.api.subtree.RefinementEvaluator;
 import org.apache.directory.server.core.api.subtree.RefinementLeafEvaluator;
-import org.apache.directory.shared.ldap.aci.ACITuple;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/ACITupleFilter.java Thu Dec 20 13:17:20 2012
@@ -22,10 +22,10 @@ package org.apache.directory.server.core
 
 import java.util.Collection;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
 import org.apache.directory.api.ldap.model.constants.Loggers;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/AciContext.java Thu Dec 20 13:17:20 2012
@@ -22,6 +22,8 @@ package org.apache.directory.server.core
 
 import java.util.Collection;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.entry.Value;
@@ -29,8 +31,6 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.api.interceptor.context.OperationContext;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilter.java Thu Dec 20 13:17:20 2012
@@ -23,9 +23,9 @@ package org.apache.directory.server.core
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.aci.ACITuple;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxImmSubFilter.java Thu Dec 20 13:17:20 2012
@@ -25,6 +25,9 @@ import java.util.Iterator;
 
 import javax.naming.directory.SearchControls;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxImmSubItem;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -39,14 +42,11 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.api.interceptor.context.OperationContext;
 import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
 
 
 /**
  * An {@link ACITupleFilter} that discards all tuples that doesn't satisfy
- * {@link org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem} constraint if available. (18.8.3.3, X.501)
+ * {@link org.apache.directory.api.ldap.aci.protectedItem.MaxImmSubItem} constraint if available. (18.8.3.3, X.501)
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MaxValueCountFilter.java Thu Dec 20 13:17:20 2012
@@ -23,19 +23,19 @@ package org.apache.directory.server.core
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountItem;
 import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
 
 
 /**
  * An {@link ACITupleFilter} that discards all tuples that doesn't satisfy
- * {@link org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem} constraint if available. (18.8.3.3, X.501)
+ * {@link org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountItem} constraint if available. (18.8.3.3, X.501)
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MicroOperationFilter.java Thu Dec 20 13:17:20 2012
@@ -23,10 +23,10 @@ package org.apache.directory.server.core
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilter.java Thu Dec 20 13:17:20 2012
@@ -23,15 +23,15 @@ package org.apache.directory.server.core
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AllAttributeValuesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AttributeTypeItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AttributeValueItem;
+import org.apache.directory.api.ldap.aci.protectedItem.RangeOfValuesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.SelfValueItem;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AllAttributeValuesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AttributeTypeItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AttributeValueItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RangeOfValuesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilter.java Thu Dec 20 13:17:20 2012
@@ -23,10 +23,10 @@ package org.apache.directory.server.core
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.UserClass;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.UserClass;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilter.java Thu Dec 20 13:17:20 2012
@@ -23,6 +23,19 @@ package org.apache.directory.server.core
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AllAttributeValuesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AttributeTypeItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AttributeValueItem;
+import org.apache.directory.api.ldap.aci.protectedItem.ClassesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxImmSubItem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountItem;
+import org.apache.directory.api.ldap.aci.protectedItem.RangeOfValuesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.api.ldap.aci.protectedItem.RestrictedByItem;
+import org.apache.directory.api.ldap.aci.protectedItem.SelfValueItem;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
 import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.api.ldap.model.entry.Entry;
@@ -34,19 +47,6 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.server.core.api.event.Evaluator;
 import org.apache.directory.server.core.api.subtree.RefinementEvaluator;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AllAttributeValuesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AttributeTypeItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AttributeValueItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.ClassesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RangeOfValuesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilter.java Thu Dec 20 13:17:20 2012
@@ -24,14 +24,14 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.UserClass;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.subtree.SubtreeSpecification;
 import org.apache.directory.server.core.api.subtree.SubtreeEvaluator;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.UserClass;
 
 
 /**

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/support/RestrictedByFilter.java Thu Dec 20 13:17:20 2012
@@ -23,20 +23,20 @@ package org.apache.directory.server.core
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.api.ldap.aci.protectedItem.RestrictedByItem;
 import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.entry.Value;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
 
 
 /**
  * An {@link ACITupleFilter} that discards all tuples that doesn't satisfy
- * {@link org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem} constraint if available. (18.8.3.3, X.501)
+ * {@link org.apache.directory.api.ldap.aci.protectedItem.RestrictedByItem} constraint if available. (18.8.3.3, X.501)
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java Thu Dec 20 13:17:20 2012
@@ -32,11 +32,11 @@ import java.util.Set;
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.UserClass;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.UserClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Thu Dec 20 13:17:20 2012
@@ -28,18 +28,18 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.UserClass;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountItem;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.api.ldap.model.entry.DefaultEntry;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.UserClass;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
 import org.junit.Test;

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java Thu Dec 20 13:17:20 2012
@@ -31,11 +31,11 @@ import java.util.Set;
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.UserClass;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.UserClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java Thu Dec 20 13:17:20 2012
@@ -33,19 +33,19 @@ import java.util.Set;
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.UserClass;
+import org.apache.directory.api.ldap.aci.protectedItem.AllAttributeValuesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AttributeTypeItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AttributeValueItem;
+import org.apache.directory.api.ldap.aci.protectedItem.RangeOfValuesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.SelfValueItem;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.api.ldap.model.filter.PresenceNode;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.UserClass;
-import org.apache.directory.shared.ldap.aci.protectedItem.AllAttributeValuesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AttributeTypeItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AttributeValueItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RangeOfValuesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java Thu Dec 20 13:17:20 2012
@@ -33,13 +33,13 @@ import java.util.Set;
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.UserClass;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.subtree.SubtreeSpecification;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.UserClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Thu Dec 20 13:17:20 2012
@@ -28,6 +28,19 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.UserClass;
+import org.apache.directory.api.ldap.aci.protectedItem.AllAttributeValuesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AttributeTypeItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AttributeValueItem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxImmSubItem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountItem;
+import org.apache.directory.api.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.api.ldap.aci.protectedItem.RestrictedByItem;
+import org.apache.directory.api.ldap.aci.protectedItem.SelfValueItem;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
@@ -40,19 +53,6 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.server.core.api.event.ExpressionEvaluator;
 import org.apache.directory.server.core.api.subtree.RefinementEvaluator;
 import org.apache.directory.server.core.api.subtree.RefinementLeafEvaluator;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.UserClass;
-import org.apache.directory.shared.ldap.aci.protectedItem.AllAttributeValuesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AttributeTypeItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AttributeValueItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
 import org.junit.Test;

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java Thu Dec 20 13:17:20 2012
@@ -28,15 +28,15 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.UserClass;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.server.core.api.subtree.SubtreeEvaluator;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.UserClass;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
 import org.junit.Test;

Modified: directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-refact/interceptors/authz/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Thu Dec 20 13:17:20 2012
@@ -28,6 +28,13 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.aci.ACITuple;
+import org.apache.directory.api.ldap.aci.MicroOperation;
+import org.apache.directory.api.ldap.aci.ProtectedItem;
+import org.apache.directory.api.ldap.aci.UserClass;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxImmSubItem;
+import org.apache.directory.api.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.api.ldap.aci.protectedItem.RestrictedByItem;
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.api.ldap.model.entry.DefaultEntry;
 import org.apache.directory.api.ldap.model.entry.Entry;
@@ -35,13 +42,6 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.aci.ACITuple;
-import org.apache.directory.shared.ldap.aci.MicroOperation;
-import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.aci.UserClass;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
 import org.junit.Test;

Modified: directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/aci/ACIItemChekerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/aci/ACIItemChekerTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/aci/ACIItemChekerTest.java (original)
+++ directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/aci/ACIItemChekerTest.java Thu Dec 20 13:17:20 2012
@@ -25,8 +25,8 @@ import static org.junit.Assert.fail;
 
 import java.text.ParseException;
 
+import org.apache.directory.api.ldap.aci.ACIItemChecker;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.aci.ACIItemChecker;
 import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;

Modified: directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/aci/ACIItemParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/aci/ACIItemParserTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/aci/ACIItemParserTest.java (original)
+++ directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/aci/ACIItemParserTest.java Thu Dec 20 13:17:20 2012
@@ -27,11 +27,11 @@ import static org.junit.Assert.fail;
 
 import java.text.ParseException;
 
+import org.apache.directory.api.ldap.aci.ACIItem;
+import org.apache.directory.api.ldap.aci.ACIItemParser;
+import org.apache.directory.api.ldap.aci.UserFirstACIItem;
+import org.apache.directory.api.ldap.aci.UserPermission;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.aci.ACIItem;
-import org.apache.directory.shared.ldap.aci.ACIItemParser;
-import org.apache.directory.shared.ldap.aci.UserFirstACIItem;
-import org.apache.directory.shared.ldap.aci.UserPermission;
 import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;

Modified: directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/schema/syntaxCheckers/ACIItemSyntaxCheckerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/schema/syntaxCheckers/ACIItemSyntaxCheckerTest.java?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/schema/syntaxCheckers/ACIItemSyntaxCheckerTest.java (original)
+++ directory/shared/branches/shared-refact/integ/src/test/java/org/apache/directory/api/ldap/schema/syntaxCheckers/ACIItemSyntaxCheckerTest.java Thu Dec 20 13:17:20 2012
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.directory.api.ldap.aci.ACIItemSyntaxChecker;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.aci.ACIItemSyntaxChecker;
 import org.apache.directory.shared.ldap.schemaloader.JarLdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.BeforeClass;
@@ -54,7 +54,7 @@ public class ACIItemSyntaxCheckerTest
         JarLdifSchemaLoader loader = new JarLdifSchemaLoader();
         SchemaManager schemaManager = new DefaultSchemaManager( loader );
         schemaManager.loadAllEnabled();
-        checker = new org.apache.directory.shared.ldap.aci.ACIItemSyntaxChecker();
+        checker = new org.apache.directory.api.ldap.aci.ACIItemSyntaxChecker();
         checker.setSchemaManager( schemaManager );
     }
 

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/antlr/ACIItem.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/antlr/ACIItem.g?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/antlr/ACIItem.g (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/antlr/ACIItem.g Thu Dec 20 13:17:20 2012
@@ -21,7 +21,7 @@ header
  */
 
 
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import java.util.List;
@@ -58,18 +58,18 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.api.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.aci.protectedItem.AllAttributeValuesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AttributeTypeItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AttributeValueItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.ClassesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.EntryItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RangeOfValuesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxImmSubItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
-import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AllAttributeValuesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AttributeTypeItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AttributeValueItem;
+import org.apache.directory.api.ldap.aci.protectedItem.SelfValueItem;
+import org.apache.directory.api.ldap.aci.protectedItem.ClassesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.EntryItem;
+import org.apache.directory.api.ldap.aci.protectedItem.RangeOfValuesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxImmSubItem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountElem;
+import org.apache.directory.api.ldap.aci.protectedItem.MaxValueCountItem;
+import org.apache.directory.api.ldap.aci.protectedItem.RestrictedByElem;
+import org.apache.directory.api.ldap.aci.protectedItem.RestrictedByItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/antlr/ACIItemChecker.g
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/antlr/ACIItemChecker.g?rev=1424451&r1=1424450&r2=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/antlr/ACIItemChecker.g (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/antlr/ACIItemChecker.g Thu Dec 20 13:17:20 2012
@@ -21,7 +21,7 @@ header
  */
 
 
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import org.apache.directory.api.ldap.model.schema.normalizers.NameComponentNormalizer;

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItem.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItem.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItem.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItem.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItem.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItem.java Thu Dec 20 13:17:20 2012
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import java.util.Collection;

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemChecker.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemChecker.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemChecker.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemChecker.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemChecker.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemChecker.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemChecker.java Thu Dec 20 13:17:20 2012
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import java.io.StringReader;

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemParser.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemParser.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemParser.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemParser.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemParser.java Thu Dec 20 13:17:20 2012
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import java.io.StringReader;

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemSyntaxChecker.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemSyntaxChecker.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemSyntaxChecker.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACIItemSyntaxChecker.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACIItemSyntaxChecker.java Thu Dec 20 13:17:20 2012
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import java.text.ParseException;

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACITuple.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACITuple.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACITuple.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACITuple.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACITuple.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ACITuple.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ACITuple.java Thu Dec 20 13:17:20 2012
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import java.util.ArrayList;

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/GrantAndDenial.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/GrantAndDenial.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/GrantAndDenial.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/GrantAndDenial.java Thu Dec 20 13:17:20 2012
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 /**

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ItemFirstACIItem.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemFirstACIItem.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ItemFirstACIItem.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ItemFirstACIItem.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemFirstACIItem.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemFirstACIItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ItemFirstACIItem.java Thu Dec 20 13:17:20 2012
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import java.util.ArrayList;

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ItemPermission.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemPermission.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ItemPermission.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ItemPermission.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemPermission.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ItemPermission.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ItemPermission.java Thu Dec 20 13:17:20 2012
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import java.util.ArrayList;

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/MicroOperation.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/MicroOperation.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/MicroOperation.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/MicroOperation.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/MicroOperation.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/MicroOperation.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/MicroOperation.java Thu Dec 20 13:17:20 2012
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 /**

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/Permission.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/Permission.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/Permission.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/Permission.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/Permission.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/Permission.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/Permission.java Thu Dec 20 13:17:20 2012
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import java.util.Collection;

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ProtectedItem.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ProtectedItem.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ProtectedItem.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ProtectedItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ProtectedItem.java Thu Dec 20 13:17:20 2012
@@ -17,12 +17,12 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
-import org.apache.directory.shared.ldap.aci.protectedItem.AllUserAttributeTypesAndValuesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.AllUserAttributeTypesItem;
-import org.apache.directory.shared.ldap.aci.protectedItem.EntryItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AllUserAttributeTypesAndValuesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.AllUserAttributeTypesItem;
+import org.apache.directory.api.ldap.aci.protectedItem.EntryItem;
 
 
 /**

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemChecker.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ReusableAntlrACIItemChecker.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemChecker.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemChecker.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ReusableAntlrACIItemChecker.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ReusableAntlrACIItemChecker.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemChecker.java Thu Dec 20 13:17:20 2012
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import antlr.TokenStream;

Copied: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemCheckerLexer.java (from r1424407, directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ReusableAntlrACIItemCheckerLexer.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemCheckerLexer.java?p2=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemCheckerLexer.java&p1=directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ReusableAntlrACIItemCheckerLexer.java&r1=1424407&r2=1424451&rev=1424451&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/ReusableAntlrACIItemCheckerLexer.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/api/ldap/aci/ReusableAntlrACIItemCheckerLexer.java Thu Dec 20 13:17:20 2012
@@ -18,7 +18,7 @@
  *  
  */
 
-package org.apache.directory.shared.ldap.aci;
+package org.apache.directory.api.ldap.aci;
 
 
 import java.io.Reader;



Mime
View raw message