From c9d42831d52e5e7b50db0238c48bd3c37d367cf4 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 28 May 2010 14:09:31 +0000
Subject: [PATCH] Fix issue #4266 + minor edit in message.
---
opends/src/admin/defn/org/opends/server/admin/std/WorkflowConfiguration.xml | 4 ++--
opends/src/admin/messages/WorkflowCfgDefn.properties | 2 +-
opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java | 10 ++++++++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/WorkflowConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/WorkflowConfiguration.xml
index 35f8a24..45df51f 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/WorkflowConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/WorkflowConfiguration.xml
@@ -23,7 +23,7 @@
! CDDL HEADER END
!
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<adm:managed-object name="workflow" plural-name="workflows"
package="org.opends.server.admin.std"
@@ -84,7 +84,7 @@
</adm:property>
<adm:property name="workflow-element" mandatory="true">
<adm:synopsis>
- Specifies the root Work Flow Element in the
+ Specifies the root Workflow Element in the
<adm:user-friendly-name />
.
</adm:synopsis>
diff --git a/opends/src/admin/messages/WorkflowCfgDefn.properties b/opends/src/admin/messages/WorkflowCfgDefn.properties
index be4bae6..ba5730c 100644
--- a/opends/src/admin/messages/WorkflowCfgDefn.properties
+++ b/opends/src/admin/messages/WorkflowCfgDefn.properties
@@ -4,7 +4,7 @@
property.base-dn.synopsis=Specifies the base DN of the data targeted by the Workflow .
property.enabled.synopsis=Indicates whether the Workflow is enabled for use in the server.
property.enabled.description=If a Workflow is not enabled, then its contents are not accessible when processing operations.
-property.workflow-element.synopsis=Specifies the root Work Flow Element in the Workflow .
+property.workflow-element.synopsis=Specifies the root Workflow Element in the Workflow .
property.workflow-element.syntax.aggregation.constraint-synopsis=The referenced workflow element must be enabled.
property.workflow-id.synopsis=Provides a name that identifies the Workflow.
property.workflow-id.description=The name must be unique among all Workflows in the server.
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
index acb448a..f4f320b 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2009 Sun Microsystems, Inc.
+ * Copyright 2007-2010 Sun Microsystems, Inc.
*/
package org.opends.server.tools.dsconfig;
@@ -822,7 +822,13 @@
}
} catch (CommunicationException e) {
Message msg = ERR_DSCFG_ERROR_CREATE_CE.get(ufn, e.getMessage());
- throw new ClientException(LDAPResultCode.OTHER, msg);
+ if (app.isInteractive()) {
+ app.println();
+ app.printVerboseMessage(msg);
+ return MenuResult.cancel();
+ } else {
+ throw new ClientException(LDAPResultCode.OTHER, msg);
+ }
} catch (ManagedObjectAlreadyExistsException e) {
Message msg = ERR_DSCFG_ERROR_CREATE_MOAEE.get(ufn);
if (app.isInteractive()) {
--
Gitblit v1.10.0