You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2005/12/19 00:22:42 UTC
svn commit: r357552 -
/directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/
Author: elecharny
Date: Sun Dec 18 15:22:26 2005
New Revision: 357552
URL: http://svn.apache.org/viewcvs?rev=357552&view=rev
Log:
Deleted the Monitor usage
Modified:
directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java
directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java
directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java
directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java
directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java
directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java
directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java
Modified: directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java?rev=357552&r1=357551&r2=357552&view=diff
==============================================================================
--- directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalAttributeTypeRegistry.java Sun Dec 18 15:22:26 2005
@@ -42,8 +42,7 @@
private final Map oidToSchema;
/** the registry used to resolve names to OIDs */
private final OidRegistry oidRegistry;
- /** monitor notified via callback events */
- private AttributeTypeRegistryMonitor monitor;
+
/** the underlying bootstrap registry to delegate on misses to */
private BootstrapAttributeTypeRegistry bootstrap;
@@ -64,7 +63,6 @@
{
this.byOid = new HashMap();
this.oidToSchema = new HashMap();
- this.monitor = new AttributeTypeRegistryMonitorAdapter();
this.oidRegistry = oidRegistry;
if ( this.oidRegistry == null )
@@ -79,23 +77,9 @@
}
}
-
- /**
- * Sets the monitor that is to be notified via callback events.
- *
- * @param monitor the new monitor to notify of notable events
- */
- public void setMonitor( AttributeTypeRegistryMonitor monitor )
- {
- this.monitor = monitor;
- }
-
-
// ------------------------------------------------------------------------
// Service Methods
// ------------------------------------------------------------------------
-
-
public void register( String schema, AttributeType attributeType ) throws NamingException
{
if ( byOid.containsKey( attributeType.getOid() ) ||
@@ -103,7 +87,6 @@
{
NamingException e = new NamingException( "attributeType w/ OID " +
attributeType.getOid() + " has already been registered!" );
- monitor.registerFailed( attributeType, e );
throw e;
}
@@ -115,7 +98,6 @@
oidToSchema.put( attributeType.getOid(), schema );
byOid.put( attributeType.getOid(), attributeType );
- monitor.registered( attributeType );
}
@@ -127,7 +109,6 @@
{
NamingException e = new NamingException( "attributeType w/ OID "
+ id + " not registered!" );
- monitor.lookupFailed( id, e );
throw e;
}
@@ -138,7 +119,6 @@
attributeType = bootstrap.lookup( id );
}
- monitor.lookedUp( attributeType );
return attributeType;
}
Modified: directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java?rev=357552&r1=357551&r2=357552&view=diff
==============================================================================
--- directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java (original)
+++ directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalComparatorRegistry.java Sun Dec 18 15:22:26 2005
@@ -38,8 +38,6 @@
private final Map comparators;
/** maps an OID to a schema name*/
private final Map oidToSchema;
- /** the monitor for delivering callback events */
- private ComparatorRegistryMonitor monitor;
/** the underlying bootstrap registry to delegate on misses to */
private BootstrapComparatorRegistry bootstrap;
@@ -57,7 +55,6 @@
{
this.oidToSchema = new HashMap();
this.comparators = new HashMap();
- this.monitor = new ComparatorRegistryMonitorAdapter();
// override bootstrap registry used by serializable comparators
SerializableComparator.setRegistry( this );
@@ -69,18 +66,6 @@
}
}
-
- /**
- * Sets the monitor used by this registry.
- *
- * @param monitor the monitor to set for registry event callbacks
- */
- public void setMonitor( ComparatorRegistryMonitor monitor )
- {
- this.monitor = monitor;
- }
-
-
// ------------------------------------------------------------------------
// Service Methods
// ------------------------------------------------------------------------
@@ -93,13 +78,11 @@
{
NamingException e = new NamingException( "Comparator with OID "
+ oid + " already registered!" );
- monitor.registerFailed( oid, comparator, e );
throw e;
}
oidToSchema.put( oid, schema );
comparators.put( oid, comparator );
- monitor.registered( oid, comparator );
}
@@ -111,19 +94,16 @@
if ( comparators.containsKey( oid ) )
{
c = ( Comparator ) comparators.get( oid );
- monitor.lookedUp( oid, c );
return c;
}
if ( bootstrap.hasComparator( oid ) )
{
c = bootstrap.lookup( oid );
- monitor.lookedUp( oid, c );
return c;
}
e = new NamingException( "Comparator not found for OID: " + oid );
- monitor.lookupFailed( oid, e );
throw e;
}
Modified: directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java?rev=357552&r1=357551&r2=357552&view=diff
==============================================================================
--- directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java (original)
+++ directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalDitContentRuleRegistry.java Sun Dec 18 15:22:26 2005
@@ -42,8 +42,7 @@
private final Map oidToSchema;
/** the registry used to resolve names to OIDs */
private final OidRegistry oidRegistry;
- /** monitor notified via callback events */
- private DITContentRuleRegistryMonitor monitor;
+
/** the underlying bootstrap registry to delegate on misses to */
private BootstrapDitContentRuleRegistry bootstrap;
@@ -61,7 +60,6 @@
this.byOid = new HashMap();
this.oidToSchema = new HashMap();
this.oidRegistry = oidRegistry;
- this.monitor = new DITContentRuleRegistryMonitorAdapter();
this.bootstrap = bootstrap;
if ( this.bootstrap == null )
@@ -70,23 +68,9 @@
}
}
-
- /**
- * Sets the monitor that is to be notified via callback events.
- *
- * @param monitor the new monitor to notify of notable events
- */
- public void setMonitor( DITContentRuleRegistryMonitor monitor )
- {
- this.monitor = monitor;
- }
-
-
// ------------------------------------------------------------------------
// Service Methods
// ------------------------------------------------------------------------
-
-
public void register( String schema, DITContentRule dITContentRule ) throws NamingException
{
if ( byOid.containsKey( dITContentRule.getOid() ) ||
@@ -94,14 +78,12 @@
{
NamingException e = new NamingException( "dITContentRule w/ OID " +
dITContentRule.getOid() + " has already been registered!" );
- monitor.registerFailed( dITContentRule, e );
throw e;
}
oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
byOid.put( dITContentRule.getOid(), dITContentRule );
oidToSchema.put( dITContentRule.getOid(), schema );
- monitor.registered( dITContentRule );
}
@@ -112,20 +94,17 @@
if ( byOid.containsKey( id ) )
{
DITContentRule dITContentRule = ( DITContentRule ) byOid.get( id );
- monitor.lookedUp( dITContentRule );
return dITContentRule;
}
if ( bootstrap.hasDITContentRule( id ) )
{
DITContentRule dITContentRule = bootstrap.lookup( id );
- monitor.lookedUp( dITContentRule );
return dITContentRule;
}
NamingException e = new NamingException( "dITContentRule w/ OID "
+ id + " not registered!" );
- monitor.lookupFailed( id, e );
throw e;
}
Modified: directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java?rev=357552&r1=357551&r2=357552&view=diff
==============================================================================
--- directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java (original)
+++ directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalDitStructureRuleRegistry.java Sun Dec 18 15:22:26 2005
@@ -42,8 +42,7 @@
private final Map oidToSchema;
/** the registry used to resolve names to OIDs */
private final OidRegistry oidRegistry;
- /** monitor notified via callback events */
- private DITStructureRuleRegistryMonitor monitor;
+
/** the underlying bootstrap registry to delegate on misses to */
private BootstrapDitStructureRuleRegistry bootstrap;
@@ -61,7 +60,6 @@
this.byOid = new HashMap();
this.oidToSchema = new HashMap();
this.oidRegistry = oidRegistry;
- this.monitor = new DITStructureRuleRegistryMonitorAdapter();
this.bootstrap = bootstrap;
if ( this.bootstrap == null )
@@ -70,18 +68,6 @@
}
}
-
- /**
- * Sets the monitor that is to be notified via callback events.
- *
- * @param monitor the new monitor to notify of notable events
- */
- public void setMonitor( DITStructureRuleRegistryMonitor monitor )
- {
- this.monitor = monitor;
- }
-
-
// ------------------------------------------------------------------------
// Service Methods
// ------------------------------------------------------------------------
@@ -94,14 +80,12 @@
{
NamingException e = new NamingException( "dITStructureRule w/ OID " +
dITStructureRule.getOid() + " has already been registered!" );
- monitor.registerFailed( dITStructureRule, e );
throw e;
}
oidRegistry.register( dITStructureRule.getName(), dITStructureRule.getOid() ) ;
byOid.put( dITStructureRule.getOid(), dITStructureRule );
oidToSchema.put( dITStructureRule.getOid(), schema );
- monitor.registered( dITStructureRule );
}
@@ -112,20 +96,17 @@
if ( byOid.containsKey( id ) )
{
DITStructureRule dITStructureRule = ( DITStructureRule ) byOid.get( id );
- monitor.lookedUp( dITStructureRule );
return dITStructureRule;
}
if ( bootstrap.hasDITStructureRule( id ) )
{
DITStructureRule dITStructureRule = bootstrap.lookup( id );
- monitor.lookedUp( dITStructureRule );
return dITStructureRule;
}
NamingException e = new NamingException( "dITStructureRule w/ OID "
+ id + " not registered!" );
- monitor.lookupFailed( id, e );
throw e;
}
Modified: directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java?rev=357552&r1=357551&r2=357552&view=diff
==============================================================================
--- directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java (original)
+++ directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleRegistry.java Sun Dec 18 15:22:26 2005
@@ -42,8 +42,7 @@
private final Map oidToSchema;
/** the registry used to resolve names to OIDs */
private final OidRegistry oidRegistry;
- /** monitor notified via callback events */
- private MatchingRuleRegistryMonitor monitor;
+
/** the underlying bootstrap registry to delegate on misses to */
private BootstrapMatchingRuleRegistry bootstrap;
@@ -61,7 +60,6 @@
this.byOid = new HashMap();
this.oidToSchema = new HashMap();
this.oidRegistry = oidRegistry;
- this.monitor = new MatchingRuleRegistryMonitorAdapter();
this.bootstrap = bootstrap;
if ( this.bootstrap == null )
@@ -70,18 +68,6 @@
}
}
-
- /**
- * Sets the monitor that is to be notified via callback events.
- *
- * @param monitor the new monitor to notify of notable events
- */
- public void setMonitor( MatchingRuleRegistryMonitor monitor )
- {
- this.monitor = monitor;
- }
-
-
// ------------------------------------------------------------------------
// Service Methods
// ------------------------------------------------------------------------
@@ -94,14 +80,12 @@
{
NamingException e = new NamingException( "dITContentRule w/ OID " +
dITContentRule.getOid() + " has already been registered!" );
- monitor.registerFailed( dITContentRule, e );
throw e;
}
oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
byOid.put( dITContentRule.getOid(), dITContentRule );
oidToSchema.put( dITContentRule.getOid(), schema );
- monitor.registered( dITContentRule );
}
@@ -112,20 +96,17 @@
if ( byOid.containsKey( id ) )
{
MatchingRule dITContentRule = ( MatchingRule ) byOid.get( id );
- monitor.lookedUp( dITContentRule );
return dITContentRule;
}
if ( bootstrap.hasMatchingRule( id ) )
{
MatchingRule dITContentRule = bootstrap.lookup( id );
- monitor.lookedUp( dITContentRule );
return dITContentRule;
}
NamingException e = new NamingException( "dITContentRule w/ OID "
+ id + " not registered!" );
- monitor.lookupFailed( id, e );
throw e;
}
Modified: directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java?rev=357552&r1=357551&r2=357552&view=diff
==============================================================================
--- directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java (original)
+++ directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalMatchingRuleUseRegistry.java Sun Dec 18 15:22:26 2005
@@ -42,8 +42,7 @@
private final Map oidToSchema;
/** the registry used to resolve names to OIDs */
private final OidRegistry oidRegistry;
- /** monitor notified via callback events */
- private MatchingRuleUseRegistryMonitor monitor;
+
/** the underlying bootstrap registry to delegate on misses to */
private BootstrapMatchingRuleUseRegistry bootstrap;
@@ -61,7 +60,6 @@
this.byOid = new HashMap();
this.oidToSchema = new HashMap();
this.oidRegistry = oidRegistry;
- this.monitor = new MatchingRuleUseRegistryMonitorAdapter();
this.bootstrap = bootstrap;
if ( this.bootstrap == null )
@@ -70,18 +68,6 @@
}
}
-
- /**
- * Sets the monitor that is to be notified via callback events.
- *
- * @param monitor the new monitor to notify of notable events
- */
- public void setMonitor( MatchingRuleUseRegistryMonitor monitor )
- {
- this.monitor = monitor;
- }
-
-
// ------------------------------------------------------------------------
// Service Methods
// ------------------------------------------------------------------------
@@ -94,14 +80,12 @@
{
NamingException e = new NamingException( "dITContentRule w/ OID " +
dITContentRule.getOid() + " has already been registered!" );
- monitor.registerFailed( dITContentRule, e );
throw e;
}
oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
byOid.put( dITContentRule.getOid(), dITContentRule );
oidToSchema.put( dITContentRule.getOid(), schema );
- monitor.registered( dITContentRule );
}
@@ -112,20 +96,17 @@
if ( byOid.containsKey( id ) )
{
MatchingRuleUse dITContentRule = ( MatchingRuleUse ) byOid.get( id );
- monitor.lookedUp( dITContentRule );
return dITContentRule;
}
if ( bootstrap.hasMatchingRuleUse( id ) )
{
MatchingRuleUse dITContentRule = bootstrap.lookup( id );
- monitor.lookedUp( dITContentRule );
return dITContentRule;
}
NamingException e = new NamingException( "dITContentRule w/ OID "
+ id + " not registered!" );
- monitor.lookupFailed( id, e );
throw e;
}
Modified: directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java?rev=357552&r1=357551&r2=357552&view=diff
==============================================================================
--- directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java (original)
+++ directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalNameFormRegistry.java Sun Dec 18 15:22:26 2005
@@ -42,8 +42,7 @@
private final Map oidToSchema;
/** the registry used to resolve names to OIDs */
private final OidRegistry oidRegistry;
- /** monitor notified via callback events */
- private NameFormRegistryMonitor monitor;
+
/** the underlying bootstrap registry to delegate on misses to */
private BootstrapNameFormRegistry bootstrap;
@@ -61,7 +60,6 @@
this.byOid = new HashMap();
this.oidToSchema = new HashMap();
this.oidRegistry = oidRegistry;
- this.monitor = new NameFormRegistryMonitorAdapter();
this.bootstrap = bootstrap;
if ( this.bootstrap == null )
@@ -70,18 +68,6 @@
}
}
-
- /**
- * Sets the monitor that is to be notified via callback events.
- *
- * @param monitor the new monitor to notify of notable events
- */
- public void setMonitor( NameFormRegistryMonitor monitor )
- {
- this.monitor = monitor;
- }
-
-
// ------------------------------------------------------------------------
// Service Methods
// ------------------------------------------------------------------------
@@ -94,14 +80,12 @@
{
NamingException e = new NamingException( "dITContentRule w/ OID " +
dITContentRule.getOid() + " has already been registered!" );
- monitor.registerFailed( dITContentRule, e );
throw e;
}
oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
byOid.put( dITContentRule.getOid(), dITContentRule );
oidToSchema.put( dITContentRule.getOid(), schema );
- monitor.registered( dITContentRule );
}
@@ -112,20 +96,17 @@
if ( byOid.containsKey( id ) )
{
NameForm dITContentRule = ( NameForm ) byOid.get( id );
- monitor.lookedUp( dITContentRule );
return dITContentRule;
}
if ( bootstrap.hasNameForm( id ) )
{
NameForm dITContentRule = bootstrap.lookup( id );
- monitor.lookedUp( dITContentRule );
return dITContentRule;
}
NamingException e = new NamingException( "dITContentRule w/ OID "
+ id + " not registered!" );
- monitor.lookupFailed( id, e );
throw e;
}
Modified: directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java?rev=357552&r1=357551&r2=357552&view=diff
==============================================================================
--- directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java (original)
+++ directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalNormalizerRegistry.java Sun Dec 18 15:22:26 2005
@@ -38,8 +38,7 @@
private final Map normalizers;
/** maps an OID to a schema name*/
private final Map oidToSchema;
- /** the monitor for delivering callback events */
- private NormalizerRegistryMonitor monitor;
+
/** the underlying bootstrap registry to delegate on misses to */
private BootstrapNormalizerRegistry bootstrap;
@@ -57,7 +56,6 @@
{
this.oidToSchema = new HashMap();
this.normalizers = new HashMap();
- this.monitor = new NormalizerRegistryMonitorAdapter();
this.bootstrap = bootstrap;
if ( this.bootstrap == null )
@@ -66,18 +64,6 @@
}
}
-
- /**
- * Sets the monitor used by this registry.
- *
- * @param monitor the monitor to set for registry event callbacks
- */
- public void setMonitor( NormalizerRegistryMonitor monitor )
- {
- this.monitor = monitor;
- }
-
-
// ------------------------------------------------------------------------
// Service Methods
// ------------------------------------------------------------------------
@@ -90,13 +76,11 @@
{
NamingException e = new NamingException( "Normalizer with OID "
+ oid + " already registered!" );
- monitor.registerFailed( oid, normalizer, e );
throw e;
}
oidToSchema.put( oid, schema );
normalizers.put( oid, normalizer );
- monitor.registered( oid, normalizer );
}
@@ -108,19 +92,16 @@
if ( normalizers.containsKey( oid ) )
{
c = ( Normalizer ) normalizers.get( oid );
- monitor.lookedUp( oid, c );
return c;
}
if ( bootstrap.hasNormalizer( oid ) )
{
c = bootstrap.lookup( oid );
- monitor.lookedUp( oid, c );
return c;
}
e = new NamingException( "Normalizer not found for OID: " + oid );
- monitor.lookupFailed( oid, e );
throw e;
}
Modified: directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java?rev=357552&r1=357551&r2=357552&view=diff
==============================================================================
--- directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java (original)
+++ directory/apacheds/branches/DN-refactoring/core/src/main/java/org/apache/ldap/server/schema/GlobalObjectClassRegistry.java Sun Dec 18 15:22:26 2005
@@ -42,8 +42,7 @@
private final Map oidToSchema;
/** the registry used to resolve names to OIDs */
private final OidRegistry oidRegistry;
- /** monitor notified via callback events */
- private ObjectClassRegistryMonitor monitor;
+
/** the underlying bootstrap registry to delegate on misses to */
private BootstrapObjectClassRegistry bootstrap;
@@ -61,7 +60,6 @@
this.byOid = new HashMap();
this.oidToSchema = new HashMap();
this.oidRegistry = oidRegistry;
- this.monitor = new ObjectClassRegistryMonitorAdapter();
this.bootstrap = bootstrap;
if ( this.bootstrap == null )
@@ -70,18 +68,6 @@
}
}
-
- /**
- * Sets the monitor that is to be notified via callback events.
- *
- * @param monitor the new monitor to notify of notable events
- */
- public void setMonitor( ObjectClassRegistryMonitor monitor )
- {
- this.monitor = monitor;
- }
-
-
// ------------------------------------------------------------------------
// Service Methods
// ------------------------------------------------------------------------
@@ -94,14 +80,12 @@
{
NamingException e = new NamingException( "dITContentRule w/ OID " +
dITContentRule.getOid() + " has already been registered!" );
- monitor.registerFailed( dITContentRule, e );
throw e;
}
oidRegistry.register( dITContentRule.getName(), dITContentRule.getOid() ) ;
byOid.put( dITContentRule.getOid(), dITContentRule );
oidToSchema.put( dITContentRule.getOid(), schema );
- monitor.registered( dITContentRule );
}
@@ -112,20 +96,17 @@
if ( byOid.containsKey( id ) )
{
ObjectClass dITContentRule = ( ObjectClass ) byOid.get( id );
- monitor.lookedUp( dITContentRule );
return dITContentRule;
}
if ( bootstrap.hasObjectClass( id ) )
{
ObjectClass dITContentRule = bootstrap.lookup( id );
- monitor.lookedUp( dITContentRule );
return dITContentRule;
}
NamingException e = new NamingException( "dITContentRule w/ OID "
+ id + " not registered!" );
- monitor.lookupFailed( id, e );
throw e;
}