directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1053919 - in /directory: apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authz/ apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/exception/ apacheds/branches/apacheds-AP/co...
Date Thu, 30 Dec 2010 15:39:25 GMT
Author: elecharny
Date: Thu Dec 30 15:39:25 2010
New Revision: 1053919

URL: http://svn.apache.org/viewvc?rev=1053919&view=rev
Log:
Renamed the SUBSCHEMA_SUBENTRY_AT constant

Modified:
    directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/branches/apacheds-AP/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/branches/apacheds-AP/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java
    directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java

Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=1053919&r1=1053918&r2=1053919&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
Thu Dec 30 15:39:25 2010
@@ -212,7 +212,7 @@ public class AciAuthorizationInterceptor
 
         // stuff for dealing with subentries (garbage for now)
         Value<?> subschemaSubentry = directoryService.getPartitionNexus().getRootDSE(
null ).get(
-            SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
+            SchemaConstants.SUB_SCHEMA_SUBENTRY_AT ).get();
         DN subschemaSubentryDnName = directoryService.getDNFactory().create( subschemaSubentry.getString()
);
         subschemaSubentryDn = subschemaSubentryDnName.getNormName();
     }

Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=1053919&r1=1053918&r2=1053919&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
Thu Dec 30 15:39:25 2010
@@ -113,7 +113,7 @@ public class ExceptionInterceptor extend
     public void init( DirectoryService directoryService ) throws LdapException
     {
         nexus = directoryService.getPartitionNexus();
-        Value<?> attr = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
).get();
+        Value<?> attr = nexus.getRootDSE( null ).get( SchemaConstants.SUB_SCHEMA_SUBENTRY_AT
).get();
         subschemSubentryDn = directoryService.getDNFactory().create( attr.getString() );
         schemaManager = directoryService.getSchemaManager();
 

Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1053919&r1=1053918&r2=1053919&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
Thu Dec 30 15:39:25 2010
@@ -136,7 +136,7 @@ public class OperationalAttributeInterce
 
         // stuff for dealing with subentries (garbage for now)
         Value<?> subschemaSubentry = service.getPartitionNexus().getRootDSE( null ).get(
-            SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
+            SchemaConstants.SUB_SCHEMA_SUBENTRY_AT ).get();
         subschemaSubentryDn = service.getDNFactory().create( subschemaSubentry.getString()
);
 
         // Create the Admin DN 

Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1053919&r1=1053918&r2=1053919&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
(original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
Thu Dec 30 15:39:25 2010
@@ -164,7 +164,7 @@ public class DefaultPartitionNexus exten
         this.rootDSE = rootDSE;
 
         // Add the basic informations
-        rootDSE.put( SchemaConstants.SUBSCHEMA_SUBENTRY_AT, ServerDNConstants.CN_SCHEMA_DN
);
+        rootDSE.put( SchemaConstants.SUB_SCHEMA_SUBENTRY_AT, ServerDNConstants.CN_SCHEMA_DN
);
         rootDSE.put( SchemaConstants.SUPPORTED_LDAP_VERSION_AT, "3" );
         rootDSE.put( SchemaConstants.SUPPORTED_FEATURES_AT, SchemaConstants.FEATURE_ALL_OPERATIONAL_ATTRIBUTES
);
         rootDSE.put( SchemaConstants.SUPPORTED_EXTENSION_AT, NoticeOfDisconnect.EXTENSION_OID
);

Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1053919&r1=1053918&r2=1053919&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
Thu Dec 30 15:39:25 2010
@@ -210,7 +210,7 @@ public class ReferralInterceptor extends
         referralManager = new ReferralManagerImpl( directoryService );
         directoryService.setReferralManager( referralManager );
 
-        Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
).get();
+        Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUB_SCHEMA_SUBENTRY_AT
).get();
         subschemaSubentryDn = directoryService.getDNFactory().create( subschemaSubentry.getString()
);
 
         // look up some constant information

Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1053919&r1=1053918&r2=1053919&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
Thu Dec 30 15:39:25 2010
@@ -196,7 +196,7 @@ public class SchemaInterceptor extends B
         schemaService = directoryService.getSchemaService();
 
         // stuff for dealing with subentries (garbage for now)
-        Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
).get();
+        Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUB_SCHEMA_SUBENTRY_AT
).get();
         subschemaSubentryDn = directoryService.getDNFactory().create( subschemaSubentry.getString()
);
         subschemaSubentryDn.normalize( schemaManager );
         subschemaSubentryDnNorm = subschemaSubentryDn.getNormName();

Modified: directory/apacheds/branches/apacheds-AP/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1053919&r1=1053918&r2=1053919&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
(original)
+++ directory/apacheds/branches/apacheds-AP/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
Thu Dec 30 15:39:25 2010
@@ -1340,7 +1340,7 @@ public class SearchHandler extends LdapR
 
         DirectoryService ds = session.getCoreSession().getDirectoryService();
         PartitionNexus nexus = ds.getPartitionNexus();
-        Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
).get();
+        Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUB_SCHEMA_SUBENTRY_AT
).get();
         DN subschemaSubentryDn = new DN( subschemaSubentry.getString(), ds.getSchemaManager()
);
         String subschemaSubentryDnNorm = subschemaSubentryDn.getNormName();
 

