You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by go...@apache.org on 2012/01/09 18:01:27 UTC
svn commit: r1229255 -
/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentSchemaManager.java
Author: gokturk
Date: Mon Jan 9 17:01:27 2012
New Revision: 1229255
URL: http://svn.apache.org/viewvc?rev=1229255&view=rev
Log:
* ComponentSchemaManager's feedOIDGenerator() method was not working with ONELEVEL scope, changed to SUBTREE scope with parent Dn.
Modified:
directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentSchemaManager.java
Modified: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentSchemaManager.java?rev=1229255&r1=1229254&r2=1229255&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentSchemaManager.java (original)
+++ directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentSchemaManager.java Mon Jan 9 17:01:27 2012
@@ -136,7 +136,7 @@ public class ComponentSchemaManager
{
throw new LdapException( "Notregistered component type in schema generator." );
}
-
+
injectSchemaElements( schema );
}
@@ -264,14 +264,13 @@ public class ComponentSchemaManager
try
{
Dn componentOCDn = EntryNormalizer.normalizeDn(
- new Dn( "m-oid", ADSSchemaConstants.ADS_COMPONENT_OID,
- SchemaConstants.OBJECT_CLASSES_PATH,
- "cn",
- ADSSchemaConstants.ADS_COMPONENT_BASE, SchemaConstants.OU_SCHEMA ) );
+ new Dn( SchemaConstants.OBJECT_CLASSES_PATH,
+ "cn", ADSSchemaConstants.ADS_COMPONENT_BASE,
+ SchemaConstants.OU_SCHEMA ) );
SearchOperationContext soc = new SearchOperationContext( null );
soc.setDn( componentOCDn );
- soc.setScope( SearchScope.OBJECT );
+ soc.setScope( SearchScope.SUBTREE );
AttributeType moidat = schemaPartition.getSchemaManager().getAttributeType( "m-oid" );
soc.setFilter( new PresenceNode( moidat ) );