directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1423968 [12/27] - in /directory/shared/branches/shared-refact: dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/director...
Date Wed, 19 Dec 2012 17:24:42 GMT
Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java Wed Dec 19 17:24:08 2012
@@ -32,15 +32,15 @@ import javax.naming.NamingException;
 import org.apache.directory.api.asn1.DecoderException;
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.asn1.ber.Asn1Decoder;
+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.message.Control;
+import org.apache.directory.api.ldap.model.message.SearchResultEntry;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.shared.ldap.codec.api.CodecControl;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.SearchResultEntryDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Wed Dec 19 17:24:08 2012
@@ -36,14 +36,14 @@ import com.mycila.junit.concurrent.Concu
 import org.apache.directory.api.asn1.DecoderException;
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.asn1.ber.Asn1Decoder;
+import org.apache.directory.api.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.message.SearchResultReference;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.shared.ldap.codec.api.CodecControl;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.SearchResultReferenceDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
-import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.Referral;
-import org.apache.directory.shared.ldap.model.message.SearchResultReference;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java Wed Dec 19 17:24:08 2012
@@ -29,12 +29,12 @@ import com.mycila.junit.concurrent.Concu
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 
 import org.apache.directory.api.asn1.DecoderException;
+import org.apache.directory.api.ldap.model.message.controls.ChangeType;
+import org.apache.directory.api.ldap.model.message.controls.EntryChange;
+import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
-import org.apache.directory.shared.ldap.model.message.controls.ChangeType;
-import org.apache.directory.shared.ldap.model.message.controls.EntryChange;
-import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java Wed Dec 19 17:24:08 2012
@@ -29,11 +29,11 @@ import com.mycila.junit.concurrent.Concu
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 
 import org.apache.directory.api.asn1.DecoderException;
+import org.apache.directory.api.ldap.model.message.controls.ChangeType;
+import org.apache.directory.api.ldap.model.message.controls.PersistentSearch;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
-import org.apache.directory.shared.ldap.model.message.controls.ChangeType;
-import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java Wed Dec 19 17:24:08 2012
@@ -31,10 +31,10 @@ import com.mycila.junit.concurrent.Concu
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 
 import org.apache.directory.api.asn1.DecoderException;
+import org.apache.directory.api.ldap.model.message.controls.PagedResults;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
-import org.apache.directory.shared.ldap.model.message.controls.PagedResults;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java Wed Dec 19 17:24:08 2012
@@ -32,10 +32,10 @@ import com.mycila.junit.concurrent.Concu
 
 import org.apache.directory.api.asn1.DecoderException;
 import org.apache.directory.api.asn1.EncoderException;
+import org.apache.directory.api.ldap.model.message.controls.Subentries;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
-import org.apache.directory.shared.ldap.model.message.controls.Subentries;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java Wed Dec 19 17:24:08 2012
@@ -30,14 +30,14 @@ import java.util.Map;
 import org.apache.directory.api.asn1.DecoderException;
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.asn1.ber.Asn1Decoder;
+import org.apache.directory.api.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.UnbindRequest;
+import org.apache.directory.api.ldap.model.message.UnbindRequestImpl;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.shared.ldap.codec.api.CodecControl;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.decorators.UnbindRequestDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
-import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.UnbindRequest;
-import org.apache.directory.shared.ldap.model.message.UnbindRequestImpl;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

Modified: directory/shared/branches/shared-refact/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java (original)
+++ directory/shared/branches/shared-refact/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java Wed Dec 19 17:24:08 2012
@@ -33,6 +33,13 @@ import javax.naming.ldap.BasicControl;
 import org.apache.directory.api.asn1.DecoderException;
 import org.apache.directory.api.asn1.EncoderException;
 import org.apache.directory.api.asn1.ber.Asn1Container;
+import org.apache.directory.api.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.ExtendedRequest;
+import org.apache.directory.api.ldap.model.message.ExtendedRequestImpl;
+import org.apache.directory.api.ldap.model.message.ExtendedResponse;
+import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
+import org.apache.directory.api.ldap.model.message.Message;
+import org.apache.directory.api.ldap.model.message.controls.OpaqueControl;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.api.util.exception.NotImplementedException;
 import org.apache.directory.shared.ldap.codec.BasicControlDecorator;
@@ -45,13 +52,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
 import org.apache.directory.shared.ldap.codec.api.UnsolicitedResponseFactory;
