Bugzilla Bug #669226 - Remove Legacy Build System (Ant + Autoconf --> CMake)

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2057 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

6 files changed, 58 insertions, 756 deletions

diff --git a/pki/base/java-tools/build.xml b/pki/base/java-tools/build.xml
deleted file mode 100644
index 68e732ef4..000000000
--- a/pki/base/java-tools/build.xml
+++ /dev/null
@@ -1,585 +0,0 @@
-<!-- ### BEGIN COPYRIGHT BLOCK ###
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-  Copyright (C) 2007 Red Hat, Inc.
-  All rights reserved.
-     ### END COPYRIGHT BLOCK ### -->
-<project name="java-tools" default="main" basedir=".">
-
-    <import file="config/product.xml"/>
-    <import file="config/product-ext.xml" optional="true"/>
-
-    <property name="jss.home" value="${jni-jar.home}${dirsec}"/>
-    <property name="jss.jar" value="${jss.home}/jss4.jar"/>
-    <property name="osutil.jar" value="${jni-jar.home}/osutil.jar"/>
-    <property name="ldapjdk.jar" value="${jar.home}/ldapjdk.jar"/>
-    <property name="pki-certsrv.jar" value="${pki-jar.home}/pki-certsrv.jar"/>
-    <property name="pki-cms.jar" value="${pki-jar.home}/pki-cms.jar"/>
-    <property name="pki-cmsutil.jar" value="${pki-jar.home}/pki-cmsutil.jar"/>
-    <property name="pki-nsutil.jar" value="${pki-jar.home}/pki-nsutil.jar"/>
-
-    <path id="classpath">
-        <pathelement location="${jss.jar}"/>
-        <pathelement location="${ldapjdk.jar}"/>
-        <pathelement location="${pki-nsutil.jar}"/>
-        <pathelement location="${osutil.jar}"/>
-        <pathelement location="${pki-cmsutil.jar}"/>
-        <pathelement location="${pki-cms.jar}"/>
-        <pathelement location="${pki-certsrv.jar}"/>
-    </path>
-    <path id="javadoc_classpath">
-        <path refid="classpath"/>
-        <pathelement location="./build/classes"/>
-    </path>
-
-
-    <target name="clean"
-            depends=""
-            description="--> remove component directories">
-        <echo message="${begin.clean.log.message}"/>
-        <delete dir="${dist.base}"/>
-        <delete dir="${build.dir}"/>
-        <echo message="${end.clean.log.message}"/>
-    </target>
-
-
-    <target name="download"
-            depends=""
-            description="--> download dependent components">
-        <echo message="${begin.download.log.message}"/>
-        <echo message="${empty.download.log.message}"/>
-        <echo message="${end.download.log.message}"/>
-    </target>
-
-
-    <target name="compile_java"
-            depends=""
-            description="--> compile java source code into classes">
-        <echo message="${begin.compile.java.log.message}"/>
-        <mkdir dir="${build.classes}"/>
-        <javac debug="on"
-               srcdir="${src.dir}/com/netscape"
-               destdir="${build.classes}">
-            <classpath refid="classpath"/>
-        </javac>
-        <echo message="${end.compile.java.log.message}"/>
-    </target>
-
-
-    <target name="build_jars"
-            depends="compile_java"
-            description="--> generate jar files">
-        <echo message="${begin.build.jars.log.message}"/>
-        <mkdir dir="${build.jars}"/>
-        <jar jarfile="${build.jars}/pki-tools.jar">
-            <fileset dir="${build.classes}">
-                <include name="com/netscape/**"/>
-            </fileset>
-        </jar>
-        <echo message="${end.build.jars.log.message}"/>
-    </target>
-
-
-    <target name="build_jni_headers"
-            depends="compile_java"
-            description="--> generate jni header files">
-        <echo message="${begin.build.jni.headers.log.message}"/>
-        <echo message="${empty.build.jni.headers.log.message}"/>
-        <echo message="${end.build.jni.headers.log.message}"/>
-    </target>
-
-
-    <target name="build"
-            depends="build_jars,build_jni_headers"
-            description="--> build classes, jars, and jni headers">
-        <echo message="${notify.build.log.message}"/>
-    </target>
-
-
-    <target name="compile_junit_tests"
-            depends="build"
-            description="--> compile junit test source code">
-        <echo message="${begin.compile.junit.tests.log.message}"/>
-        <echo message="${empty.compile.junit.tests.log.message}"/>
-        <echo message="${end.compile.junit.tests.log.message}"/>
-    </target>
-
-
-    <target name="run_junit_tests"
-            depends="compile_junit_tests"
-            description="--> execute junit tests">
-        <echo message="${begin.run.junit.tests.log.message}"/>
-        <echo message="${empty.run.junit.tests.log.message}"/>
-        <echo message="${end.run.junit.tests.log.message}"/>
-    </target>
-
-
-    <target name="verify"
-            depends="run_junit_tests"
-            description="--> build and execute junit tests">
-        <echo message="${notify.verify.log.message}"/>
-    </target>
-
-
-    <target name="clean_javadocs"
-            depends=""
-            description="--> remove javadocs directory">
-        <echo message="${begin.clean.javadocs.log.message}"/>
-        <delete dir="${docs.dir}"/>
-        <echo message="${end.clean.javadocs.log.message}"/>
-    </target>
-
-
-    <target name="compose_javadocs"
-            depends="build"
-            description="--> generate javadocs">
-        <echo message="${begin.compose.javadocs.log.message}"/>
-        <mkdir dir="${docs.dir}"/>
-        <javadoc destdir="${docs.dir}"
-                 maxmemory="512m"
-                 author="true"
-                 breakiterator="true"
-                 version="true"
-                 use="true"
-                 windowtitle="${ant.project.name}"
-                 classpathref="javadoc_classpath"
-                 verbose="false">
-            <doctitle>
-                <![CDATA[<h1>${ant.project.name}</h1>]]>
-            </doctitle>
-            <fileset dir="src"
-                     defaultexcludes="yes">
-                <include name="com/netscape/cmstools/**"/>
-            </fileset>
-        </javadoc>
-        <echo message="${end.compose.javadocs.log.message}"/>
-    </target>
-
-
-    <target name="document"
-            depends="clean_javadocs,compose_javadocs"
-            description="--> remove old javadocs and compose new javadocs">
-        <echo message="${notify.document.log.message}"/>
-    </target>
-
-
-    <target name="distribute_binaries"
-            depends="document"
-            description="--> create the zip and gzipped tar binary distributions">
-        <echo message="${begin.distribute.binaries.log.message}"/>
-        <mkdir dir="${dist.base.binaries}"/>
-        <mkdir dir="./build/cmds"/>
-
-        <echo message="${begin.binary.wrappers.log.message}"/>
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/AtoB.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/AtoB">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/AtoB/g"/>
-            <arg value="./build/cmds/AtoB.tmp"/>
-        </exec>
-        <delete file="./build/cmds/AtoB.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/AuditVerify.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/AuditVerify">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/AuditVerify/g"/>
-            <arg value="./build/cmds/AuditVerify.tmp"/>
-        </exec>
-        <delete file="./build/cmds/AuditVerify.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/BtoA.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/BtoA">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/BtoA/g"/>
-            <arg value="./build/cmds/BtoA.tmp"/>
-        </exec>
-        <delete file="./build/cmds/BtoA.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/CMCEnroll.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/CMCEnroll">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/CMCEnroll/g"/>
-            <arg value="./build/cmds/CMCEnroll.tmp"/>
-        </exec>
-        <delete file="./build/cmds/CMCEnroll.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/CMCRequest.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/CMCRequest">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/CMCRequest/g"/>
-            <arg value="./build/cmds/CMCRequest.tmp"/>
-        </exec>
-        <delete file="./build/cmds/CMCRequest.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/CMCResponse.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/CMCResponse">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/CMCResponse/g"/>
-            <arg value="./build/cmds/CMCResponse.tmp"/>
-        </exec>
-        <delete file="./build/cmds/CMCResponse.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/CMCRevoke.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/CMCRevoke">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/CMCRevoke/g"/>
-            <arg value="./build/cmds/CMCRevoke.tmp"/>
-        </exec>
-        <delete file="./build/cmds/CMCRevoke.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/CRMFPopClient.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/CRMFPopClient">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/CRMFPopClient/g"/>
-            <arg value="./build/cmds/CRMFPopClient.tmp"/>
-        </exec>
-        <delete file="./build/cmds/CRMFPopClient.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/ExtJoiner.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/ExtJoiner">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/ExtJoiner/g"/>
-            <arg value="./build/cmds/ExtJoiner.tmp"/>
-        </exec>
-        <delete file="./build/cmds/ExtJoiner.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/GenExtKeyUsage.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/GenExtKeyUsage">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/GenExtKeyUsage/g"/>
-            <arg value="./build/cmds/GenExtKeyUsage.tmp"/>
-        </exec>
-        <delete file="./build/cmds/GenExtKeyUsage.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/GenIssuerAltNameExt.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/GenIssuerAltNameExt">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/GenIssuerAltNameExt/g"/>
-            <arg value="./build/cmds/GenIssuerAltNameExt.tmp"/>
-        </exec>
-        <delete file="./build/cmds/GenIssuerAltNameExt.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/GenSubjectAltNameExt.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/GenSubjectAltNameExt">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/GenSubjectAltNameExt/g"/>
-            <arg value="./build/cmds/GenSubjectAltNameExt.tmp"/>
-        </exec>
-        <delete file="./build/cmds/GenSubjectAltNameExt.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/HttpClient.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/HttpClient">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/HttpClient/g"/>
-            <arg value="./build/cmds/HttpClient.tmp"/>
-        </exec>
-        <delete file="./build/cmds/HttpClient.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/OCSPClient.tmp"/>
-        <exec executable="sed" output="./build/cmds/OCSPClient">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/OCSPClient/g"/>
-            <arg value="./build/cmds/OCSPClient.tmp"/>
-        </exec>
-        <delete file="./build/cmds/OCSPClient.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/PKCS10Client.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/PKCS10Client">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/PKCS10Client/g"/>
-            <arg value="./build/cmds/PKCS10Client.tmp"/>
-        </exec>
-        <delete file="./build/cmds/PKCS10Client.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/PKCS12Export.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/PKCS12Export">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/PKCS12Export/g"/>
-            <arg value="./build/cmds/PKCS12Export.tmp"/>
-        </exec>
-        <delete file="./build/cmds/PKCS12Export.tmp"/>
-
-        <copy file="./templates/pretty_print_cert_command_wrapper"
-              tofile="./build/cmds/PrettyPrintCert.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/PrettyPrintCert">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/PrettyPrintCert/g"/>
-            <arg value="./build/cmds/PrettyPrintCert.tmp"/>
-        </exec>
-        <delete file="./build/cmds/PrettyPrintCert.tmp"/>
-
-        <copy file="./templates/pretty_print_crl_command_wrapper"
-              tofile="./build/cmds/PrettyPrintCrl.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/PrettyPrintCrl">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/PrettyPrintCrl/g"/>
-            <arg value="./build/cmds/PrettyPrintCrl.tmp"/>
-        </exec>
-        <delete file="./build/cmds/PrettyPrintCrl.tmp"/>
-
-        <copy file="./templates/pki_java_command_wrapper"
-              tofile="./build/cmds/TokenInfo.tmp"/>
-        <exec executable="sed"
-              output="./build/cmds/TokenInfo">
-            <arg value="-e"/>
-            <arg value="s/\[PKI_PRODUCT\]/${product.prefix}/g"/>
-            <arg value="-e"/>
-            <arg value="s/\[PKI_COMMAND\]/TokenInfo/g"/>
-            <arg value="./build/cmds/TokenInfo.tmp"/>
-        </exec>
-        <delete file="./build/cmds/TokenInfo.tmp"/>
-        <echo message="${end.binary.wrappers.log.message}"/>
-
-        <echo message="${begin.binary.zip.log.message}"/>
-        <zip destfile="${dist.base.binaries}/${dist.name}.zip">
-            <zipfileset dir="./build/jars"
-                        filemode="755"
-                        prefix="usr/share/java/${product.prefix}">
-                <include name="**"/>
-            </zipfileset>
-            <zipfileset dir="./build/cmds"
-                        filemode="755"
-                        prefix="usr/bin">
-                <include name="**"/>
-            </zipfileset>
-            <zipfileset dir="./templates"
-                        filemode="755"
-                        prefix="usr/share/${product.prefix}">
-                <include name="**"/>
-            </zipfileset>
-            <zipfileset dir="."
-                        filemode="644"
-                        prefix="usr/share/doc/${dist.name}">
-                <include name="EULA"/>
-                <include name="LICENSE"/>
-            </zipfileset>
-            <zipfileset dir="./docs"
-                        filemode="755"
-                        prefix="usr/share/javadoc/${product.name}-${version}">
-                <include name="**"/>
-            </zipfileset>
-        </zip>
-        <echo message="${end.binary.zip.log.message}"/>
-
-        <echo message="${begin.binary.tar.log.message}"/>
-        <tar longfile="gnu"
-             destfile="${dist.base.binaries}/${dist.name}.tar">
-            <tarfileset dir="./build/jars"
-                        mode="755"
-                        prefix="${dist.name}/usr/share/java/${product.prefix}">
-                <include name="**"/>
-            </tarfileset>
-            <tarfileset dir="./build/cmds"
-                        mode="755"
-                        prefix="usr/bin">
-                <include name="**"/>
-            </tarfileset>
-            <tarfileset dir="./templates"
-                        mode="755"
-                        prefix="usr/share/${product.prefix}">
-                <include name="**"/>
-            </tarfileset>
-            <tarfileset dir="."
-                        mode="644"
-                        prefix="${dist.name}/usr/share/doc/${dist.name}">
-                <include name="EULA"/>
-                <include name="LICENSE"/>
-            </tarfileset>
-            <tarfileset dir="./docs"
-                        mode="755"
-                        prefix="${dist.name}/usr/share/javadoc/${product.name}-${version}">
-                <include name="**"/>
-            </tarfileset>
-        </tar>
-        <echo message="${end.binary.tar.log.message}"/>
-
-        <echo message="${begin.binary.gtar.log.message}"/>
-        <gzip destfile="${dist.base.binaries}/${dist.name}.tar.gz"
-              src="${dist.base.binaries}/${dist.name}.tar"/>
-        <delete file="${dist.base.binaries}/${dist.name}.tar"/>
-        <delete dir="${dist.name}"/>
-        <checksum fileext=".md5">
-            <fileset dir="${dist.base.binaries}/">
-                <include name="**/*"/>
-                <exclude name="**/*.asc"/>
-                <exclude name="**/*.md5"/>
-            </fileset>
-        </checksum>
-        <checksum fileext=".sha1"
-                  algorithm="SHA">
-            <fileset dir="${dist.base.binaries}/">
-                <include name="**/*"/>
-                <exclude name="**/*.asc"/>
-                <exclude name="**/*.md5"/>
-            </fileset>
-        </checksum>
-        <echo message="${end.binary.gtar.log.message}"/>
-
-        <echo message="${end.distribute.binaries.log.message}"/>
-    </target>
-
-
-    <target name="distribute_source"
-            depends=""
-            description="--> create the zip and gzipped tar source distributions">
-        <echo message="${begin.distribute.source.log.message}"/>
-        <mkdir dir="${dist.base.source}"/>
-
-        <echo message="${begin.source.zip.log.message}"/>
-        <zip destfile="${dist.base.source}/${src.dist.name}.zip">
-            <zipfileset dir="."
-                        filemode="644"
-                        prefix="${src.dist.name}">
-                <include name="${specfile}"/>
-                <include name="EULA"/>
-                <include name="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="src/**"/>
-                <include name="templates/**"/>
-            </zipfileset>
-        </zip>
-        <echo message="${end.source.zip.log.message}"/>
-
-        <echo message="${begin.source.tar.log.message}"/>
-        <tar longfile="gnu"
-             destfile="${dist.base.source}/${src.dist.name}.tar">
-            <tarfileset dir="."
-                        mode="644"
-                        prefix="${src.dist.name}">
-                <include name="${specfile}"/>
-                <include name="EULA"/>
-                <include name="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="src/**"/>
-                <include name="templates/**"/>
-            </tarfileset>
-        </tar>
-        <echo message="${end.source.tar.log.message}"/>
-
-        <echo message="${begin.source.gtar.log.message}"/>
-        <gzip destfile="${dist.base.source}/${src.dist.name}.tar.gz"
-              src="${dist.base.source}/${src.dist.name}.tar"/>
-        <delete file="${dist.base.source}/${src.dist.name}.tar"/>
-        <delete dir="${dist.name}"/>
-        <checksum fileext=".md5">
-            <fileset dir="${dist.base.source}/">
-                <include name="**/*"/>
-                <exclude name="**/*.asc"/>
-                <exclude name="**/*.md5"/>
-            </fileset>
-        </checksum>
-        <checksum fileext=".sha1"
-                  algorithm="SHA">
-            <fileset dir="${dist.base.source}/">
-                <include name="**/*"/>
-                <exclude name="**/*.asc"/>
-                <exclude name="**/*.md5"/>
-            </fileset>
-        </checksum>
-        <echo message="${end.source.gtar.log.message}"/>
-
-        <echo message="${end.distribute.source.log.message}"/>
-    </target>
-
-
-    <target name="distribute"
-            depends="distribute_binaries,distribute_source"
-            description="--> create binary and source component distributions">
-        <echo message="${notify.distribute.log.message}"/>
-    </target>
-
-
-    <target name="main"
-            depends="clean,distribute"
-            description="--> clean, build, verify, document, distribute [default]">
-        <echo message="${notify.main.log.message}"/>
-    </target>
-
-</project>
-
diff --git a/pki/base/java-tools/doc/README b/pki/base/java-tools/doc/README
index ba49df3c2..fa0af7d4b 100644
--- a/pki/base/java-tools/doc/README
+++ b/pki/base/java-tools/doc/README
@@ -37,24 +37,33 @@ CRMFPopClient                                  A command line utility used to
                                                generate CRMF requests with
                                                proof of possession (POP).
 
