From ed31fc445fc6d4769b7bd119770ae1da9b15d2bf Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Tue, 21 Feb 2012 22:22:16 -0600
Subject: Replaced BtoA/AtoB with Apache codec.

The OSUtil's BtoA() and AtoB() have been replaced by Base64
codec from Apache Commons library. The codec is configured to
use 64-byte line width as defined in RFC 1421.

Ticket #90
---
 pki/base/java-tools/src/CMakeLists.txt                           | 9 ++++++++-
 pki/base/java-tools/templates/pki_java_command_wrapper.in        | 1 +
 .../java-tools/templates/pretty_print_cert_command_wrapper.in    | 1 +
 .../java-tools/templates/pretty_print_crl_command_wrapper.in     | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'pki/base/java-tools')

diff --git a/pki/base/java-tools/src/CMakeLists.txt b/pki/base/java-tools/src/CMakeLists.txt
index 90fe31ae4..17c6f6b68 100644
--- a/pki/base/java-tools/src/CMakeLists.txt
+++ b/pki/base/java-tools/src/CMakeLists.txt
@@ -16,6 +16,13 @@ find_file(OSUTIL_JAR
         /usr/share/java
 )
 
+find_file(COMMONS_CODEC_JAR
+    NAMES
+        commons-codec.jar
+    PATHS
+        /usr/share/java
+)
+
 find_file(XALAN_JAR
     NAMES
         xalan-j2.jar
@@ -60,7 +67,7 @@ set(pki-tools_java_SRCS
 set(CMAKE_JAVA_INCLUDE_PATH
     ${PKI_NSUTIL_JAR} ${PKI_CMSUTIL_JAR}
     ${XALAN_JAR} ${XERCES_JAR}
-    ${JSS_JAR} ${OSUTIL_JAR})
+    ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR})
 
 set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION})
 
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper.in b/pki/base/java-tools/templates/pki_java_command_wrapper.in
index 4136eeebb..b09740945 100644
--- a/pki/base/java-tools/templates/pki_java_command_wrapper.in
+++ b/pki/base/java-tools/templates/pki_java_command_wrapper.in
@@ -142,6 +142,7 @@ if [ "${OS}" = "Linux" ] &&
     # Fedora 16+
     CP=/usr/lib64/java/osutil.jar:${CP}
 fi
+CP=/usr/share/java/commons-codec.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
 CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP}
 CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP}
diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
index fe0262c8c..ec1f2a9f8 100644
--- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
+++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
@@ -142,6 +142,7 @@ if [ "${OS}" = "Linux" ] &&
     # Fedora 16+
     CP=/usr/lib64/java/osutil.jar:${CP}
 fi
+CP=/usr/share/java/commons-codec.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
 CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP}
 CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP}
diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
index 333983a47..2fb27f699 100644
--- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
+++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
@@ -142,6 +142,7 @@ if [ "${OS}" = "Linux" ] &&
     # Fedora 16+
     CP=/usr/lib64/java/osutil.jar:${CP}
 fi
+CP=/usr/share/java/commons-codec.jar:${CP}
 CP=/usr/share/java/ldapjdk.jar:${CP}
 CP=/usr/share/java/${PRODUCT}/pki-nsutil.jar:${CP}
 CP=/usr/share/java/${PRODUCT}/pki-cmsutil.jar:${CP}
-- 
cgit