-import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.model.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.model.message.Message;
-import org.apache.directory.shared.ldap.model.message.controls.OpaqueControl;
 import org.apache.mina.filter.codec.ProtocolCodecFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/checkstyle/suppressions.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/checkstyle/suppressions.xml?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/checkstyle/suppressions.xml (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/checkstyle/suppressions.xml Wed Dec 19 17:24:08 2012
@@ -28,16 +28,16 @@
     <suppress files="org.apache.directory.api.util.UnixCrypt" checks="[A-Za-z0-9]" />
     
     <!-- hashcode() is final in super class -->
-    <suppress files="org.apache.directory.shared.ldap.model.schema.SyntaxChecker" checks="EqualsHashCode" />
-    <suppress files="org.apache.directory.shared.ldap.model.schema.Normalizer" checks="EqualsHashCode" />
-    <suppress files="org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject" checks="EqualsHashCode" />
-    <suppress files="org.apache.directory.shared.ldap.model.schema.LdapComparator" checks="EqualsHashCode" />
-    <suppress files="org.apache.directory.shared.ldap.model.schema.DITStructureRule" checks="EqualsHashCode" />
+    <suppress files="org.apache.directory.api.ldap.model.schema.SyntaxChecker" checks="EqualsHashCode" />
+    <suppress files="org.apache.directory.api.ldap.model.schema.Normalizer" checks="EqualsHashCode" />
+    <suppress files="org.apache.directory.api.ldap.model.schema.LoadableSchemaObject" checks="EqualsHashCode" />
+    <suppress files="org.apache.directory.api.ldap.model.schema.LdapComparator" checks="EqualsHashCode" />
+    <suppress files="org.apache.directory.api.ldap.model.schema.DITStructureRule" checks="EqualsHashCode" />
     
     <!-- No Javadoc for schema constants required -->
-    <suppress files="org.apache.directory.shared.ldap.model.constants.SchemaConstants" checks="JavadocVariable" />
-    <suppress files="org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants" checks="JavadocVariable" />
-    <suppress files="org.apache.directory.shared.ldap.model.constants.PasswordPolicySchemaConstants" checks="JavadocVariable" />
+    <suppress files="org.apache.directory.api.ldap.model.constants.SchemaConstants" checks="JavadocVariable" />
+    <suppress files="org.apache.directory.api.ldap.model.constants.MetaSchemaConstants" checks="JavadocVariable" />
+    <suppress files="org.apache.directory.api.ldap.model.constants.PasswordPolicySchemaConstants" checks="JavadocVariable" />
 
     <!-- Classes in org.apache.directory.api.asn1.der are forked from Bouncy Castle -->
     <suppress files="org.apache.directory.api.asn1.der" checks="[A-Za-z0-9]" />

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=1423968&r1=1423967&r2=1423968&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 Wed Dec 19 17:24:08 2012
@@ -31,33 +31,33 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Enumeration;
 
-import org.apache.directory.shared.ldap.model.filter.BranchNode;
-import org.apache.directory.shared.ldap.model.filter.AndNode;
-import org.apache.directory.shared.ldap.model.filter.OrNode;
-import org.apache.directory.shared.ldap.model.filter.NotNode;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
-import org.apache.directory.shared.ldap.model.filter.LeafNode;
-import org.apache.directory.shared.ldap.model.filter.EqualityNode;
-import org.apache.directory.shared.ldap.model.filter.FilterParser;
-import org.apache.directory.shared.ldap.model.schema.normalizers.NameComponentNormalizer;
-import org.apache.directory.shared.ldap.model.subtree.SubtreeSpecification;
-import org.apache.directory.shared.ldap.model.subtree.SubtreeSpecificationModifier;
+import org.apache.directory.api.ldap.model.filter.BranchNode;
+import org.apache.directory.api.ldap.model.filter.AndNode;
+import org.apache.directory.api.ldap.model.filter.OrNode;
+import org.apache.directory.api.ldap.model.filter.NotNode;
+import org.apache.directory.api.ldap.model.filter.ExprNode;
+import org.apache.directory.api.ldap.model.filter.LeafNode;
+import org.apache.directory.api.ldap.model.filter.EqualityNode;
+import org.apache.directory.api.ldap.model.filter.FilterParser;
+import org.apache.directory.api.ldap.model.schema.normalizers.NameComponentNormalizer;
+import org.apache.directory.api.ldap.model.subtree.SubtreeSpecification;
+import org.apache.directory.api.ldap.model.subtree.SubtreeSpecificationModifier;
 import org.apache.directory.api.util.ComponentsMonitor;
 import org.apache.directory.api.util.MandatoryAndOptionalComponentsMonitor;
 import org.apache.directory.api.util.MandatoryComponentsMonitor;
-import org.apache.directory.shared.ldap.model.name.DnUtils;
+import org.apache.directory.api.ldap.model.name.DnUtils;
 import org.apache.directory.api.util.NoDuplicateKeysMap;
 import org.apache.directory.api.util.OptionalComponentsMonitor;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
-import org.apache.directory.shared.ldap.model.entry.StringValue;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Rdn;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.api.ldap.model.entry.StringValue;
+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;

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=1423968&r1=1423967&r2=1423968&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 Wed Dec 19 17:24:08 2012
@@ -24,7 +24,7 @@ header
 package org.apache.directory.shared.ldap.aci;
 
 
-import org.apache.directory.shared.ldap.model.schema.normalizers.NameComponentNormalizer;
+import org.apache.directory.api.ldap.model.schema.normalizers.NameComponentNormalizer;
 }
 
 

