From d94f6d23898f7515e969517f85b8e626667a1e02 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 19 Sep 2014 08:56:38 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1536: Rename ErrorResultException to LdapException and remove ErrorResultIOException
---
opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java
index 4466189..01c7da7 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.forgerock.opendj.config;
@@ -61,7 +62,7 @@
import org.forgerock.opendj.config.server.ServerManagedObjectChangeListener;
import org.forgerock.opendj.config.server.ServerManagementContext;
import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.ResultCode;
/**
@@ -495,7 +496,7 @@
*/
@Override
public boolean isAddAcceptable(ManagementContext context, ManagedObject<?> managedObject,
- Collection<LocalizableMessage> unacceptableReasons) throws ErrorResultException {
+ Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
// If all of this managed object's "enabled" properties are true
// then any referenced managed objects must also be enabled.
boolean needsEnabling = targetNeedsEnablingCondition.evaluate(context, managedObject);
@@ -547,7 +548,7 @@
*/
@Override
public boolean isModifyAcceptable(ManagementContext context, ManagedObject<?> managedObject,
- Collection<LocalizableMessage> unacceptableReasons) throws ErrorResultException {
+ Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
// The same constraint applies as for adds.
return isAddAcceptable(context, managedObject, unacceptableReasons);
}
@@ -566,7 +567,7 @@
*/
@Override
public boolean isDeleteAcceptable(ManagementContext context, ManagedObjectPath<?, ?> path,
- Collection<LocalizableMessage> unacceptableReasons) throws ErrorResultException {
+ Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
// Any references to the deleted managed object should cause a
// constraint violation.
boolean isAcceptable = true;
@@ -593,7 +594,7 @@
*/
@Override
public boolean isModifyAcceptable(ManagementContext context, ManagedObject<?> managedObject,
- Collection<LocalizableMessage> unacceptableReasons) throws ErrorResultException {
+ Collection<LocalizableMessage> unacceptableReasons) throws LdapException {
// If the modified managed object is disabled and there are some
// active references then refuse the change.
if (targetIsEnabledCondition.evaluate(context, managedObject)) {
@@ -630,7 +631,7 @@
// object using this property.
private <C1 extends ConfigurationClient> List<ManagedObject<? extends C1>> findReferences(
ManagementContext context, AbstractManagedObjectDefinition<C1, ?> mod, String name)
- throws ErrorResultException {
+ throws LdapException {
List<ManagedObject<? extends C1>> instances = findInstances(context, mod);
Iterator<ManagedObject<? extends C1>> i = instances.iterator();
@@ -656,7 +657,7 @@
// Find all instances of a specific type of managed object.
@SuppressWarnings("unchecked")
private <C1 extends ConfigurationClient> List<ManagedObject<? extends C1>> findInstances(
- ManagementContext context, AbstractManagedObjectDefinition<C1, ?> mod) throws ErrorResultException {
+ ManagementContext context, AbstractManagedObjectDefinition<C1, ?> mod) throws LdapException {
List<ManagedObject<? extends C1>> instances = new LinkedList<ManagedObject<? extends C1>>();
if (mod == RootCfgDefn.getInstance()) {
--
Gitblit v1.10.0