From 81d36161ce5367fa7aa9a5d99dc8b80eacfa7cdf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 24 Jan 2014 14:43:46 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/build.xml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/build.xml b/opendj3-server-dev/build.xml
index 8d745dc..b1f21f5 100644
--- a/opendj3-server-dev/build.xml
+++ b/opendj3-server-dev/build.xml
@@ -284,13 +284,16 @@
</target>
- <target name="generatemessages" depends="buildtools">
+ <target name="generatemessages" depends="buildtools,resolve">
<typedef name="genmsg"
classname="org.opends.build.tools.GenerateMessageFile" >
<classpath>
<fileset dir="${build.dir}/build-tools">
<include name="*.jar" />
</fileset>
+ <fileset dir="${lib.dir}/compile">
+ <include name="i18n-core.jar" />
+ </fileset>
</classpath>
</typedef>
<!--
@@ -781,6 +784,9 @@
<fileset dir="${build.dir}/build-tools">
<include name="build-tools.jar" />
</fileset>
+ <fileset dir="${lib.dir}/compile">
+ <include name="i18n-core.jar" />
+ </fileset>
<pathelement path="${classes.dir}"/>
</classpath>
</javac>
@@ -796,12 +802,20 @@
<include name="**/org/opends/messages/Category.java"/>
<include name="**/org/opends/messages/QuickSetupMessages.java"/>
<include name="**/org/opends/server/types/OpenDsException.java"/>
+ <classpath>
+ <fileset dir="${lib.dir}/compile">
+ <include name="i18n-core.jar" />
+ </fileset>
+ </classpath>
</javac>
<javac srcdir="${quicksetup.src.dir}" destdir="${quicksetup.classes.dir}">
<classpath>
<fileset dir="${build.dir}/build-tools">
<include name="build-tools.jar" />
</fileset>
+ <fileset dir="${lib.dir}/compile">
+ <include name="i18n-core.jar" />
+ </fileset>
<pathelement path="${classes.dir}"/>
</classpath>
</javac>
@@ -2429,7 +2443,7 @@
- <target name="buildtools" depends="init"
+ <target name="buildtools" depends="init,resolve"
description="Builds the build tools">
<mkdir dir="${buildtools.classes.dir}" />
@@ -2453,6 +2467,10 @@
<include name="*.jar" />
</fileset>
+ <fileset dir="${lib.dir}/compile">
+ <include name="i18n-core.jar" />
+ </fileset>
+
<fileset dir="${emma.dir}">
<include name="*.jar" />
</fileset>
--
Gitblit v1.10.0