directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r544810 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core: authz/ exception/ operational/ partition/ schema/ subtree/
Date Wed, 06 Jun 2007 11:30:20 GMT
Author: elecharny
Date: Wed Jun  6 04:30:19 2007
New Revision: 544810

URL: http://svn.apache.org/viewvc?view=rev&rev=544810
Log:
As the "subschemaSubentry" AT is now declared in SchemaConstants, using 
it instead of using a string constant in the code

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?view=diff&rev=544810&r1=544809&r2=544810
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
Wed Jun  6 04:30:19 2007
@@ -216,8 +216,9 @@
         enabled = factoryCfg.getStartupConfiguration().isAccessControlEnabled();
 
         // stuff for dealing with subentries (garbage for now)
-        String subschemaSubentry = ( String ) factoryCfg.getPartitionNexus().getRootDSE(
null ).
-        get( "subschemaSubentry" ).get();
+        String subschemaSubentry = 
+        	( String ) factoryCfg.getPartitionNexus().getRootDSE( null ).
+        		get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
         LdapDN subschemaSubentryDnName = new LdapDN( subschemaSubentry );
         subschemaSubentryDnName.normalize( attrRegistry.getNormalizerMapping() );
         subschemaSubentryDn = subschemaSubentryDnName.toNormName();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?view=diff&rev=544810&r1=544809&r2=544810
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java
Wed Jun  6 04:30:19 2007
@@ -120,7 +120,7 @@
     {
         nexus = factoryCfg.getPartitionNexus();
         normalizerMap = factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping();
-        Attribute attr = nexus.getRootDSE( null ).get( "subschemaSubentry" );
+        Attribute attr = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
);
         subschemSubentryDn = new LdapDN( ( String ) attr.get() );
         subschemSubentryDn.normalize( normalizerMap );
         notAliasCache = new LRUMap( DEFAULT_CACHE_SIZE );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=544810&r1=544809&r2=544810
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
Wed Jun  6 04:30:19 2007
@@ -140,7 +140,7 @@
         isDenormalizeOpAttrsEnabled = factoryCfg.getStartupConfiguration().isDenormalizeOpAttrsEnabled();
 
         // stuff for dealing with subentries (garbage for now)
-        String subschemaSubentry = ( String ) nexus.getRootDSE( null ).get( "subschemaSubentry"
).get();
+        String subschemaSubentry = ( String ) nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
).get();
         subschemaSubentryDn = new LdapDN( subschemaSubentry );
         subschemaSubentryDn.normalize( factoryCfg.getRegistries().getAttributeTypeRegistry().getNormalizerMapping()
);
     }

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=544810&r1=544809&r2=544810
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
Wed Jun  6 04:30:19 2007
@@ -145,7 +145,7 @@
     {
         // setup that root DSE
         this.rootDSE = rootDSE;
-        Attribute attr = new AttributeImpl( "subschemaSubentry" );
+        Attribute attr = new AttributeImpl( SchemaConstants.SUBSCHEMA_SUBENTRY_AT );
         attr.add( GLOBAL_SCHEMA_SUBENTRY_DN );
         rootDSE.put( attr );
 

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=544810&r1=544809&r2=544810
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Wed Jun  6 04:30:19 2007
@@ -213,7 +213,7 @@
         schemaManager = factoryCfg.getSchemaManager();
         
         // stuff for dealing with subentries (garbage for now)
-        String subschemaSubentry = ( String ) nexus.getRootDSE( null ).get( "subschemaSubentry"
).get();
+        String subschemaSubentry = ( String ) nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
).get();
         subschemaSubentryDn = new LdapDN( subschemaSubentry );
         subschemaSubentryDn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping()
);
         subschemaSubentryDnNorm = subschemaSubentryDn.getNormName();

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java?view=diff&rev=544810&r1=544809&r2=544810
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryService.java
Wed Jun  6 04:30:19 2007
@@ -98,7 +98,6 @@
     public static final String AC_SUBENTRIES = "accessControlSubentries";
 
     public static final String SCHEMA_AREA = "subschemaAdminSpecificArea";
-    public static final String SCHEMA_SUBENTRY = "subschemaSubentry";
 
     public static final String COLLECTIVE_AREA = "collectiveAttributeSpecificArea";
     public static final String COLLECTIVE_INNERAREA = "collectiveAttributeInnerArea";
@@ -109,7 +108,12 @@
     public static final String TRIGGER_SUBENTRIES = "triggerExecutionSubentries";
 
     public static final String[] SUBENTRY_OPATTRS =
-        { AC_SUBENTRIES, SCHEMA_SUBENTRY, COLLECTIVE_ATTRIBUTE_SUBENTRIES, TRIGGER_SUBENTRIES
};
+        { 
+    	AC_SUBENTRIES, 
+    	SchemaConstants.SUBSCHEMA_SUBENTRY_AT, 
+    	COLLECTIVE_ATTRIBUTE_SUBENTRIES, 
+    	TRIGGER_SUBENTRIES 
+    	};
 
     private static final Logger log = LoggerFactory.getLogger( SubentryService.class );
 
@@ -341,10 +345,10 @@
                 }
                 if ( subentry.isSchemaSubentry() )
                 {
-                    operational = subentryAttrs.get( SCHEMA_SUBENTRY );
+                    operational = subentryAttrs.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
);
                     if ( operational == null )
                     {
-                        operational = new AttributeImpl( SCHEMA_SUBENTRY );
+                        operational = new AttributeImpl( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
);
                         subentryAttrs.put( operational );
                     }
                     operational.add( subentryDn.toString() );
@@ -502,11 +506,11 @@
                     
                     if ( subentry.isSchemaSubentry() )
                     {
-                        operational = entry.get( SCHEMA_SUBENTRY );
+                        operational = entry.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT );
                         
                         if ( operational == null )
                         {
-                            operational = new AttributeImpl( SCHEMA_SUBENTRY );
+                            operational = new AttributeImpl( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
);
                             entry.put( operational );
                         }
                         
@@ -1148,10 +1152,10 @@
         }
         if ( subentry.isSchemaSubentry() )
         {
-            operational = ( Attribute ) entry.get( SCHEMA_SUBENTRY ).clone();
+            operational = ( Attribute ) entry.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT
).clone();
             if ( operational == null )
             {
-                operational = new AttributeImpl( SCHEMA_SUBENTRY );
+                operational = new AttributeImpl( SchemaConstants.SUBSCHEMA_SUBENTRY_AT );
                 operational.add( newName.toString() );
             }
             else
@@ -1224,13 +1228,13 @@
         }
         if ( subentry.isSchemaSubentry() )
         {
-            if ( operational.get( SCHEMA_SUBENTRY ) == null )
+            if ( operational.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ) == null )
             {
-                operational.put( SCHEMA_SUBENTRY, name.toString() );
+                operational.put( SchemaConstants.SUBSCHEMA_SUBENTRY_AT, name.toString() );
             }
             else
             {
-                operational.get( SCHEMA_SUBENTRY ).add( name.toString() );
+                operational.get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).add( name.toString()
);
             }
         }
         if ( subentry.isCollectiveSubentry() )



Mime
View raw message