From 1f5674beec624d5524201b5fbac1aea036996bb5 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 04 Feb 2014 11:01:35 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 :    Migrate I18n and logging support to i18n framework and SLF4J

---
 opendj3-server-dev/build.xml |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/opendj3-server-dev/build.xml b/opendj3-server-dev/build.xml
index c17d73f..b211ba1 100644
--- a/opendj3-server-dev/build.xml
+++ b/opendj3-server-dev/build.xml
@@ -1189,12 +1189,17 @@
 
     <antcall target="package-snmp" />
 
-    <!-- Build the bootstrap jar that avoids getting the error message "The input line is too long" on Windows -->
+    <!--
+      Build the bootstrap jar that avoids getting the error message "The input line is too long" on Windows.
+      This is intended for the server, logging is implemented by the opendj-slf4j-adapter module.
+    -->
+
     <manifestclasspath property="manifest.classpath"
                        jarfile="${pdir}/lib/bootstrap.jar">
       <classpath>
         <fileset dir="${pdir}/lib">
           <include name="*.jar" />
+        	<exclude name="slf4j-jdk14.jar" />
         </fileset>
       </classpath>
     </manifestclasspath>
@@ -1205,6 +1210,24 @@
       </manifest>
     </jar>
 
+  	<!--
+  	  Build the bootstrap-client  jar.
+      This is intended for client tools, logging is implemented through the slf4j-jdk14 library.
+    -->
+    <manifestclasspath property="manifest_client.classpath"
+                       jarfile="${pdir}/lib/bootstrap-client.jar">
+      <classpath>
+        <fileset dir="${pdir}/lib" includes="*.jar" excludes="bootstrap.jar opendj-slf4j-adapter.jar" >
+        </fileset>
+      </classpath>
+    </manifestclasspath>
+    <jar jarfile="${pdir}/lib/bootstrap-client.jar">
+      <manifest>
+        <attribute name="Built-By" value="${user.name}" />
+        <attribute name="Class-Path" value="${manifest_client.classpath}" />
+      </manifest>
+    </jar>
+
     <!-- Create buildinfo files -->
     <echo message="${MAJOR_VERSION}.${MINOR_VERSION}.${POINT_VERSION}.${REVISION_NUMBER}"
           file="${pdir}/template/config/buildinfo" />

--
Gitblit v1.10.0