-DRMTool -source_ldif_file                      A command line utility used to
-        <path + source ldif file>              change the storage key used
-        -target_ldif_file                      to wrap the symmetric key
-        <path + target ldif file>              which is used to encrypt the
-        -log_file                              user's private key.
-        <path + log file >                     Optionally, this utility
-        [-source_pki_security_database_path    may also be used to re-index IDs
-         <path to PKI source databases>]       associated with the various
-        [-source_storage_token_name            records which may be useful
-         '<source token>']                     for DRM consolidation.
-        [-source_storage_certificate_nickname
-         '<source nickname>']
-        [-target_storage_certificate_file
-         <path to target certificate file>]
+DRMTool -drmtool_config_file                   A command line utility used to
+        <path + drmtool config file>           change the storage key used
+        -source_ldif_file                      to wrap the symmetric key
+        <path + source ldif file>              which is used to encrypt the
+        -target_ldif_file                      user's private key.
+        <path + target ldif file>              Optionally, this utility
+        -log_file                              may also be used to re-index IDs
+        <path + log file >                     associated with the various
+        [-source_pki_security_database_path    records which may be useful
+         <path to PKI source databases>        for DRM consolidation.
+         -source_storage_token_name
+         '<source token>'
+         -source_storage_certificate_nickname
+         '<source nickname>'
+         -target_storage_certificate_file
+         <path to target certificate file>
+         [-source_pki_security_database_pwdfile
+          <path + pwdfile>]]
         [-append_id_offset
+         <numeric offset> ||
+         -remove_id_offset
          <numeric offset>]
