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 2011/12/29 15:59:31 UTC
svn commit: r1225549 - in
/directory/apacheds/branches/apacheds-osgi/component-hub/src/main:
java/org/apache/directory/server/component/schema/
java/org/apache/directory/server/component/utilities/
resources/org/apache/directory/server/component/schema/
Author: gokturk
Date: Thu Dec 29 14:59:30 2011
New Revision: 1225549
URL: http://svn.apache.org/viewvc?rev=1225549&view=rev
Log:
* "ads-instance" attribute type is added to component-hub schema file
* Bugfix in DefaultComponentSchemaGenerator,(Used '=' instead of ':' while generating LdifEntry)
Modified:
directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/schema/DefaultComponentSchemaGenerator.java
directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/utilities/LdifConfigHelper.java
directory/apacheds/branches/apacheds-osgi/component-hub/src/main/resources/org/apache/directory/server/component/schema/componenthub.ldif
Modified: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/schema/DefaultComponentSchemaGenerator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/schema/DefaultComponentSchemaGenerator.java?rev=1225549&r1=1225548&r2=1225549&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/schema/DefaultComponentSchemaGenerator.java (original)
+++ directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/schema/DefaultComponentSchemaGenerator.java Thu Dec 29 14:59:30 2011
@@ -26,6 +26,7 @@ import java.util.List;
import org.apache.directory.server.component.ADSComponent;
import org.apache.directory.server.component.utilities.ADSComponentHelper;
import org.apache.directory.server.component.utilities.ADSConstants;
+import org.apache.directory.server.component.utilities.ADSSchemaConstants;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.model.ldif.LdapLdifException;
@@ -120,8 +121,7 @@ public class DefaultComponentSchemaGener
String ocoid = ComponentOIDGenerator.getObjectClassOID( componentBaseOID );
String ocDn = "m-oid=" + ocoid + "," + ocsDn;
- ocAttribs.add( 0, "m-may:cached" );
- ocAttribs.add( 0, "m-must:ins" );
+ ocAttribs.add( 0, "m-must:" + ADSSchemaConstants.ADS_COMPONENT_INSTANCE_ATTRIB_NAME );
ocAttribs.add( 0, "m-must:active" );
ocAttribs.add( 0, "m-supObjectClass: top" );
ocAttribs.add( 0, "m-description:Object Class for generating instances of:" + componentName );
Modified: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/utilities/LdifConfigHelper.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/utilities/LdifConfigHelper.java?rev=1225549&r1=1225548&r2=1225549&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/utilities/LdifConfigHelper.java (original)
+++ directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/utilities/LdifConfigHelper.java Thu Dec 29 14:59:30 2011
@@ -68,11 +68,11 @@ public class LdifConfigHelper
{
if ( key.equals( ADSConstants.ADS_COMPONENT_INSTANCE_PROP_NAME ) )
{
- String dnAttrib = ADSSchemaConstants.ADS_COMPONENT_INSTANCE_ATTRIB_NAME + "=" + instanceName;
+ String dnAttrib = ADSSchemaConstants.ADS_COMPONENT_INSTANCE_ATTRIB_NAME + ":" + instanceName;
attributes.add( dnAttrib );
}
- String attribute = ( String ) key + "=" + ( String ) instanceConfiguration.get( key );
+ String attribute = ( String ) key + ":" + ( String ) instanceConfiguration.get( key );
attributes.add( attribute );
}
@@ -113,7 +113,8 @@ public class LdifConfigHelper
try
{
- String instanceName = instanceEntry.get( ADSSchemaConstants.ADS_COMPONENT_INSTANCE_ATTRIB_NAME ).getString();
+ String instanceName = instanceEntry.get( ADSSchemaConstants.ADS_COMPONENT_INSTANCE_ATTRIB_NAME )
+ .getString();
if ( instanceName == null )
{
//Entry is not instance entry.
Modified: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/resources/org/apache/directory/server/component/schema/componenthub.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/resources/org/apache/directory/server/component/schema/componenthub.ldif?rev=1225549&r1=1225548&r2=1225549&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-hub/src/main/resources/org/apache/directory/server/component/schema/componenthub.ldif (original)
+++ directory/apacheds/branches/apacheds-osgi/component-hub/src/main/resources/org/apache/directory/server/component/schema/componenthub.ldif Thu Dec 29 14:59:30 2011
@@ -78,6 +78,22 @@ m-length: 0
m-singleValue: TRUE
m-usage: directoryOperation
+dn: m-oid=1.3.6.1.4.1.18060.0.4.4.0.1.5, ou=attributeTypes, cn=componenthub, ou=sc
+ hema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.3.6.1.4.1.18060.0.4.4.0.1.5
+m-name: ads-instance
+m-description: The normalized factory name of an IPojo component
+m-equality: caseIgnoreMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseIgnoreSubstringsMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
+m-length: 0
+m-singleValue: TRUE
+m-usage: directoryOperation
+
dn: ou=comparators, cn=componenthub, ou=schema
objectclass: organizationalUnit
objectclass: top