From 137ff8c3820e9e79f7f086e301e558b07df667e6 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 24 Jan 2014 15:47:14 +0000
Subject: [PATCH] Added class to fix build failure + added resources
---
opendj-sdk/opendj-cli/src/main/java/org/forgerock/opendj/cli/CLIException.java | 85 ++++++++++++++++++++++++++++
opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties | 29 +++++++++
opendj-sdk/opendj-cli/pom.xml | 17 +++++
3 files changed, 131 insertions(+), 0 deletions(-)
diff --git a/opendj-sdk/opendj-cli/pom.xml b/opendj-sdk/opendj-cli/pom.xml
index 470f939..6e9906f 100644
--- a/opendj-sdk/opendj-cli/pom.xml
+++ b/opendj-sdk/opendj-cli/pom.xml
@@ -73,6 +73,23 @@
</properties>
<build>
<plugins>
+ <plugin>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>generate-messages</goal>
+ </goals>
+ <configuration>
+ <messageFiles>
+ <messageFile>com/forgerock/opendj/cli/cli.properties</messageFile>
+ </messageFiles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/opendj-sdk/opendj-cli/src/main/java/org/forgerock/opendj/cli/CLIException.java b/opendj-sdk/opendj-cli/src/main/java/org/forgerock/opendj/cli/CLIException.java
new file mode 100755
index 0000000..372e7cc
--- /dev/null
+++ b/opendj-sdk/opendj-cli/src/main/java/org/forgerock/opendj/cli/CLIException.java
@@ -0,0 +1,85 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
+ * Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ *
+ *
+ * Copyright 2008 Sun Microsystems, Inc.
+ * Portions copyright 2014 ForgeRock AS
+ */
+package org.forgerock.opendj.cli;
+
+import static com.forgerock.opendj.cli.CliMessages.ERR_CONSOLE_INPUT_ERROR;
+
+import org.forgerock.i18n.LocalizableException;
+import org.forgerock.i18n.LocalizableMessage;
+
+/**
+ * Thrown to indicate that a problem occurred when interacting with the client.
+ * For example, if input provided by the client was invalid.
+ */
+@SuppressWarnings("serial")
+final class CLIException extends Exception implements LocalizableException {
+
+ /**
+ * Adapts any exception that may have occurred whilst reading input from the
+ * console.
+ *
+ * @param cause
+ * The exception that occurred whilst reading input from the
+ * console.
+ * @return Returns a new CLI exception describing a problem that occurred
+ * whilst reading input from the console.
+ */
+ static CLIException adaptInputException(final Throwable cause) {
+ return new CLIException(ERR_CONSOLE_INPUT_ERROR.get(cause.getMessage()), cause);
+ }
+
+ private final LocalizableMessage message;
+
+ /**
+ * Creates a new CLI exception with the provided message.
+ *
+ * @param message
+ * The message explaining the problem that occurred.
+ */
+ CLIException(final LocalizableMessage message) {
+ super(message.toString());
+ this.message = message;
+ }
+
+ /**
+ * Creates a new CLI exception with the provided message and cause.
+ *
+ * @param message
+ * The message explaining the problem that occurred.
+ * @param cause
+ * The cause of this exception.
+ */
+ CLIException(final LocalizableMessage message, final Throwable cause) {
+ super(message.toString(), cause);
+ this.message = message;
+ }
+
+ public LocalizableMessage getMessageObject() {
+ return message;
+ }
+
+}
diff --git a/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties b/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
new file mode 100755
index 0000000..d330757
--- /dev/null
+++ b/opendj-sdk/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License"). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2014 ForgeRock AS.
+#
+#
+# CLI messages
+#
+ERR_CONSOLE_INPUT_ERROR=The response could not be read from the console due to the following error: %s
\ No newline at end of file
--
Gitblit v1.10.0