Modified: 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/shared/ldap/aci/ACIItem.java?rev=1423968&r1=1423967&r2=1423968&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/shared/ldap/aci/ACIItem.java Wed Dec 19 17:24:08 2012
@@ -25,7 +25,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 
 
 /**

Modified: 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/shared/ldap/aci/ACIItemChecker.java?rev=1423968&r1=1423967&r2=1423968&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/shared/ldap/aci/ACIItemChecker.java Wed Dec 19 17:24:08 2012
@@ -25,7 +25,7 @@ import java.io.StringReader;
 import java.text.ParseException;
 
 import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
 
 import antlr.RecognitionException;
 import antlr.TokenStreamException;

Modified: 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/shared/ldap/aci/ACIItemParser.java?rev=1423968&r1=1423967&r2=1423968&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/shared/ldap/aci/ACIItemParser.java Wed Dec 19 17:24:08 2012
@@ -25,8 +25,8 @@ import java.io.StringReader;
 import java.text.ParseException;
 
 import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.schema.normalizers.NameComponentNormalizer;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
+import org.apache.directory.api.ldap.model.schema.normalizers.NameComponentNormalizer;
 
 import antlr.RecognitionException;
 import antlr.TokenStreamException;

Modified: 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/shared/ldap/aci/ACIItemSyntaxChecker.java?rev=1423968&r1=1423967&r2=1423968&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/shared/ldap/aci/ACIItemSyntaxChecker.java Wed Dec 19 17:24:08 2012
@@ -22,10 +22,10 @@ package org.apache.directory.shared.ldap
 
 import java.text.ParseException;
 
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.schema.SchemaManager;
+import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: 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/shared/ldap/aci/ACITuple.java?rev=1423968&r1=1423967&r2=1423968&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/shared/ldap/aci/ACITuple.java Wed Dec 19 17:24:08 2012
@@ -27,7 +27,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 
 
 /**

Modified: 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/shared/ldap/aci/ItemFirstACIItem.java?rev=1423968&r1=1423967&r2=1423968&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/shared/ldap/aci/ItemFirstACIItem.java Wed Dec 19 17:24:08 2012
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserClass.java Wed Dec 19 17:24:08 2012
@@ -24,8 +24,8 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.SubtreeSpecification;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.SubtreeSpecification;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserFirstACIItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserFirstACIItem.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserFirstACIItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/UserFirstACIItem.java Wed Dec 19 17:24:08 2012
@@ -25,7 +25,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AbstractAttributeTypeProtectedItem.java Wed Dec 19 17:24:08 2012
@@ -24,8 +24,8 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AllAttributeValuesItem.java Wed Dec 19 17:24:08 2012
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeTypeItem.java Wed Dec 19 17:24:08 2012
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItem.java Wed Dec 19 17:24:08 2012
@@ -24,8 +24,8 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
 
 
 /**
@@ -49,7 +49,7 @@ public class AttributeValueItem extends 
 
 
     /**
-     * Returns an iterator of all {@link org.apache.directory.shared.ldap.model.entry.Attribute}s.
+     * Returns an iterator of all {@link org.apache.directory.api.ldap.model.entry.Attribute}s.
      *
      * @return the iterator
      */

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItem.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItem.java Wed Dec 19 17:24:08 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.aci.protectedItem;
 
 
+import org.apache.directory.api.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.aci.protectedItem;
 
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RangeOfValuesItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RangeOfValuesItem.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RangeOfValuesItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RangeOfValuesItem.java Wed Dec 19 17:24:08 2012
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.aci.protectedItem;
 
 
+import org.apache.directory.api.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.aci.protectedItem;
 
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/SelfValueItem.java Wed Dec 19 17:24:08 2012
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import java.util.Set;
 
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AllAttributeValuesTest.java Wed Dec 19 17:24:08 2012
@@ -28,8 +28,9 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.aci.protectedItem.AllAttributeValuesItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeTypeTest.java Wed Dec 19 17:24:08 2012
@@ -28,8 +28,9 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.aci.protectedItem.AttributeTypeItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_AttributeValueTest.java Wed Dec 19 17:24:08 2012
@@ -28,9 +28,10 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.aci.protectedItem.AttributeValueItem;
-import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_ClassesTest.java Wed Dec 19 17:24:08 2012
@@ -25,9 +25,10 @@ import static org.junit.Assert.assertFal
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.filter.ExprNode;
+import org.apache.directory.api.ldap.model.filter.FilterParser;
 import org.apache.directory.shared.ldap.aci.protectedItem.ClassesItem;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