-        [-remove_id_offset
-         <numeric offset>]
+        [-source_drm_naming_context
+          <source DRM naming context>]
+        [-target_drm_naming_context
+          <target DRM naming context>]
+        [-process_requests_and_key_records_only]
 
 ExtJoiner <ext_file0> . . . <ext_file9>        A command line utility utilized
                                                to join a sequence of extensions
diff --git a/pki/base/java-tools/templates/CMakeLists.txt b/pki/base/java-tools/templates/CMakeLists.txt
index b1b6a8a86..b7c6e891c 100644
--- a/pki/base/java-tools/templates/CMakeLists.txt
+++ b/pki/base/java-tools/templates/CMakeLists.txt
@@ -19,8 +19,6 @@ set(PKI_COMMANDS
     OCSPClient
     PKCS10Client
     PKCS12Export
-    PrettyPrintCert
-    PrettyPrintCrl
     TokenInfo
 )
 
@@ -38,3 +36,32 @@ foreach(PKI_COMMAND ${PKI_COMMANDS})
             WORLD_EXECUTE WORLD_READ
     )
 endforeach(PKI_COMMAND)
+
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pretty_print_cert_command_wrapper.in ${CMAKE_CURRENT_BINARY_DIR}/PrettyPrintCert @ONLY)
+
+install(
+    FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/PrettyPrintCert
+    DESTINATION
+        ${BIN_INSTALL_DIR}
+    PERMISSIONS
+        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+        GROUP_EXECUTE GROUP_READ
+        WORLD_EXECUTE WORLD_READ
+)
+
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pretty_print_crl_command_wrapper.in ${CMAKE_CURRENT_BINARY_DIR}/PrettyPrintCrl @ONLY)
+
+install(
+    FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/PrettyPrintCrl
+    DESTINATION
+        ${BIN_INSTALL_DIR}
+    PERMISSIONS
+        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+        GROUP_EXECUTE GROUP_READ
+        WORLD_EXECUTE WORLD_READ
+)
+
diff --git a/pki/base/java-tools/templates/pki_java_command_wrapper b/pki/base/java-tools/templates/pki_java_command_wrapper
deleted file mode 100644
index 27ddf11e4..000000000
--- a/pki/base/java-tools/templates/pki_java_command_wrapper
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/sh
-#
-# --- BEGIN COPYRIGHT BLOCK ---
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Copyright (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# --- END COPYRIGHT BLOCK ---
-#
-
-# Check to insure that this script's original invocation directory
-# has not been deleted!
-CWD=`/bin/pwd > /dev/null 2>&1`
-if [ $? -ne 0 ] ; then
-    echo "Cannot invoke '$0' from non-existent directory!"
-    exit 255
-fi
-
-
-###############################################################################
-##  (1) Specify variables used by this script.                               ##
-###############################################################################
-
-PRODUCT=[PKI_PRODUCT]
-COMMAND=[PKI_COMMAND]
-
-
-###############################################################################
-##  (2) Check for valid usage of this command wrapper.                       ##
-###############################################################################
-
-
-
-###############################################################################
-##  (3) Define helper functions.                                             ##
-###############################################################################
-
-invalid_operating_system() {
-    echo
-    echo "ERROR:  '$0' does not execute on the '$1' operating system!"
-    echo
-}
-
-invalid_architecture() {
-    echo
-    echo "ERROR:  '$0' does not execute on the '$1' architecture!"
-    echo
-}
-
-
-###############################################################################
-##  (4) Set the LD_LIBRARY_PATH environment variable to determine the        ##
-##      search order this command wrapper uses to find shared libraries.     ##
-###############################################################################
-
-OS=`uname -s`
-
-if [ "${OS}" = "Linux" ] ; then
-    ARCHITECTURE=`uname -i`
-    JAVA="java"
-    JAVA_OPTIONS=""
-
-    if [ "${ARCHITECTURE}" = "i386" ] ; then
-        LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
-        export LD_LIBRARY_PATH
-    elif [ "${ARCHITECTURE}" = "x86_64" ] ; then
-        LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/osutil:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64:/lib64:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/jss:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib64/osutil:${LD_LIBRARY_PATH}
-        export LD_LIBRARY_PATH
-    else
-        invalid_architecture "${ARCHITECTURE}"
-        exit 255
-    fi
-elif [ "${OS}" = "SunOS" ] ; then
-    ARCHITECTURE=`uname -p`
-    if [ "${ARCHITECTURE}" = "sparc" ] &&
-       [ -d "/usr/lib/sparcv9/" ] ; then
-        ARCHITECTURE="sparcv9"
-    fi
-    if [ "${ARCHITECTURE}" = "sparc" ] ; then
-        JAVA="/usr/jdk/instances/jdk1.5.0/jre/bin/java"
-        JAVA_OPTIONS=""
-
-        LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
-        export LD_LIBRARY_PATH
-    elif [ "${ARCHITECTURE}" = "sparcv9" ] ; then
-        JAVA="/usr/jdk/instances/jdk1.5.0/jre/bin/java"
-        JAVA_OPTIONS="-d64"
-
-        LD_LIBRARY_PATH=/usr/lib:/lib
-        LD_LIBRARY_PATH=/usr/lib/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/${PRODUCT}:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/sparcv9:/lib/sparcv9:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/sparcv9/dirsec:${LD_LIBRARY_PATH}
-        LD_LIBRARY_PATH=/usr/lib/sparcv9/${PRODUCT}:${LD_LIBRARY_PATH}
-        export LD_LIBRARY_PATH
-    else
-        invalid_architecture "${ARCHITECTURE}"
-        exit 255
-    fi
-else
-    invalid_operating_system "${OS}"
-    exit 255
-fi
-
-
-###############################################################################
-##  (5) Set the CP environment variable to determine the search              ##
-##      order this command wrapper uses to find jar files.                   ##
-###############################################################################
-
-CP=/usr/lib/java/jss4.jar
-CP=/usr/lib/java/dirsec/jss4.jar:${CP}
-CP=/usr/lib/java/osutil.jar:${CP}
-CP=/usr/lib/java/dirsec/osutil.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}
-CP=/usr/share/java/${PRODUCT}/pki-tools.jar:${CP}
-export CP
-
-
-###############################################################################
-##  (6) Execute the java command specified by this java command wrapper      ##
-##      based upon the preset LD_LIBRARY_PATH and CP environment variables.  ##
-###############################################################################
-
-${JAVA} ${JAVA_OPTIONS} -cp ${CP} com.netscape.cmstools.${COMMAND} "$@"
-exit $?
-
diff --git a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
index d9f57a05e..ce54ed024 100644
--- a/pki/base/java-tools/templates/pretty_print_cert_command_wrapper
+++ b/pki/base/java-tools/templates/pretty_print_cert_command_wrapper.in
@@ -32,8 +32,8 @@ fi
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-PRODUCT=[PKI_PRODUCT]
-COMMAND=[PKI_COMMAND]
+PRODUCT=@PKI_PRODUCT@
+COMMAND=@PKI_COMMAND@
 
 
 ###############################################################################
diff --git a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
index 8b9b04cdc..38f46856e 100644
--- a/pki/base/java-tools/templates/pretty_print_crl_command_wrapper
+++ b/pki/base/java-tools/templates/pretty_print_crl_command_wrapper.in
@@ -32,8 +32,8 @@ fi
 ##  (1) Specify variables used by this script.                               ##
 ###############################################################################
 
-PRODUCT=[PKI_PRODUCT]
-COMMAND=[PKI_COMMAND]
+PRODUCT=@PKI_PRODUCT@
+COMMAND=@PKI_COMMAND@
 
 
 ###############################################################################