Modified: directory/apacheds/branches/apacheds-AP/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java?rev=1053919&r1=1053918&r2=1053919&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java
(original)
+++ directory/apacheds/branches/apacheds-AP/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java
Thu Dec 30 15:39:25 2010
@@ -81,19 +81,19 @@ import org.junit.runner.RunWith;
         "ObjectClass: organizationalUnit",
         "ou: noAP1",
         "",
-        // Entry # 2
-        "dn: ou=AAP1,ou=noAP1,ou=system",
-        "ObjectClass: top",
-        "ObjectClass: organizationalUnit",
-        "ou: AAP1",
-        "administrativeRole: autonomousArea",
-        "",
-        // Entry # 3
-        "dn: ou=noAP2,ou=AAP1,ou=noAP1,ou=system",
-        "ObjectClass: top",
-        "ObjectClass: organizationalUnit",
-        "ou: noAP2",
-        "",
+            // Entry # 2
+            "dn: ou=AAP1,ou=noAP1,ou=system",
+            "ObjectClass: top",
+            "ObjectClass: organizationalUnit",
+            "ou: AAP1",
+            "administrativeRole: autonomousArea",
+            "",
+                // Entry # 3
+                "dn: ou=noAP2,ou=AAP1,ou=noAP1,ou=system",
+                "ObjectClass: top",
+                "ObjectClass: organizationalUnit",
+                "ou: noAP2",
+                "",
         // Entry # 4
         "dn: ou=AAP2,ou=system",
         "ObjectClass: top",
@@ -101,25 +101,25 @@ import org.junit.runner.RunWith;
         "ou: AAP2",
         "administrativeRole: autonomousArea",
         "",
-        // Entry # 5
-        "dn: ou=noAP3,ou=AAP2,ou=system",
-        "ObjectClass: top",
-        "ObjectClass: organizationalUnit",
-        "ou: noAP3",
-        "",
-        // Entry # 6
-        "dn: ou=subAAP1,ou=noAP3,ou=AAP2,ou=system",
-        "ObjectClass: top",
-        "ObjectClass: organizationalUnit",
-        "ou: subAAP1",
-        "administrativeRole: autonomousArea",
-        "",
-        // Entry # 7
-        "dn: ou=noAP4,ou=subAAP1,ou=noAP3,ou=AAP2,ou=system",
-        "ObjectClass: top",
-        "ObjectClass: organizationalUnit",
-        "ou: noAP4",
-        ""
+            // Entry # 5
+            "dn: ou=noAP3,ou=AAP2,ou=system",
+            "ObjectClass: top",
+            "ObjectClass: organizationalUnit",
+            "ou: noAP3",
+            "",
+                // Entry # 6
+                "dn: ou=subAAP1,ou=noAP3,ou=AAP2,ou=system",
+                "ObjectClass: top",
+                "ObjectClass: organizationalUnit",
+                "ou: subAAP1",
+                "administrativeRole: autonomousArea",
+                "",
+                    // Entry # 7
+                    "dn: ou=noAP4,ou=subAAP1,ou=noAP3,ou=AAP2,ou=system",
+                    "ObjectClass: top",
+                    "ObjectClass: organizationalUnit",
+                    "ou: noAP4",
+                    ""
     })
 public class AdministrativePointPersistentIT extends AbstractLdapTestUnit
 {
@@ -165,6 +165,8 @@ public class AdministrativePointPersiste
     {
         assertTrue( ldapServer.isStarted() );
 
+        assertEquals( 3, ldapServer.getDirectoryService().getApSeqNumber() );
+        
         // Stop the server now, we will restart it immediately 
         ldapServer.stop();
         assertFalse( ldapServer.isStarted() );
@@ -180,6 +182,7 @@ public class AdministrativePointPersiste
 
         assertTrue( service.isStarted() );
         assertTrue( ldapServer.getDirectoryService().isStarted() );
+        assertEquals( 3, ldapServer.getDirectoryService().getApSeqNumber() );
         
         // Check that the roles are present
         assertEquals( "autonomousArea", getAdminRole( "ou=AAP1,ou=noAP1,ou=system" ).getString()
);

Modified: directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java?rev=1053919&r1=1053918&r2=1053919&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
(original)
+++ directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/constants/SchemaConstants.java
Thu Dec 30 15:39:25 2010
@@ -436,8 +436,8 @@ public final class SchemaConstants
     public final static String HAS_SUBORDINATES_AT_OID                  = "2.5.18.9";
 
     // SubschemaSubentry
-    public final static String SUBSCHEMA_SUBENTRY_AT                    = "subschemaSubentry";
-    public final static String SUBSCHEMA_SUBENTRY_AT_OID                = "2.5.18.10";
+    public final static String SUB_SCHEMA_SUBENTRY_AT                   = "subschemaSubentry";
+    public final static String SUB_SCHEMA_SUBENTRY_AT_OID               = "2.5.18.10";
 
     // CollectiveAttributeSubentries
     public final static String COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT       = "collectiveAttributeSubentries";



Mime
View raw message