-import org.apache.directory.shared.ldap.model.filter.FilterParser;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_MaxValueCountTest.java Wed Dec 19 17:24:08 2012
@@ -28,9 +28,10 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountElem;
 import org.apache.directory.shared.ldap.aci.protectedItem.MaxValueCountItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RangeOfValuesTest.java Wed Dec 19 17:24:08 2012
@@ -25,9 +25,10 @@ import static org.junit.Assert.assertFal
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.filter.ExprNode;
+import org.apache.directory.api.ldap.model.filter.FilterParser;
 import org.apache.directory.shared.ldap.aci.protectedItem.RangeOfValuesItem;
-import org.apache.directory.shared.ldap.model.filter.ExprNode;
-import org.apache.directory.shared.ldap.model.filter.FilterParser;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_RestrictedByTest.java Wed Dec 19 17:24:08 2012
@@ -28,9 +28,10 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByElem;
 import org.apache.directory.shared.ldap.aci.protectedItem.RestrictedByItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/ProtectedItem_SelfValueTest.java Wed Dec 19 17:24:08 2012
@@ -28,8 +28,9 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.aci.protectedItem.SelfValueItem;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_NameTest.java Wed Dec 19 17:24:08 2012
@@ -28,9 +28,10 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.aci.UserClass.Name;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/UserClass_SubtreeTest.java Wed Dec 19 17:24:08 2012
@@ -28,10 +28,11 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.subtree.BaseSubtreeSpecification;
+import org.apache.directory.api.ldap.model.subtree.SubtreeSpecification;
 import org.apache.directory.shared.ldap.aci.UserClass.Subtree;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.subtree.BaseSubtreeSpecification;
-import org.apache.directory.shared.ldap.model.subtree.SubtreeSpecification;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java Wed Dec 19 17:24:08 2012
@@ -28,9 +28,10 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
+
+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.filter.UndefinedNode;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java Wed Dec 19 17:24:08 2012
@@ -25,8 +25,9 @@ import static org.junit.Assert.assertFal
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.filter.SubstringNode;
-import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
+
+import org.apache.directory.api.ldap.model.filter.SubstringNode;
+import org.apache.directory.api.ldap.model.filter.UndefinedNode;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java Wed Dec 19 17:24:08 2012
@@ -25,7 +25,8 @@ import static org.junit.Assert.assertFal
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
+
+import org.apache.directory.api.ldap.model.filter.UndefinedNode;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java Wed Dec 19 17:24:08 2012
@@ -28,8 +28,9 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+
+import org.apache.directory.api.ldap.model.filter.UndefinedNode;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/aci/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java Wed Dec 19 17:24:08 2012
@@ -28,8 +28,9 @@ import java.util.Set;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.filter.UndefinedNode;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+
+import org.apache.directory.api.ldap.model.filter.UndefinedNode;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValue.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValue.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValue.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.controls;
 
 
-import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.Control;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValueImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValueImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncDoneValueImpl.java Wed Dec 19 17:24:08 2012
@@ -22,8 +22,8 @@ package org.apache.directory.shared.ldap
 
 import java.util.Arrays;
 
+import org.apache.directory.api.ldap.model.message.controls.AbstractControl;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.model.message.controls.AbstractControl;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValue.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValue.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValue.java Wed Dec 19 17:24:08 2012
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.Control;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncInfoValueImpl.java Wed Dec 19 17:24:08 2012
@@ -24,8 +24,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.directory.api.ldap.model.message.controls.AbstractControl;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.model.message.controls.AbstractControl;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValue.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValue.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValue.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.controls;
 
 
-import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.Control;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncRequestValueImpl.java Wed Dec 19 17:24:08 2012
@@ -22,8 +22,8 @@ package org.apache.directory.shared.ldap
 
 import java.util.Arrays;
 
