You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/11/22 13:41:43 UTC
svn commit: r1204958 [1/2] - in /directory/apacheds/branches/apacheds-osgi:
./ all/ apache-felix/ component-hub/ core-annotations/ core-api/ core-avl/
core-constants/ core-integ/
core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/ ...
Author: pamarcelot
Date: Tue Nov 22 12:41:39 2011
New Revision: 1204958
URL: http://svn.apache.org/viewvc?rev=1204958&view=rev
Log:
Merged latest modifications in trunk with the OSGI branch [rev:1203604:head]
Modified:
directory/apacheds/branches/apacheds-osgi/ (props changed)
directory/apacheds/branches/apacheds-osgi/all/ (props changed)
directory/apacheds/branches/apacheds-osgi/apache-felix/ (props changed)
directory/apacheds/branches/apacheds-osgi/component-hub/pom.xml
directory/apacheds/branches/apacheds-osgi/core/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-annotations/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-api/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-api/pom.xml
directory/apacheds/branches/apacheds-osgi/core-avl/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-constants/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-integ/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (props changed)
directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (props changed)
directory/apacheds/branches/apacheds-osgi/core-jndi/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-jndi/pom.xml
directory/apacheds/branches/apacheds-osgi/core-shared/ (props changed)
directory/apacheds/branches/apacheds-osgi/core-shared/pom.xml
directory/apacheds/branches/apacheds-osgi/core/pom.xml
directory/apacheds/branches/apacheds-osgi/dependencies/ (props changed)
directory/apacheds/branches/apacheds-osgi/http-directory-bridge/ (props changed)
directory/apacheds/branches/apacheds-osgi/http-integration/ (props changed)
directory/apacheds/branches/apacheds-osgi/i18n/ (props changed)
directory/apacheds/branches/apacheds-osgi/installers/ (props changed)
directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptor-kerberos/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/admin/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/admin/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/authn/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/authn/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
directory/apacheds/branches/apacheds-osgi/interceptors/authz/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/authz/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/changelog/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/changelog/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/collective/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/collective/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/event/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/event/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/exception/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/exception/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/hash/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/journal/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/journal/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/logger/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/normalization/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/normalization/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/operational/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/operational/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/branches/apacheds-osgi/interceptors/referral/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/referral/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/schema/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/schema/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/subtree/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/subtree/pom.xml
directory/apacheds/branches/apacheds-osgi/interceptors/trigger/ (props changed)
directory/apacheds/branches/apacheds-osgi/interceptors/trigger/pom.xml
directory/apacheds/branches/apacheds-osgi/jdbm/ (props changed)
directory/apacheds/branches/apacheds-osgi/jdbm-partition/ (props changed)
directory/apacheds/branches/apacheds-osgi/jdbm-partition/pom.xml
directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ (props changed)
directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/test/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/apacheds-osgi/kerberos-test/ (props changed)
directory/apacheds/branches/apacheds-osgi/ldap-client-test/ (props changed)
directory/apacheds/branches/apacheds-osgi/ldif-partition/ (props changed)
directory/apacheds/branches/apacheds-osgi/ldif-partition/pom.xml
directory/apacheds/branches/apacheds-osgi/pom.xml
directory/apacheds/branches/apacheds-osgi/protocol-changepw/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-dhcp/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-dns/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-kerberos/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-ldap/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-ldap/pom.xml
directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-ntp/ (props changed)
directory/apacheds/branches/apacheds-osgi/protocol-shared/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-annotations/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/src/main/resources/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed)
directory/apacheds/branches/apacheds-osgi/server-integ/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-jndi/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-replication/ (props changed)
directory/apacheds/branches/apacheds-osgi/server-tools/ (props changed)
directory/apacheds/branches/apacheds-osgi/service/ (props changed)
directory/apacheds/branches/apacheds-osgi/service-builder/ (props changed)
directory/apacheds/branches/apacheds-osgi/service-builder/pom.xml
directory/apacheds/branches/apacheds-osgi/service-osgi/ (props changed)
directory/apacheds/branches/apacheds-osgi/test-framework/ (props changed)
directory/apacheds/branches/apacheds-osgi/xdbm-partition/ (props changed)
directory/apacheds/branches/apacheds-osgi/xdbm-partition/pom.xml
directory/apacheds/branches/apacheds-osgi/xdbm-tools/ (props changed)
Propchange: directory/apacheds/branches/apacheds-osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree:965203-965686
/directory/apacheds/branches/milestones:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring:945827-946347
-/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059,1201371-1203550
+/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059,1201371-1203550,1203605-1204897
/directory/studio/trunk:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765
/directory/apacheds/branches/milestones/all:1072812-1075328
-/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201342,1201371-1203550
+/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201342,1201371-1203550,1203605-1204897
/directory/studio/trunk/all:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/apache-felix/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/apache-felix:965203-965686
/directory/apacheds/branches/milestones/apache-felix:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/apache-felix:945827-946347
-/directory/apacheds/trunk/apache-felix:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201342,1201371-1203550
+/directory/apacheds/trunk/apache-felix:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201342,1201371-1203550,1203605-1204897
/directory/studio/trunk/apache-felix:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/component-hub/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-hub/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/component-hub/pom.xml Tue Nov 22 12:41:39 2011
@@ -33,7 +33,11 @@
<description>Provides main plugin-layer for ApacheDS</description>
<dependencies>
-
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-api</artifactId>
Propchange: directory/apacheds/branches/apacheds-osgi/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -5,5 +5,5 @@
/directory/apacheds/branches/apacheds-jdbm/core:1160768-1164072
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
/directory/apacheds/branches/milestones/core:1072812-1075328
-/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201342,1201371-1203550
+/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201342,1201371-1203550,1203605-1204897
/directory/studio/trunk/core:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -5,5 +5,5 @@
/directory/apacheds/branches/apacheds-jdbm/core-annotations:1160768-1164073
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765
/directory/apacheds/branches/milestones/core-annotations:1072812-1075328
-/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201343,1201371-1203550
+/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201343,1201371-1203550,1203605-1204897
/directory/studio/trunk/core-annotations:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/core-api:1160768-1164073
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api:1040956-1043765
/directory/apacheds/branches/milestones/core-api:1072812-1075328
-/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201343,1201371-1203550
+/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201343,1201371-1203550,1203605-1204897
/directory/studio/trunk/core-api:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/core-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-api/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-api/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core-api/pom.xml Tue Nov 22 12:41:39 2011
@@ -43,33 +43,23 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-i18n</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
-
+
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core-constants</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-i18n</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
+ <artifactId>shared-i18n</artifactId>
</dependency>
<dependency>
@@ -79,18 +69,17 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
+ <artifactId>shared-ldap-client-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
+ <artifactId>shared-ldap-codec-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
+ <artifactId>shared-ldap-extras-util</artifactId>
</dependency>
<dependency>
@@ -109,8 +98,8 @@
</dependency>
<dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
</dependency>
<dependency>
Propchange: directory/apacheds/branches/apacheds-osgi/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/core-avl:1160768-1164073
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
/directory/apacheds/branches/milestones/core-avl:1072812-1075328
-/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550,1203605-1204897
/directory/studio/trunk/core-avl:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/core-constants:1160768-1164075
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
/directory/apacheds/branches/milestones/core-constants:1072812-1075328
-/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550,1203605-1204897
/directory/studio/trunk/core-constants:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/core-integ:1160768-1164075
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
/directory/apacheds/branches/milestones/core-integ:1072812-1075328
-/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550
+/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550,1203605-1204897
/directory/studio/trunk/core-integ:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Tue Nov 22 12:41:39 2011
@@ -502,6 +502,52 @@ public class PasswordPolicyTest extends
}
+ @Test
+ public void testModifyPwdSubentry() throws Exception
+ {
+ LdapConnection connection = getAdminNetworkConnection( getLdapServer() );
+
+ Dn userDn = new Dn( "cn=ppolicySubentry,ou=system" );
+ String password = "12345";
+ Entry userEntry = new DefaultEntry(
+ userDn.toString(),
+ "ObjectClass: top",
+ "ObjectClass: person",
+ "cn: ppolicySubentry",
+ "sn: ppolicySubentry_sn",
+ "userPassword: " + password,
+ "pwdPolicySubEntry:" + userDn.getName() );
+
+ AddRequest addRequest = new AddRequestImpl();
+ addRequest.setEntry( userEntry );
+ addRequest.addControl( PP_REQ_CTRL );
+
+ AddResponse addResp = connection.add( addRequest );
+ assertEquals( ResultCodeEnum.SUCCESS, addResp.getLdapResult().getResultCode() );
+
+ userEntry = connection.lookup( userDn, "*", "+" );
+ assertEquals( userDn.getName(), userEntry.get( "pwdPolicySubEntry" ).getString() );
+
+ ModifyRequest modReq = new ModifyRequestImpl();
+ modReq.setName( userDn );
+ String modSubEntryDn = "cn=policy,ou=system";
+ modReq.replace( "pwdPolicySubEntry", modSubEntryDn );
+ ModifyResponse modResp = connection.modify( modReq );
+ assertEquals( ResultCodeEnum.SUCCESS, modResp.getLdapResult().getResultCode() );
+
+ userEntry = connection.lookup( userDn, "*", "+" );
+ assertEquals( modSubEntryDn, userEntry.get( "pwdPolicySubEntry" ).getString() );
+
+ // try to modify the subentry as a non-admin
+ connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+ connection.bind( userDn.getName(), password );
+
+ modResp = connection.modify( modReq );
+ modReq.replace( "pwdPolicySubEntry", userDn.getName() );
+ assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, modResp.getLdapResult().getResultCode() );
+ }
+
+
private PasswordPolicy getPwdRespCtrl( Response resp ) throws Exception
{
Control control = resp.getControls().get( PP_REQ_CTRL.getOid() );
Propchange: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -9,5 +9,5 @@
/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
/directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550,1203605-1204897
/directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -8,6 +8,6 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1185681-1201345,1201371-1203550
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1185681-1201345,1201371-1203550,1203605-1204897
/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-jdbm/core-jndi:1160768-1164075
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
/directory/apacheds/branches/milestones/core-jndi:1072812-1075328
-/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550,1203605-1204897
/directory/studio/trunk/core-jndi:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-jndi/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-jndi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core-jndi/pom.xml Tue Nov 22 12:41:39 2011
@@ -51,12 +51,12 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core</artifactId>
+ <artifactId>apacheds-core-api</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
+ <artifactId>apacheds-core-shared</artifactId>
</dependency>
<dependency>
@@ -66,21 +66,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-ber</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
Propchange: directory/apacheds/branches/apacheds-osgi/core-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/core-shared:965203-965686
/directory/apacheds/branches/milestones/core-shared:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/core-shared:945827-946347
-/directory/apacheds/trunk/core-shared:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550
+/directory/apacheds/trunk/core-shared:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550,1203605-1204897
/directory/studio/trunk/core-shared:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/core-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core-shared/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core-shared/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core-shared/pom.xml Tue Nov 22 12:41:39 2011
@@ -41,56 +41,15 @@
<artifactId>junit-addons</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-constants</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
<dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-asn1-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-i18n</artifactId>
</dependency>
<dependency>
@@ -100,12 +59,12 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-model</artifactId>
+ <artifactId>shared-ldap-extras-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
+ <artifactId>shared-ldap-model</artifactId>
</dependency>
<dependency>
@@ -114,11 +73,6 @@
</dependency>
<dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- </dependency>
-
- <dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
</dependency>
Modified: directory/apacheds/branches/apacheds-osgi/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/core/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/core/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/core/pom.xml Tue Nov 22 12:41:39 2011
@@ -48,18 +48,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-i18n</artifactId>
</dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -103,21 +91,11 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-interceptors-hash</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-interceptors-journal</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-interceptors-logger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-interceptors-normalization</artifactId>
</dependency>
@@ -147,31 +125,10 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-codec-core</artifactId>
@@ -179,16 +136,6 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-extras-util</artifactId>
</dependency>
@@ -211,17 +158,6 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Propchange: directory/apacheds/branches/apacheds-osgi/dependencies/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/dependencies:965203-965686
/directory/apacheds/branches/milestones/dependencies:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/dependencies:945827-946347
-/directory/apacheds/trunk/dependencies:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550
+/directory/apacheds/trunk/dependencies:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201345,1201371-1203550,1203605-1204897
/directory/studio/trunk/dependencies:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/http-directory-bridge/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/http-directory-bridge:965203-965686
/directory/apacheds/branches/milestones/http-directory-bridge:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/http-directory-bridge:945827-946347
-/directory/apacheds/trunk/http-directory-bridge:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550
+/directory/apacheds/trunk/http-directory-bridge:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550,1203605-1204897
/directory/studio/trunk/http-directory-bridge:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/http-integration:1040956-1043765
/directory/apacheds/branches/milestones/http-integration:1072812-1075328
-/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550
+/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550,1203605-1204897
/directory/studio/trunk/http-integration:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/i18n:1040956-1043765
/directory/apacheds/branches/milestones/i18n:1072812-1075328
-/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550
+/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550,1203605-1204897
/directory/studio/trunk/i18n:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/installers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -1,6 +1,6 @@
/directory/apacheds/branches/apacheds-config/installers:1023442-1029077
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers:1040956-1043765
/directory/apacheds/branches/milestones/installers:1072812-1075328
-/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550
+/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550,1203605-1204897
/directory/installers/branches/installers-schema/apacheds:806631-896441
/directory/studio/trunk/installers:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/installers-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -1,6 +1,6 @@
/directory/apacheds/branches/apacheds-config/installers-maven-plugin:1023442-1029077
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers-maven-plugin:1040956-1043765
/directory/apacheds/branches/milestones/installers-maven-plugin:1072812-1075328
-/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550
+/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550,1203605-1204897
/directory/daemon/branches/daemon-schema/plugin:806630-896441
/directory/studio/trunk/installers-maven-plugin:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
/directory/apacheds/branches/milestones/interceptor-kerberos:1072812-1075328
-/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550
+/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201346,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptor-kerberos:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/admin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/admin:965203-965686
/directory/apacheds/branches/milestones/interceptors/admin:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/admin:945827-946347
-/directory/apacheds/trunk/interceptors/admin:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/admin:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/admin:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/admin/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/admin/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/admin/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/admin/pom.xml Tue Nov 22 12:41:39 2011
@@ -37,22 +37,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.junit</groupId>
- <artifactId>junit-addons</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-api</artifactId>
<classifier>tests</classifier>
@@ -65,47 +49,6 @@
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-extras-util</artifactId>
</dependency>
@@ -117,29 +60,8 @@
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-util</artifactId>
</dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/authn/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/authn:965203-965686
/directory/apacheds/branches/milestones/interceptors/authn:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/authn:945827-946347
-/directory/apacheds/trunk/interceptors/authn:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/authn:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/authn:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/authn/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/authn/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/authn/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/authn/pom.xml Tue Nov 22 12:41:39 2011
@@ -54,13 +54,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-shared</artifactId>
</dependency>
@@ -78,36 +71,15 @@
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-client-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
+ <artifactId>shared-ldap-extras-codec</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
+ <artifactId>shared-ldap-extras-codec-api</artifactId>
</dependency>
<dependency>
@@ -126,19 +98,8 @@
</dependency>
<dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
</dependency>
</dependencies>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java Tue Nov 22 12:41:39 2011
@@ -29,6 +29,7 @@ import static org.apache.directory.share
import static org.apache.directory.shared.ldap.model.constants.PasswordPolicySchemaConstants.PWD_HISTORY_AT;
import static org.apache.directory.shared.ldap.model.constants.PasswordPolicySchemaConstants.PWD_LAST_SUCCESS_AT;
import static org.apache.directory.shared.ldap.model.constants.PasswordPolicySchemaConstants.PWD_RESET_AT;
+import static org.apache.directory.shared.ldap.model.constants.PasswordPolicySchemaConstants.PWD_POLICY_SUBENTRY_AT;
import static org.apache.directory.shared.ldap.model.entry.ModificationOperation.ADD_ATTRIBUTE;
import static org.apache.directory.shared.ldap.model.entry.ModificationOperation.REMOVE_ATTRIBUTE;
import static org.apache.directory.shared.ldap.model.entry.ModificationOperation.REPLACE_ATTRIBUTE;
@@ -1180,6 +1181,8 @@ public class AuthenticationInterceptor e
AT_PWD_GRACE_USE_TIME = schemaManager.lookupAttributeTypeRegistry( PWD_GRACE_USE_TIME_AT );
PWD_POLICY_STATE_ATTRIBUTE_TYPES.add( AT_PWD_GRACE_USE_TIME );
+
+ PWD_POLICY_STATE_ATTRIBUTE_TYPES.add( schemaManager.lookupAttributeTypeRegistry( PWD_POLICY_SUBENTRY_AT ) );
}
}
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/authz/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/authz:965203-965686
/directory/apacheds/branches/milestones/interceptors/authz:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/authz:945827-946347
-/directory/apacheds/trunk/interceptors/authz:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201349,1201371-1203550
+/directory/apacheds/trunk/interceptors/authz:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201349,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/authz:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/authz/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/authz/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/authz/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/authz/pom.xml Tue Nov 22 12:41:39 2011
@@ -54,64 +54,16 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-shared</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-extras-aci</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
@@ -121,11 +73,6 @@
</dependency>
<dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-util</artifactId>
- </dependency>
-
- <dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</dependency>
@@ -134,12 +81,6 @@
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/changelog/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/changelog:965203-965686
/directory/apacheds/branches/milestones/interceptors/changelog:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/changelog:945827-946347
-/directory/apacheds/trunk/interceptors/changelog:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/changelog:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/changelog:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/changelog/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/changelog/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/changelog/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/changelog/pom.xml Tue Nov 22 12:41:39 2011
@@ -54,63 +54,10 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-shared</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
@@ -124,22 +71,6 @@
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-util</artifactId>
</dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/collective/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/collective:965203-965686
/directory/apacheds/branches/milestones/interceptors/collective:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/collective:945827-946347
-/directory/apacheds/trunk/interceptors/collective:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/collective:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/collective:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/collective/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/collective/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/collective/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/collective/pom.xml Tue Nov 22 12:41:39 2011
@@ -37,12 +37,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.junit</groupId>
- <artifactId>junit-addons</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-i18n</artifactId>
</dependency>
@@ -53,88 +47,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/event:965203-965686
/directory/apacheds/branches/milestones/interceptors/event:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/event:945827-946347
-/directory/apacheds/trunk/interceptors/event:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/event:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/event:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/event/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/event/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/event/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/event/pom.xml Tue Nov 22 12:41:39 2011
@@ -37,109 +37,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.junit</groupId>
- <artifactId>junit-addons</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-i18n</artifactId>
- </dependency>
-
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-shared</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/exception/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/exception:965203-965686
/directory/apacheds/branches/milestones/interceptors/exception:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/exception:945827-946347
-/directory/apacheds/trunk/interceptors/exception:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/exception:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/exception:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/exception/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/exception/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/exception/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/exception/pom.xml Tue Nov 22 12:41:39 2011
@@ -37,12 +37,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.junit</groupId>
- <artifactId>junit-addons</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-i18n</artifactId>
</dependency>
@@ -54,13 +48,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-shared</artifactId>
</dependency>
@@ -70,76 +57,9 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/hash/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/hash:965203-965686
/directory/apacheds/branches/milestones/interceptors/hash:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/hash:945827-946347
-/directory/apacheds/trunk/interceptors/hash:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/hash:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/hash:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/journal/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/journal:965203-965686
/directory/apacheds/branches/milestones/interceptors/journal:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/journal:945827-946347
-/directory/apacheds/trunk/interceptors/journal:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/journal:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/journal:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/journal/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/journal/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/journal/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/journal/pom.xml Tue Nov 22 12:41:39 2011
@@ -37,104 +37,14 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.junit</groupId>
- <artifactId>junit-addons</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/logger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/logger:965203-965686
/directory/apacheds/branches/milestones/interceptors/logger:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/logger:945827-946347
-/directory/apacheds/trunk/interceptors/logger:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/logger:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/logger:1067786-1067997
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/normalization/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/normalization:965203-965686
/directory/apacheds/branches/milestones/interceptors/normalization:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/normalization:945827-946347
-/directory/apacheds/trunk/interceptors/normalization:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/normalization:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/normalization:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/normalization/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/normalization/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/normalization/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/normalization/pom.xml Tue Nov 22 12:41:39 2011
@@ -53,64 +53,6 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-shared</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
@@ -124,22 +66,6 @@
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-util</artifactId>
</dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/operational/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/operational:965203-965686
/directory/apacheds/branches/milestones/interceptors/operational:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/operational:945827-946347
-/directory/apacheds/trunk/interceptors/operational:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/operational:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/operational:1067786-1067997
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/operational/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/operational/pom.xml?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/operational/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/operational/pom.xml Tue Nov 22 12:41:39 2011
@@ -37,12 +37,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.directory.junit</groupId>
- <artifactId>junit-addons</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apacheds-i18n</artifactId>
</dependency>
@@ -53,88 +47,14 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>apacheds-core-api</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.directory.shared</groupId>
<artifactId>shared-ldap-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
<artifactId>shared-util</artifactId>
</dependency>
-
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.directory.shared</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Modified: directory/apacheds/branches/apacheds-osgi/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1204958&r1=1204957&r2=1204958&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Tue Nov 22 12:41:39 2011
@@ -55,8 +55,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.entry.Value;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapNoPermissionException;
-import org.apache.directory.shared.ldap.model.exception.LdapSchemaViolationException;
-import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.name.Ava;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.name.Rdn;
@@ -331,7 +329,7 @@ public class OperationalAttributeInterce
{
String message = I18n.err( I18n.ERR_31 );
LOG.error( message );
- throw new LdapSchemaViolationException( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, message );
+ throw new LdapNoPermissionException( message );
}
else
{
@@ -345,7 +343,7 @@ public class OperationalAttributeInterce
{
String message = I18n.err( I18n.ERR_32 );
LOG.error( message );
- throw new LdapSchemaViolationException( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, message );
+ throw new LdapNoPermissionException( message );
}
else
{
@@ -359,7 +357,7 @@ public class OperationalAttributeInterce
{
String message = I18n.err( I18n.ERR_32 );
LOG.error( message );
- throw new LdapSchemaViolationException( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, message );
+ throw new LdapNoPermissionException( message );
}
else
{
@@ -371,7 +369,7 @@ public class OperationalAttributeInterce
{
String message = I18n.err( I18n.ERR_32 );
LOG.error( message );
- throw new LdapSchemaViolationException( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, message );
+ throw new LdapNoPermissionException( message );
}
}
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/referral/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 22 12:41:39 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/interceptors/referral:965203-965686
/directory/apacheds/branches/milestones/interceptors/referral:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptors/referral:945827-946347
-/directory/apacheds/trunk/interceptors/referral:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
+/directory/apacheds/trunk/interceptors/referral:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550,1203605-1204897
/directory/studio/trunk/interceptors/referral:1067786-1067997