Author: akarasulu
Date: Thu Oct 14 22:59:32 2004
New Revision: 54823
Added:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/AbstractSchemaGroup.java
- copied, changed from rev 54769,
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/AbstractSchemaGrouping.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/SchemaGroup.java
- copied, changed from rev 54821,
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/SchemaGrouping.java
Removed:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/AbstractSchemaGrouping.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/SchemaGrouping.java
Modified:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContext.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JavaLdap.java
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/CoreSyntaxFactory.java
Log:
ok did a rename plus some changes
Modified:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContext.java
==============================================================================
---
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContext.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/EveContext.java
Thu Oct 14 22:59:32 2004
@@ -208,7 +208,7 @@
* attributes before normalization. The result should have ths same
* affect as the following line within the interceptor.
*
- * l_attributes.put( SchemaGrouping.DN_ATTR, l_target.toString() ) ;
+ * l_attributes.put( SchemaGroup.DN_ATTR, l_target.toString() ) ;
*/
l_attributes.put( l_rdnAttribute, l_rdnValue ) ;
l_attributes.put( JavaLdap.OBJECTCLASS_ATTR,
Modified:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JavaLdap.java
==============================================================================
---
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JavaLdap.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/jndi/JavaLdap.java
Thu Oct 14 22:59:32 2004
@@ -20,7 +20,7 @@
public class JavaLdap
{
// ------------------------------------------------------------------------
- // Attribute Id Constants Used By The Java LDAP SchemaGrouping
+ // Attribute Id Constants Used By The Java LDAP SchemaGroup
// ------------------------------------------------------------------------
/** */
Copied:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/AbstractSchemaGroup.java
(from rev 54769,
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/AbstractSchemaGrouping.java)
==============================================================================
---
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/AbstractSchemaGrouping.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/AbstractSchemaGroup.java
Thu Oct 14 22:59:32 2004
@@ -19,6 +19,8 @@
import org.apache.ldap.common.util.ArrayUtils;
+import javax.naming.NamingException;
+
/**
* Document me.
@@ -26,7 +28,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a>
* @version $Rev$
*/
-public abstract class AbstractSchemaGrouping implements SchemaGrouping
+public class AbstractSchemaGroup implements SchemaGroup
{
private static final String DEFAULT_OWNER = "uid=admin,ou=system";
private static final String DEFAULT_SCHEMA_NAME = "default";
@@ -41,7 +43,9 @@
// ------------------------------------------------------------------------
- public AbstractSchemaGrouping( String owner, String schemaName, String[]
dependencies )
+ protected AbstractSchemaGroup( String owner,
+ String schemaName,
+ String[] dependencies )
{
if ( owner == null )
{
@@ -72,21 +76,27 @@
}
- public String getOwner()
+ public final String getOwner()
{
return owner;
}
- public String getSchemaName()
+ public final String getSchemaName()
{
return schemaName;
}
- public String[] getDependencies()
+ public final String[] getDependencies()
{
return dependencies;
+ }
+
+
+ public final void populate( BootstrapRegistries registries )
+ throws NamingException
+ {
}
Modified:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/CoreSyntaxFactory.java
==============================================================================
---
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/CoreSyntaxFactory.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/CoreSyntaxFactory.java
Thu Oct 14 22:59:32 2004
@@ -441,8 +441,8 @@
* 52 UTC Time Y 1.3.6.1.4.1.1466.115.121.1.53
* 53 LDAP Syntax Description Y 1.3.6.1.4.1.1466.115.121.1.54
* 54 Modify Rights Y 1.3.6.1.4.1.1466.115.121.1.55
- * 55 LDAP SchemaGrouping Definition Y
1.3.6.1.4.1.1466.115.121.1.56
- * 56 LDAP SchemaGrouping Description Y
1.3.6.1.4.1.1466.115.121.1.57
+ * 55 LDAP SchemaGroup Definition Y
1.3.6.1.4.1.1466.115.121.1.56
+ * 56 LDAP SchemaGroup Description Y
1.3.6.1.4.1.1466.115.121.1.57
* 57 Substring Assertion Y 1.3.6.1.4.1.1466.115.121.1.58
*/
syntax = new MutableSyntax( "1.3.6.1.4.1.1466.115.121.1.51" );
@@ -471,12 +471,12 @@
syntaxes.put( syntax.getOid(), syntax );
syntax = new MutableSyntax( "1.3.6.1.4.1.1466.115.121.1.56" );
- syntax.setName( "LDAP SchemaGrouping Definition" );
+ syntax.setName( "LDAP SchemaGroup Definition" );
syntax.setHumanReadible( true );
syntaxes.put( syntax.getOid(), syntax );
syntax = new MutableSyntax( "1.3.6.1.4.1.1466.115.121.1.57" );
- syntax.setName( "LDAP SchemaGrouping Description" );
+ syntax.setName( "LDAP SchemaGroup Description" );
syntax.setHumanReadible( true );
syntaxes.put( syntax.getOid(), syntax );
Copied:
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/SchemaGroup.java
(from rev 54821,
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/SchemaGrouping.java)
==============================================================================
---
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/SchemaGrouping.java
(original)
+++
incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/schema/config/SchemaGroup.java
Thu Oct 14 22:59:32 2004
@@ -19,6 +19,7 @@
import org.apache.ldap.common.schema.*;
import org.apache.eve.schema.*;
+import javax.naming.NamingException;
import java.util.Map;
@@ -29,18 +30,18 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a>
* @version $Rev$
*/
-public interface SchemaGrouping
+public interface SchemaGroup
{
/**
* Gets the name of the owner of the schema objects within this
- * SchemaGrouping.
+ * SchemaGroup.
*
* @return the identifier for the owner of this set's objects
*/
String getOwner();
/**
- * Gets the name of the logical schema the objects of this SchemaGrouping
+ * Gets the name of the logical schema the objects of this SchemaGroup
* belong to: e.g. krb5-kdc may be the logical LDAP schema name.
*
* @return the name of the logical schema
@@ -49,7 +50,7 @@
/**
* Gets the names of other schemas that this objects within this
- * SchemaGrouping depends upon. These dependent schemas are those
+ * SchemaGroup depends upon. These dependent schemas are those
* whose ConfigurationSets will be processed first.
*
* @return the String names of schema dependencies
@@ -57,29 +58,8 @@
String[] getDependencies();
/**
- * Gets a map of comparators
- *
- * @return
+ * Populates the set of bootstrap registries with the Schema objects from
+ * this logical SchemaGroup.
*/
- Map getComparators();
-
- Map getNormalizers();
-
- Map getSyntaxCheckers();
-
- Map getSyntaxes();
-
- Map getMatchingRules();
-
- Map getAttributeTypes();
-
- Map getObjectClasses();
-
- Map getDITContentRules();
-
- Map getDITStructureRules();
-
- Map getNameForms();
-
- Map getMatchingRuleUses();
+ void populate( BootstrapRegistries registries ) throws NamingException;
}
