From fcec2df3951f4b542d7b4120673b9193ab80a094 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Oct 10 2018 17:03:08 +0000
Subject: Add JSS's dependencies to the classpath of 389-console


Signed-off-by: Alexander Scheel <ascheel@redhat.com>

---

diff --git a/389-console b/389-console
index cd42ef3..9990faa 100755
--- a/389-console
+++ b/389-console
@@ -40,7 +40,7 @@ fi
 # Launch the Console
 #
 java \
-    -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ \
+    -cp @apachecodecjar@:@apachelangjar@:@slf4jjar@:@jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ \
     -Djava.util.prefs.systemRoot="$HOME/.@prefsdir@" \
     -Djava.util.prefs.userRoot="$HOME/.@prefsdir@" \
     $LIBDIR \
diff --git a/build.properties b/build.properties
index 5f1ab29..e8da4f7 100644
--- a/build.properties
+++ b/build.properties
@@ -34,5 +34,8 @@ console.base.name=idm-console-base
 console.mcc.name=idm-console-mcc
 console.nmclf.name=idm-console-nmclf
 
+apache.codec.jar.name=apache-commons-codec.jar
+apache.lang.jar.name=apache-commons-lang.jar
 jss.jar.name=jss4.jar
 ldapjdk.jar.name=ldapjdk.jar
+slf4j.jar.name=slf4j-api.jar
diff --git a/build.xml b/build.xml
index 7e150b3..023cf1b 100644
--- a/build.xml
+++ b/build.xml
@@ -37,6 +37,9 @@ END COPYRIGHT BLOCK
     <!-- Override these properties to use components from other system locations -->
     <property name="ldapjdk.local.location" value="/usr/share/java"/>
     <property name="jss.local.location"     value="/usr/lib/java"/>
+    <property name="apache.codec.local.location"     value="/usr/share/java"/>
+    <property name="apache.lang.local.location"     value="/usr/share/java"/>
+    <property name="slf4j.local.location"     value="/usr/share/java/slf4j"/>
     <property name="console.local.location" value="/usr/share/java"/>
     <property name="lib.dir"                value="/usr/lib"/>
     <property name="need_libdir"            value=""/>
@@ -62,6 +65,30 @@ END COPYRIGHT BLOCK
         </not>
       </condition>
     </fail>
+    <fail message="Apache Commons Codec (${apache.codec.jar.name}) does not exist in ${apache.codec.local.location}">
+      Please set the correct location with -Dapache.codec.local.location=[path]
+      <condition>
+        <not>
+          <available file="${apache.codec.local.location}/${apache.codec.jar.name}"/>
+        </not>
+      </condition>
+    </fail>
+    <fail message="Apache Commons Lang (${apache.lang.jar.name}) does not exist in ${apache.lang.local.location}">
+      Please set the correct location with -Dapache.lang.local.location=[path]
+      <condition>
+        <not>
+          <available file="${apache.lang.local.location}/${apache.lang.jar.name}"/>
+        </not>
+      </condition>
+    </fail>
+    <fail message="SLF4J (${slf4j.jar.name}) does not exist in ${slf4j.local.location}">
+      Please set the correct location with -Dslf4j.local.location=[path]
+      <condition>
+        <not>
+          <available file="${slf4j.local.location}/${slf4j.jar.name}"/>
+        </not>
+      </condition>
+    </fail>
     <fail message="Console base jar (${console.base.name}.jar) does not exist in ${console.local.location}">
       Please set the correct location with -Dconsole.local.location=[path]
       <condition>
@@ -108,6 +135,9 @@ END COPYRIGHT BLOCK
     <replace file="${built.dir}/389-console">
       <replacefilter token="@classdest@" value="${classdest}"/>
       <replacefilter token="@jssjar@" value="${jss.local.location}/${jss.jar.name}"/>
+      <replacefilter token="@apachecodecjar@" value="${apache.codec.local.location}/${apache.codec.jar.name}"/>
+      <replacefilter token="@apachelangjar@" value="${apache.lang.local.location}/${apache.lang.jar.name}"/>
+      <replacefilter token="@slf4jjar@" value="${slf4j.local.location}/${slf4j.jar.name}"/>
       <replacefilter token="@ldapjdkjar@" value="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
       <replacefilter token="@basejar@" value="${console.base.name}.jar"/>
       <replacefilter token="@mccjar@" value="${console.mcc.name}.jar"/>