You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/01/26 23:55:43 UTC
svn commit: r903472 [1/2] - in /directory/apacheds/trunk: all/
avl-partition/ core-annotations/ core-api/
core-api/src/main/java/org/apache/directory/server/core/
core-api/src/main/java/org/apache/directory/server/core/interceptor/context/
core-avl/ co...
Author: elecharny
Date: Tue Jan 26 22:55:37 2010
New Revision: 903472
URL: http://svn.apache.org/viewvc?rev=903472&view=rev
Log:
o Moved JndiUtils methods to shared-jndio Cleanup of many pom.xml
o Reflected the modification done in shared
Added:
directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/utils/
directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/utils/SASLPrep.java
Removed:
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/JndiUtils.java
Modified:
directory/apacheds/trunk/all/pom.xml
directory/apacheds/trunk/avl-partition/pom.xml
directory/apacheds/trunk/core-annotations/pom.xml
directory/apacheds/trunk/core-api/pom.xml
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
directory/apacheds/trunk/core-avl/pom.xml
directory/apacheds/trunk/core-integ/pom.xml
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerDirContext.java
directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerLdapContext.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockCoreSession.java
directory/apacheds/trunk/core-mock/src/main/java/org/apache/directory/server/core/MockOperation.java
directory/apacheds/trunk/core/pom.xml
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientBindRequestTest.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolConstants.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
directory/apacheds/trunk/server-annotations/src/test/java/org/apache/directory/server/factory/DirectoryServiceAnnotationTest.java
directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/ReferralSearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
directory/apacheds/trunk/xdbm-base/pom.xml
Modified: directory/apacheds/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/all/pom.xml?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/all/pom.xml (original)
+++ directory/apacheds/trunk/all/pom.xml Tue Jan 26 22:55:37 2010
@@ -26,207 +26,242 @@
<artifactId>apacheds-parent</artifactId>
<version>1.5.6-SNAPSHOT</version>
</parent>
+
<artifactId>apacheds-all</artifactId>
<name>ApacheDS All</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-avl-partition</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-core</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-core-annotations</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-core-api</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-core-avl</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-core-constants</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-core-entry</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<!--
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-core-integ</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
-->
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-core-jndi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-core-mock</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<!--
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-http-integration</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
-->
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-interceptor-kerberos</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-jdbm</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-jdbm-partition</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-jdbm-store</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-kerberos-shared</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<!--
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-kerberos-test</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
-->
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-ldif-partition</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-protocol-changepw</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-protocol-dhcp</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-protocol-dns</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-protocol-kerberos</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-protocol-ldap</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-protocol-ntp</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-protocol-shared</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-server-annotations</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<!--
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-server-integ</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
-->
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-server-jndi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-server-replication</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<!--
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-server-tools</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
-->
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-server-xml</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-test-framework</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-utils</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-xbean-spring</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-xdbm-base</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-xdbm-search</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
+
<dependency>
- <groupId>org.apache.directory.server</groupId>
+ <groupId>${groupId}</groupId>
<artifactId>apacheds-xdbm-tools</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
-
</dependencies>
<build>
@@ -256,6 +291,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
@@ -272,7 +308,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
</project>
Modified: directory/apacheds/trunk/avl-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/pom.xml?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/pom.xml (original)
+++ directory/apacheds/trunk/avl-partition/pom.xml Tue Jan 26 22:55:37 2010
@@ -26,46 +26,45 @@
<artifactId>apacheds-parent</artifactId>
<version>1.5.6-SNAPSHOT</version>
</parent>
+
<artifactId>apacheds-avl-partition</artifactId>
<name>ApacheDS Avl Partition</name>
<packaging>jar</packaging>
-
<description>
A partition that backs it's entries and indices in AvlTrees within memory.
</description>
<dependencies>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-i18n</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-avl</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-xdbm-search</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-xdbm-tools</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
Modified: directory/apacheds/trunk/core-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-annotations/pom.xml?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-annotations/pom.xml (original)
+++ directory/apacheds/trunk/core-annotations/pom.xml Tue Jan 26 22:55:37 2010
@@ -6,16 +6,17 @@
<artifactId>apacheds-parent</artifactId>
<version>1.5.6-SNAPSHOT</version>
</parent>
+
<artifactId>apacheds-core-annotations</artifactId>
<packaging>jar</packaging>
<version>1.5.6-SNAPSHOT</version>
<name>ApacheDS Core Annotations</name>
<description>Annotations used to define a DirectoryService</description>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
</dependency>
<dependency>
@@ -24,27 +25,27 @@
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-i18n</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-jndi</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm-partition</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-ldif-partition</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
</dependencies>
</project>
Modified: directory/apacheds/trunk/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/pom.xml?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/pom.xml (original)
+++ directory/apacheds/trunk/core-api/pom.xml Tue Jan 26 22:55:37 2010
@@ -26,6 +26,7 @@
<artifactId>apacheds-parent</artifactId>
<version>1.5.6-SNAPSHOT</version>
</parent>
+
<artifactId>apacheds-core-api</artifactId>
<name>ApacheDS Core API</name>
<packaging>jar</packaging>
@@ -36,21 +37,21 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-i18n</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-entry</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-constants</artifactId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java Tue Jan 26 22:55:37 2010
@@ -24,8 +24,6 @@
import java.util.List;
import java.util.Set;
-import javax.naming.ldap.Control;
-
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.changelog.LogChange;
import org.apache.directory.server.core.entry.ClonedServerEntry;
@@ -44,6 +42,7 @@
import org.apache.directory.shared.ldap.message.InternalModifyRequest;
import org.apache.directory.shared.ldap.message.InternalSearchRequest;
import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AbstractOperationContext.java Tue Jan 26 22:55:37 2010
@@ -26,14 +26,13 @@
import java.util.List;
import java.util.Map;
-import javax.naming.ldap.Control;
-
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.LdapPrincipal;
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.entry.Modification;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -141,7 +140,7 @@
public void addRequestControl( Control requestControl )
{
- requestControls.put( requestControl.getID(), requestControl );
+ requestControls.put( requestControl.getOid(), requestControl );
}
@@ -165,7 +164,7 @@
public void addResponseControl( Control responseControl )
{
- responseControls.put( responseControl.getID(), responseControl );
+ responseControls.put( responseControl.getOid(), responseControl );
}
@@ -208,7 +207,7 @@
{
for ( Control c : requestControls )
{
- this.requestControls.put( c.getID(), c );
+ this.requestControls.put( c.getOid(), c );
}
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/BindOperationContext.java Tue Jan 26 22:55:37 2010
@@ -26,18 +26,17 @@
import java.util.List;
import java.util.Map;
-import javax.naming.ldap.Control;
-
import org.apache.commons.lang.NotImplementedException;
import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.ReferralHandlingMode;
import org.apache.directory.server.core.LdapPrincipal;
+import org.apache.directory.server.core.ReferralHandlingMode;
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.message.MessageTypeEnum;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -262,7 +261,7 @@
public void addRequestControl( Control requestControl )
{
- requestControls.put( requestControl.getID(), requestControl );
+ requestControls.put( requestControl.getOid(), requestControl );
}
@@ -286,7 +285,7 @@
public void addResponseControl( Control responseControl )
{
- responseControls.put( responseControl.getID(), responseControl );
+ responseControls.put( responseControl.getOid(), responseControl );
}
@@ -329,7 +328,7 @@
{
for ( Control c : requestControls )
{
- this.requestControls.put( c.getID(), c );
+ this.requestControls.put( c.getOid(), c );
}
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/OperationContext.java Tue Jan 26 22:55:37 2010
@@ -23,14 +23,13 @@
import java.util.Collection;
import java.util.List;
-import javax.naming.ldap.Control;
-
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.LdapPrincipal;
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.shared.ldap.entry.Modification;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.LdapDN;
Modified: directory/apacheds/trunk/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-avl/pom.xml?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-avl/pom.xml (original)
+++ directory/apacheds/trunk/core-avl/pom.xml Tue Jan 26 22:55:37 2010
@@ -23,9 +23,9 @@
<artifactId>apacheds-parent</artifactId>
<version>1.5.6-SNAPSHOT</version>
</parent>
+
<artifactId>apacheds-core-avl</artifactId>
<name>ApacheDS Core AVL</name>
-
<description>
A linked in memory AVL tree implementation with Cursor.
</description>
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.server</groupId>
- <version>${pom.version}</version>
+ <groupId>${groupId}</groupId>
+ <version>${version}</version>
<artifactId>apacheds-xdbm-base</artifactId>
</dependency>
</dependencies>
Modified: directory/apacheds/trunk/core-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/pom.xml?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/pom.xml (original)
+++ directory/apacheds/trunk/core-integ/pom.xml Tue Jan 26 22:55:37 2010
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-i18n</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-test-framework</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java Tue Jan 26 22:55:37 2010
@@ -43,7 +43,7 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -59,7 +59,7 @@
{
private Attributes getTestEntry( String cn ) throws NamingException
{
- Attributes subentry = AttributeUtils.createAttributes(
+ Attributes subentry = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: person",
"cn", cn ,
@@ -71,7 +71,7 @@
private Attributes getTestSubentry() throws NamingException
{
- Attributes subentry = AttributeUtils.createAttributes(
+ Attributes subentry = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: subentry",
"objectClass: collectiveAttributeSubentry",
@@ -85,7 +85,7 @@
private Attributes getTestSubentry2() throws NamingException
{
- Attributes subentry = AttributeUtils.createAttributes(
+ Attributes subentry = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: subentry",
"objectClass: collectiveAttributeSubentry",
@@ -99,7 +99,7 @@
private Attributes getTestSubentry3() throws NamingException
{
- Attributes subentry = AttributeUtils.createAttributes(
+ Attributes subentry = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: subentry",
"objectClass: collectiveAttributeSubentry",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java Tue Jan 26 22:55:37 2010
@@ -38,7 +38,7 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -65,7 +65,7 @@
EventDirContext ctx = ( EventDirContext ) getSystemContext( service ).lookup( "" );
ctx.addNamingListener( "", SearchControls.SUBTREE_SCOPE, listener );
- Attributes testEntry = AttributeUtils.createAttributes(
+ Attributes testEntry = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: organizationalUnit",
"ou", "testentry" );
@@ -117,7 +117,7 @@
EventDirContext ctx = ( EventDirContext ) getSystemContext( service ).lookup( "" );
ctx.addNamingListener( "", SearchControls.SUBTREE_SCOPE, listener );
- Attributes testEntry = AttributeUtils.createAttributes(
+ Attributes testEntry = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: organizationalUnit",
"ou", "testentry" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Tue Jan 26 22:55:37 2010
@@ -46,8 +46,8 @@
import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -69,7 +69,7 @@
private DirContext createSubContext( DirContext ctx, String type, String value ) throws NamingException
{
- Attributes subentry = AttributeUtils.createAttributes(
+ Attributes subentry = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: person",
"objectClass: OrganizationalPerson",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java Tue Jan 26 22:55:37 2010
@@ -35,7 +35,7 @@
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -106,7 +106,7 @@
{
LdapContext sysRoot = getSystemContext( service );
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"ObjectClass: top",
"cn: kevin Spacey",
"dc: ke" );
@@ -136,7 +136,7 @@
{
LdapContext sysRoot = getSystemContext( service );
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"ObjectClass: top",
"ObjectClass: person",
"cn: kevin Spacey",
@@ -164,7 +164,7 @@
@Test
public void testAddAttributeWithEscapedPlusCharacter() throws Exception
{
- Attributes entry = AttributeUtils.createAttributes(
+ Attributes entry = LdifUtils.createAttributes(
"ObjectClass: top",
"ObjectClass: inetorgperson",
"cn: John\\+Doe",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java Tue Jan 26 22:55:37 2010
@@ -43,7 +43,7 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -59,7 +59,7 @@
{
protected Attributes getPersonAttributes( String sn, String cn ) throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: person",
"cn", cn,
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Tue Jan 26 22:55:37 2010
@@ -44,7 +44,7 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -105,7 +105,7 @@
String dn = "ou=Test";
- Attributes attributes = AttributeUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
+ Attributes attributes = LdifUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
"ou: Test" );
DirContext ctx = ctxRoot.createSubcontext( dn, attributes );
@@ -131,7 +131,7 @@
String dn = "ou=Test";
String description = "New Value";
- Attributes attributes = AttributeUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
+ Attributes attributes = LdifUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
"ou: Test", "description: Old Value" );
DirContext ctx = ctxRoot.createSubcontext( dn, attributes );
@@ -166,7 +166,7 @@
String dn = "ou=Test";
- Attributes attributes = AttributeUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
+ Attributes attributes = LdifUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
"ou: Test" );
DirContext ctx = ctxRoot.createSubcontext( dn, attributes );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/CompareDirserver1139IT.java Tue Jan 26 22:55:37 2010
@@ -37,7 +37,7 @@
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Before;
import org.junit.Test;
@@ -118,7 +118,7 @@
private void injectEntries( LdapContext sysRoot ) throws Exception
{
// Add the group
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"ObjectClass: top",
"ObjectClass: groupOfNames",
"cn: group",
@@ -127,7 +127,7 @@
sysRoot.createSubcontext( "cn=group,ou=groups", attrs );
// Add the user
- attrs = AttributeUtils.createAttributes(
+ attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: organizationalPerson",
"objectClass: person",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Tue Jan 26 22:55:37 2010
@@ -52,8 +52,8 @@
import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException;
import org.apache.directory.shared.ldap.exception.LdapTimeLimitExceededException;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -267,7 +267,7 @@
*/
private static DirContext addNisPosixGroup( String name, int gid ) throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: posixGroup",
"cn", name,
@@ -728,7 +728,7 @@
*/
protected Attributes getPersonAttributes( String sn, String cn ) throws NamingException
{
- Attributes attributes = AttributeUtils.createAttributes(
+ Attributes attributes = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: top",
"objectClass: person",
@@ -1279,7 +1279,7 @@
public void testSearchWithEscapedCharsInFilter() throws Exception
{
// Create entry cn=Sid Vicious, ou=system
- Attributes vicious = AttributeUtils.createAttributes(
+ Attributes vicious = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: person",
"cn", "Sid Vicious",
@@ -1329,7 +1329,7 @@
public void testSubstringSearchWithEscapedCharsInFilter() throws Exception
{
// Create entry cn=Sid Vicious, ou=system
- Attributes vicious = AttributeUtils.createAttributes(
+ Attributes vicious = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: person",
"cn", "Sid Vicious",
@@ -1381,7 +1381,7 @@
@Test
public void testSubstringSearchWithEscapedAsterisksInFilter_DIRSERVER_1181() throws Exception
{
- Attributes vicious = AttributeUtils.createAttributes(
+ Attributes vicious = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: person",
"cn", "x*y*z*",
@@ -1602,7 +1602,7 @@
AliasDerefMode.NEVER_DEREF_ALIASES.getJndiValue() );
// Create an entry which does not match
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: groupOfUniqueNames",
"cn", "testGroup3",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java Tue Jan 26 22:55:37 2010
@@ -40,10 +40,10 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -74,7 +74,7 @@
@Test
public void testAddAttributeTypeToEnabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaAttributeType",
@@ -105,7 +105,7 @@
@Test
public void testAddAttributeTypeToUnLoadedSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaAttributeType",
@@ -140,7 +140,7 @@
@Test
public void testAddAttributeTypeToDisabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaAttributeType",
@@ -565,7 +565,7 @@
// ----------------------------------------------------------------------
private void addDependeeAttributeType() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaAttributeType",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java Tue Jan 26 22:55:37 2010
@@ -42,13 +42,13 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.comparators.BooleanComparator;
import org.apache.directory.shared.ldap.schema.comparators.StringComparator;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -97,7 +97,7 @@
@Test
public void testAddComparatorToEnabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaComparator", "m-fqcn: " + StringComparator.class.getName(), "m-oid: " + OID,
"m-description: A test comparator" );
@@ -123,7 +123,7 @@
@Test
public void testAddComparatorToDisabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaComparator", "m-fqcn: " + StringComparator.class.getName(), "m-oid: " + OID,
"m-description: A test comparator" );
@@ -148,7 +148,7 @@
@Test
public void testAddComparatorToUnloadedSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaComparator", "m-fqcn: " + StringComparator.class.getName(), "m-oid: " + OID,
"m-description: A test comparator" );
@@ -189,7 +189,7 @@
out.write( in.read() );
}
- Attributes attrs = AttributeUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaComparator",
"m-fqcn: org.apache.directory.shared.ldap.schema.comparators.DummyComparator", "m-bytecode", out
.toByteArray(), "m-oid", OID, "m-description: A test comparator" );
@@ -224,7 +224,7 @@
out.write( in.read() );
}
- Attributes attrs = AttributeUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
+ Attributes attrs = LdifUtils.createAttributes( "objectClass: top", "objectClass: metaTop",
"objectClass: metaComparator",
"m-fqcn: org.apache.directory.shared.ldap.schema.comparators.DummyComparator", "m-bytecode", out
.toByteArray(), "m-oid", OID, "m-description: A test comparator" );
@@ -327,7 +327,7 @@
assertTrue( service.getSchemaManager().getComparatorRegistry().contains( OID ) );
// Create a MR using this comparator
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java Tue Jan 26 22:55:37 2010
@@ -38,12 +38,12 @@
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.comparators.StringComparator;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -79,7 +79,7 @@
private void createComparator() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaComparator",
@@ -108,7 +108,7 @@
{
createComparator();
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
@@ -138,7 +138,7 @@
{
createComparator();
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
@@ -161,7 +161,7 @@
{
createComparator();
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java Tue Jan 26 22:55:37 2010
@@ -42,13 +42,13 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.MatchingRule;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimNormalizer;
import org.apache.directory.shared.ldap.schema.normalizers.NoOpNormalizer;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -84,7 +84,7 @@
@Test
public void testAddNormalizerToEnabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaNormalizer",
@@ -107,7 +107,7 @@
@Test
public void testAddNormalizerToDisabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaNormalizer",
@@ -129,7 +129,7 @@
@Test
public void testAddNormalizerToUnloadedSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaNormalizer",
@@ -168,7 +168,7 @@
out.write( in.read() );
}
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaNormalizer",
@@ -200,7 +200,7 @@
out.write( in.read() );
}
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaNormalizer",
@@ -424,7 +424,7 @@
assertTrue( service.getSchemaManager().getNormalizerRegistry().contains( OID ) );
// Create a MR using this Normalizer
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java Tue Jan 26 22:55:37 2010
@@ -38,11 +38,11 @@
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.shared.ldap.schema.registries.ObjectClassRegistry;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -78,7 +78,7 @@
private LdapDN addObjectClass() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaObjectClass",
@@ -125,7 +125,7 @@
@Test
public void testAddObjectClassToUnloadedSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaObjectClass",
@@ -543,7 +543,7 @@
private LdapDN addObjectClassToDisabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaObjectClass",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java Tue Jan 26 22:55:37 2010
@@ -41,9 +41,9 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -128,7 +128,7 @@
LdapContext schemaRoot = getSchemaContext( service );
// Create the schema
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: broken",
@@ -143,7 +143,7 @@
LdapContext schemaRoot = getSchemaContext( service );
// Create the schema
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn", schemaName );
@@ -420,7 +420,7 @@
assertFalse( isOnDisk( dn ) );
LdapContext schemaRoot = getSchemaContext( service );
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -448,7 +448,7 @@
assertFalse( isOnDisk( dn ) );
LdapContext schemaRoot = getSchemaContext( service );
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -482,7 +482,7 @@
assertFalse( isOnDisk( dn ) );
LdapContext schemaRoot = getSchemaContext( service );
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -544,7 +544,7 @@
public void testAddDisabledSchemaNoDeps() throws Exception
{
LdapContext schemaRoot = getSchemaContext( service );
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -568,7 +568,7 @@
public void testAddDisabledSchemaWithDeps() throws Exception
{
LdapContext schemaRoot = getSchemaContext( service );
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -594,7 +594,7 @@
public void testRejectDisabledSchemaAddWithMissingDeps() throws Exception
{
LdapContext schemaRoot = getSchemaContext( service );
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -635,7 +635,7 @@
public void testAddEnabledSchemaNoDeps() throws Exception
{
LdapContext schemaRoot = getSchemaContext( service );
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaSchema",
"cn: dummy"
@@ -659,7 +659,7 @@
public void testRejectEnabledSchemaAddWithDisabledDeps() throws Exception
{
LdapContext schemaRoot = getSchemaContext( service );
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -763,7 +763,7 @@
{
LdapContext schemaRoot = getSchemaContext( service );
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
@@ -813,7 +813,7 @@
testEnableExistingSchema();
// adds enabled dummy schema that depends on the test schema
- Attributes dummySchema = AttributeUtils.createAttributes(
+ Attributes dummySchema = LdifUtils.createAttributes(
"objectClass: top",
"objectClass", MetaSchemaConstants.META_SCHEMA_OC,
"cn: dummy",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java Tue Jan 26 22:55:37 2010
@@ -41,13 +41,13 @@
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.SyntaxChecker;
import org.apache.directory.shared.ldap.schema.syntaxCheckers.OctetStringSyntaxChecker;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -83,7 +83,7 @@
@Test
public void testAddSyntaxCheckerToEnabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntaxChecker",
@@ -106,7 +106,7 @@
@Test
public void testAddSyntaxCheckerToDisabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntaxChecker",
@@ -128,7 +128,7 @@
@Test
public void testAddSyntaxCheckerToUnloadedSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntaxChecker",
@@ -167,7 +167,7 @@
out.write( in.read() );
}
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntaxChecker",
@@ -199,7 +199,7 @@
out.write( in.read() );
}
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntaxChecker",
@@ -423,7 +423,7 @@
assertTrue( service.getSchemaManager().getSyntaxCheckerRegistry().contains( OID ) );
// Create a Syntax using this comparator
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntax",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java Tue Jan 26 22:55:37 2010
@@ -45,12 +45,12 @@
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException;
+import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.schema.LdapSyntax;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.schema.syntaxCheckers.OctetStringSyntaxChecker;
-import org.apache.directory.shared.ldap.util.AttributeUtils;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -94,7 +94,7 @@
@Test
public void testAddSyntaxToEnabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntax",
@@ -115,7 +115,7 @@
@Test
public void testAddSyntaxToDisabledSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntax",
@@ -137,7 +137,7 @@
@Test
public void testAddSyntaxToUnloadedSchema() throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaSyntax",
@@ -440,7 +440,7 @@
private void addDependeeMatchingRule( String oid ) throws Exception
{
- Attributes attrs = AttributeUtils.createAttributes(
+ Attributes attrs = LdifUtils.createAttributes(
"objectClass: top",
"objectClass: metaTop",
"objectClass: metaMatchingRule",
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Tue Jan 26 22:55:37 2010
@@ -39,13 +39,14 @@
import javax.naming.directory.ModificationItem;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import javax.naming.ldap.Control;
import javax.naming.ldap.LdapContext;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
+import org.apache.directory.shared.ldap.jndi.JndiUtils;
+import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.message.control.SubentriesControl;
import org.junit.Ignore;
import org.junit.Test;
@@ -903,7 +904,7 @@
// except subentries disappear
SubentriesControl ctl = new SubentriesControl();
ctl.setVisibility( true );
- sysRoot.setRequestControls( new Control[] { ctl } );
+ sysRoot.setRequestControls( JndiUtils.toJndiControls( new Control[] { ctl } ) );
list = sysRoot.search( "", "(objectClass=*)", searchControls );
SearchResult result = ( SearchResult ) list.next();
assertFalse( list.hasMore() );
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/CoreContextFactory.java Tue Jan 26 22:55:37 2010
@@ -20,19 +20,21 @@
package org.apache.directory.server.core.jndi;
+import java.util.Hashtable;
+
+import javax.naming.ConfigurationException;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
+import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.StringTools;
-import javax.naming.ConfigurationException;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-import java.util.Hashtable;
-
/**
* A simplistic implementation of {@link AbstractContextFactory}.
Modified: directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java?rev=903472&r1=903471&r2=903472&view=diff
==============================================================================
--- directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java (original)
+++ directory/apacheds/trunk/core-jndi/src/main/java/org/apache/directory/server/core/jndi/NamingEnumerationAdapter.java Tue Jan 26 22:55:37 2010
@@ -29,6 +29,7 @@
import org.apache.directory.server.core.entry.ClonedServerEntry;
import org.apache.directory.server.core.entry.ServerEntryUtils;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
+import org.apache.directory.shared.ldap.jndi.JndiUtils;
/**