From 742a3e791457688a9715682abba6e4306c7dbfae Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 17 Aug 2007 14:56:47 +0000
Subject: [PATCH] Fix for issue 2114. The fix consists of actually adding some missing classes to quicksetup.jar (OpenDsException) and fix some code to also add the messages properties files. Only QuickSetupMessages are required, so these are the only messages that are being added.
---
opendj-sdk/opends/build.xml | 22 +++++++++++-----------
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java | 1 -
opendj-sdk/opends/src/messages/messages/quicksetup.properties | 1 +
opendj-sdk/opends/src/messages/messages/admin_tool.properties | 1 -
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index 362e8b9..c48487b 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -515,7 +515,6 @@
description="Recompile the Directory Server source files.">
</target>
-
<!-- Compile the Directory Server source files. -->
<target name="compile"
depends="init,checkjavaversion,dynamicconstants,generatemessages,compileadmin"
@@ -593,7 +592,7 @@
<pathelement path="${classes.dir}"/>
</classpath>
</javac>
- <javac srcdir="${src.dir}:${msg.src.dir}" destdir="${quicksetup.classes.dir}"
+ <javac srcdir="${src.dir}:${msg.src.dir}:${msg.javagen.dir}" destdir="${quicksetup.classes.dir}"
debug="on" debuglevel="${build.debuglevel}" source="1.5"
target="1.5" deprecation="true" fork="true" memoryInitialSize="${MEM}"
memoryMaximumSize="${MEM}">
@@ -602,18 +601,13 @@
<include name="**/org/opends/server/util/DynamicConstants.java"/>
<include name="**/org/opends/server/types/OperatingSystem.java"/>
<include name="**/org/opends/messages/Message.java"/>
+ <include name="**/org/opends/messages/MessageBuilder.java"/>
<include name="**/org/opends/messages/MessageDescriptor.java"/>
<include name="**/org/opends/messages/Severity.java"/>
<include name="**/org/opends/messages/Category.java"/>
- <include name="**/org/opends/messages/gen/QuickSetupMessages.java"/>
- <include name="**/messages/quicksetup.properties"/>
- <include name="**/org/opends/messages/gen/ToolMessages.java"/>
- <include name="**/messages/tools.properties"/>
- <include name="**/org/opends/messages/gen/CoreMessages.java"/>
- <include name="**/messages/core.properties"/>
- <include name="**/org/opends/messages/gen/ReplicationMessages.java"/>
- <include name="**/messages/replication.properties"/>
- <compilerarg value="-Xlint:all" />
+ <include name="**/org/opends/messages/QuickSetupMessages.java"/>
+ <include name="**/org/opends/server/types/OpenDsException.java"/>
+ <compilerarg value="-Xlint:all" />
</javac>
<javac srcdir="${quicksetup.src.dir}" destdir="${quicksetup.classes.dir}"
debug="on" debuglevel="${build.debuglevel}" source="1.5"
@@ -632,6 +626,12 @@
<fileset dir="${quicksetup.src.dir}"
includes="**/*.properties, **/*.gif, **/*.png" />
</copy>
+ <mkdir dir="${quicksetup.classes.dir}/messages" />
+ <copy todir="${quicksetup.classes.dir}/messages">
+ <fileset dir="${msg.prop.dir}"
+ includes="**/quicksetup.properties" />
+ </copy>
+
</target>
diff --git a/opendj-sdk/opends/src/messages/messages/admin_tool.properties b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
index 8f8d5a2..294092a 100644
--- a/opendj-sdk/opends/src/messages/messages/admin_tool.properties
+++ b/opendj-sdk/opends/src/messages/messages/admin_tool.properties
@@ -119,7 +119,6 @@
servers:\n%s\nDo you want the uninstaller to try to remove the references to \
this server in a best-effort mode?
INFO_CONFIRM_UNINSTALL_SERVER_RUNNING_TITLE=Server is Running
-INFO_CONFIRM_UNINSTALL_STEP=Uninstall Options
INFO_CONNECTIONS_LABEL=Open Connections:
INFO_COULD_NOT_FIND_VALID_LDAPURL=Error reading the configuration file.%nThis \
could be caused because there is not an enabled LDAP port for the specified \
diff --git a/opendj-sdk/opends/src/messages/messages/quicksetup.properties b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
index 3c3293c..640a6f9 100644
--- a/opendj-sdk/opends/src/messages/messages/quicksetup.properties
+++ b/opendj-sdk/opends/src/messages/messages/quicksetup.properties
@@ -1100,4 +1100,5 @@
href="https://www.opends.org/wiki/page/OverviewOfTheQuickSetupTool"> OpenDS \
documentation wiki</a>.
INFO_WELCOME_STEP=Welcome
+INFO_CONFIRM_UNINSTALL_STEP=Uninstall Options
INFO_ZIP_FILES_DESCRIPTION=OpenDS Installation Package (.zip)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java
index 46a8e83..9a850ea 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Step.java
@@ -29,7 +29,6 @@
import org.opends.messages.Message;
import static org.opends.messages.QuickSetupMessages.*;
-import static org.opends.messages.AdminToolMessages.*;
/**
* This enumeration just represents the different steps that we can have in
--
Gitblit v1.10.0