directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1056410 - in /directory/apacheds/branches/apacheds-AP: core/ core/src/main/java/org/apache/directory/server/core/ core/src/main/java/org/apache/directory/server/core/authn/ interceptor-kerberos/ interceptor-kerberos/src/main/java/org/apach...
Date Fri, 07 Jan 2011 17:44:08 GMT
Author: elecharny
Date: Fri Jan  7 17:44:08 2011
New Revision: 1056410

URL: http://svn.apache.org/viewvc?rev=1056410&view=rev
Log:
Merged back the modifications made in trunk (interceptor inversion)

Modified:
    directory/apacheds/branches/apacheds-AP/core/   (props changed)
    directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
    directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
    directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
    directory/apacheds/branches/apacheds-AP/interceptor-kerberos/   (props changed)
    directory/apacheds/branches/apacheds-AP/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
    directory/apacheds/branches/apacheds-AP/server-config/   (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
  (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/   (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/config.ldif
    directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
  (props changed)

Propchange: directory/apacheds/branches/apacheds-AP/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  7 17:44:08 2011
@@ -3,3 +3,4 @@
 /directory/apacheds/branches/apacheds-config/core:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
+/directory/apacheds/trunk/core:1049007-1056375

Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1056410&r1=1056409&r2=1056410&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
(original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
Fri Jan  7 17:44:08 2011
@@ -692,8 +692,8 @@ public class DefaultDirectoryService imp
         list.add( new ChangeLogInterceptor() );
         list.add( new OperationalAttributeInterceptor() );
         list.add( new SchemaInterceptor() );
-        list.add( new SubentryInterceptor() );
         list.add( new CollectiveAttributeInterceptor() );
+        list.add( new SubentryInterceptor() );
         list.add( new EventInterceptor() );
         list.add( new TriggerInterceptor() );
         list.add( new JournalInterceptor() );

Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java?rev=1056410&r1=1056409&r2=1056410&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationInterceptor.java
Fri Jan  7 17:44:08 2011
@@ -175,8 +175,8 @@ public class AuthenticationInterceptor e
         c.add( ExceptionInterceptor.class.getName() );
         c.add( OperationalAttributeInterceptor.class.getName() );
         c.add( SchemaInterceptor.class.getName() );
-        c.add( SubentryInterceptor.class.getName() );
         c.add( CollectiveAttributeInterceptor.class.getName() );
+        c.add( SubentryInterceptor.class.getName() );
         c.add( EventInterceptor.class.getName() );
         c.add( TriggerInterceptor.class.getName() );
         BYPASS_INTERCEPTORS = Collections.unmodifiableCollection( c );

Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=1056410&r1=1056409&r2=1056410&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
(original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
Fri Jan  7 17:44:08 2011
@@ -115,8 +115,8 @@ public class SimpleAuthenticator extends
         c.add( ExceptionInterceptor.class.getName() );
         c.add( OperationalAttributeInterceptor.class.getName() );
         c.add( SchemaInterceptor.class.getName() );
-        c.add( SubentryInterceptor.class.getName() );
         c.add( CollectiveAttributeInterceptor.class.getName() );
+        c.add( SubentryInterceptor.class.getName() );
         c.add( EventInterceptor.class.getName() );
         c.add( TriggerInterceptor.class.getName() );
         USERLOOKUP_BYPASS = Collections.unmodifiableCollection( c );

Propchange: directory/apacheds/branches/apacheds-AP/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  7 17:44:08 2011
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/interceptor-kerberos:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
+/directory/apacheds/trunk/interceptor-kerberos:1049007-1056374

Modified: directory/apacheds/branches/apacheds-AP/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=1056410&r1=1056409&r2=1056410&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-AP/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
Fri Jan  7 17:44:08 2011
@@ -108,8 +108,8 @@ public class KeyDerivationInterceptor ex
         c.add( ExceptionInterceptor.class.getName() );
         c.add( OperationalAttributeInterceptor.class.getName() );
         c.add( SchemaInterceptor.class.getName() );
-        c.add( SubentryInterceptor.class.getName() );
         c.add( CollectiveAttributeInterceptor.class.getName() );
+        c.add( SubentryInterceptor.class.getName() );
         c.add( EventInterceptor.class.getName() );
         c.add( TriggerInterceptor.class.getName() );
         USERLOOKUP_BYPASS = Collections.unmodifiableCollection( c );

Propchange: directory/apacheds/branches/apacheds-AP/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  7 17:44:08 2011
@@ -4,4 +4,4 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
 /directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
-/directory/apacheds/trunk/server-config:1049007-1053669
+/directory/apacheds/trunk/server-config:1049007-1056408

Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  7 17:44:08 2011
@@ -8,4 +8,4 @@
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965203-965686
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1049007-1053669
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1049007-1056408

Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  7 17:44:08 2011
@@ -11,4 +11,4 @@
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources:965203-965686
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
-/directory/apacheds/trunk/server-config/src/main/resources:1049007-1053669
+/directory/apacheds/trunk/server-config/src/main/resources:1049007-1056408

Modified: directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/config.ldif?rev=1056410&r1=1056409&r2=1056410&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/config.ldif (original)
+++ directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/config.ldif Fri
Jan  7 17:44:08 2011
@@ -112,7 +112,7 @@ dn: ads-interceptorId=collectiveAttribut
 objectclass: top
 objectclass: ads-base
 objectclass: ads-interceptor
-ads-interceptororder: 12
+ads-interceptororder: 11
 ads-interceptorclassname: org.apache.directory.server.core.collective.CollectiveAttributeInterceptor
 ads-interceptorid: collectiveAttributeInterceptor
 ads-enabled: TRUE
@@ -202,7 +202,7 @@ dn: ads-interceptorId=subentryIntercepto
 objectclass: top
 objectclass: ads-base
 objectclass: ads-interceptor
-ads-interceptororder: 11
+ads-interceptororder: 12
 ads-interceptorclassname: org.apache.directory.server.core.subtree.SubentryInterceptor
 ads-interceptorid: subentryInterceptor
 ads-enabled: TRUE

Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan  7 17:44:08 2011
@@ -10,4 +10,4 @@
 /directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681
 /directory/apacheds/branches/server-config-annotations/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1049007-1053669
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1049007-1056408



Mime
View raw message