From 44de1419609ab0f8714b9688802b3b74beb71213 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.
---
opends/build.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 362e8b9..c48487b 100644
--- a/opends/build.xml
+++ b/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>
--
Gitblit v1.10.0