+import org.apache.directory.api.ldap.model.message.controls.AbstractControl;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.model.message.controls.AbstractControl;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValue.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValue.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValue.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.controls;
 
 
-import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.Control;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/SyncStateValueImpl.java Wed Dec 19 17:24:08 2012
@@ -22,9 +22,9 @@ package org.apache.directory.shared.ldap
 
 import java.util.Arrays;
 
+import org.apache.directory.api.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.controls.AbstractControl;
 import org.apache.directory.api.util.Strings;
-import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.controls.AbstractControl;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicy.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.controls.ppolicy;
 
 
-import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.Control;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyImpl.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.controls.ppolicy;
 
 
-import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.api.ldap.model.message.Control;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequest.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.extended;
 
 
-import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
+import org.apache.directory.api.ldap.model.message.ExtendedRequest;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelRequestImpl.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.extended;
 
 
-import org.apache.directory.shared.ldap.model.message.AbstractExtendedRequest;
+import org.apache.directory.api.ldap.model.message.AbstractExtendedRequest;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponse.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponse.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponse.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.extended;
 
 
-import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
+import org.apache.directory.api.ldap.model.message.ExtendedResponse;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponseImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponseImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CancelResponseImpl.java Wed Dec 19 17:24:08 2012
@@ -21,8 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.shared.ldap.model.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
+import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequest.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.extended;
 
 
-import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
+import org.apache.directory.api.ldap.model.message.ExtendedRequest;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationRequestImpl.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.extended;
 
 
-import org.apache.directory.shared.ldap.model.message.AbstractExtendedRequest;
+import org.apache.directory.api.ldap.model.message.AbstractExtendedRequest;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponse.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponse.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponse.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.extended;
 
 
-import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
+import org.apache.directory.api.ldap.model.message.ExtendedResponse;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/CertGenerationResponseImpl.java Wed Dec 19 17:24:08 2012
@@ -21,8 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.shared.ldap.model.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
+import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponse.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponse.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponse.java Wed Dec 19 17:24:08 2012
@@ -20,14 +20,14 @@
 package org.apache.directory.shared.ldap.extras.extended;
 
 
-import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.message.ExtendedResponse;
+import org.apache.directory.api.ldap.model.message.Referral;
 
 
 /**
  * An unsolicited notification, extended response, intended for notifying
  * clients of upcoming disconnection due to intended service windows. Unlike the
- * {@link org.apache.directory.shared.ldap.model.message.extended.NoticeOfDisconnect} this response contains additional information about
+ * {@link org.apache.directory.api.ldap.model.message.extended.NoticeOfDisconnect} this response contains additional information about
  * the amount of time the server will be offline and exactly when it intends to
  * shutdown.
  * 

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulDisconnectResponseImpl.java Wed Dec 19 17:24:08 2012
@@ -21,16 +21,16 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.shared.ldap.model.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.model.message.Referral;
-import org.apache.directory.shared.ldap.model.message.ReferralImpl;
-import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
+import org.apache.directory.api.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.message.ReferralImpl;
+import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
 
 
 /**
  * An unsolicited notification, extended response, intended for notifying
  * clients of up coming disconnection due to intended service windows. Unlike the
- * {@link org.apache.directory.shared.ldap.model.message.extended.NoticeOfDisconnect} this response contains additional information about
+ * {@link org.apache.directory.api.ldap.model.message.extended.NoticeOfDisconnect} this response contains additional information about
  * the amount of time the server will be offline and exactly when it intends to
  * shutdown.
  * 

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequest.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.extended;
 
 
-import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
+import org.apache.directory.api.ldap.model.message.ExtendedRequest;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownRequestImpl.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.extended;
 
 
-import org.apache.directory.shared.ldap.model.message.AbstractExtendedRequest;
+import org.apache.directory.api.ldap.model.message.AbstractExtendedRequest;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java Wed Dec 19 17:24:08 2012
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.extras.extended;
 
 
-import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
+import org.apache.directory.api.ldap.model.message.ExtendedResponse;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponseImpl.java Wed Dec 19 17:24:08 2012
@@ -21,8 +21,8 @@ package org.apache.directory.shared.ldap
 
 
 import org.apache.directory.api.i18n.I18n;
-import org.apache.directory.shared.ldap.model.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.api.ldap.model.message.ExtendedResponseImpl;
+import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
 
 
 /**

Modified: directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java?rev=1423968&r1=1423967&r2=1423968&view=diff
==============================================================================
--- directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java (original)
+++ directory/shared/branches/shared-refact/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequest.java Wed Dec 19 17:24:08 2012
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
 
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
+import org.apache.directory.api.ldap.model.message.ExtendedRequest;
 
 
 /**



Mime
View raw message