svn commit: r1293305 - in /directory/studio/trunk/plugins/ldapservers.apacheds.v200: pom.xml resources/conf/config.ldif src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java

[pa...@apache.org]

Author: pamarcelot
Date: Fri Feb 24 15:56:53 2012
New Revision: 1293305

URL: http://svn.apache.org/viewvc?rev=1293305&view=rev
Log:
Moved to the latest released version 2.0.0-M6.

Modified:
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/resources/conf/config.ldif
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml?rev=1293305&r1=1293304&r2=1293305&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/pom.xml Fri Feb 24 15:56:53 2012
@@ -172,7 +172,7 @@
                 <artifactItem>
                   <groupId>org.apache.directory.server</groupId>
                   <artifactId>apacheds-service</artifactId>
-                  <version>2.0.0-M3</version>
+                  <version>2.0.0-M6</version>
                 </artifactItem>
               </artifactItems>
             </configuration>

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/resources/conf/config.ldif
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/resources/conf/config.ldif?rev=1293305&r1=1293304&r2=1293305&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/resources/conf/config.ldif (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/resources/conf/config.ldif Fri Feb 24 15:56:53 2012
@@ -202,7 +202,7 @@ objectclass: top
 objectclass: ads-base
 objectclass: ads-interceptor
 ads-enabled: FALSE
-ads-interceptororder: 8
+ads-interceptororder: 7
 ads-interceptorclassname: org.apache.directory.server.core.kerberos.KeyDerivationInterceptor
 ads-interceptorid: keyDerivationInterceptor
 
@@ -219,7 +219,7 @@ dn: ads-interceptorId=operationalAttribu
 objectclass: top
 objectclass: ads-base
 objectclass: ads-interceptor
-ads-interceptororder: 7
+ads-interceptororder: 10
 ads-interceptorclassname: org.apache.directory.server.core.operational.OperationalAttributeInterceptor
 ads-interceptorid: operationalAttributeInterceptor
 ads-enabled: TRUE
@@ -229,7 +229,7 @@ objectclass: top
 objectclass: ads-base
 objectclass: ads-interceptor
 ads-enabled: TRUE
-ads-interceptororder: 9
+ads-interceptororder: 8
 ads-interceptorclassname: org.apache.directory.server.core.hash.SshaPasswordHashingInterceptor
 ads-interceptorid: passwordHashingInterceptor
 
@@ -246,7 +246,7 @@ dn: ads-interceptorId=schemaInterceptor,
 objectclass: top
 objectclass: ads-base
 objectclass: ads-interceptor
-ads-interceptororder: 10
+ads-interceptororder: 9
 ads-interceptorclassname: org.apache.directory.server.core.schema.SchemaInterceptor
 ads-interceptorid: schemaInterceptor
 ads-enabled: TRUE

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java?rev=1293305&r1=1293304&r2=1293305&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java Fri Feb 24 15:56:53 2012
@@ -82,7 +82,7 @@ public class ApacheDS200LdapServerAdapte
 
     /** The array of libraries names */
     private static final String[] libraries = new String[]
-        { "apacheds-service-2.0.0-M3.jar" }; //$NON-NLS-1$
+        { "apacheds-service-2.0.0-M6.jar" }; //$NON-NLS-1$
 
 
     /**
@@ -251,7 +251,7 @@ public class ApacheDS200LdapServerAdapte
                 "org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory" ); //$NON-NLS-1$
         vmArguments.append( " " ); //$NON-NLS-1$
         vmArguments
-            .append( "-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyFactory," + //$NON-NLS-1$
+            .append( "-Dextra.controls=org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," + //$NON-NLS-1$
                 "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," + //$NON-NLS-1$
                 "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," + //$NON-NLS-1$
                 "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," + //$NON-NLS-1$