Remove RA and pkicreate and pkisilent

- PKI TRAC Ticket #1127 - Remove 'pki-ra', 'pki-setup', and 'pki-silent'
  packages . . .

5 files changed, 3 insertions, 217 deletions

diff --git a/scripts/build_dogtag_pki b/scripts/build_dogtag_pki
index 91acc3b0a..058abc931 100755
--- a/scripts/build_dogtag_pki
+++ b/scripts/build_dogtag_pki
@@ -104,7 +104,6 @@ fi
 PKI_COMPOSE_SCRIPTS_DIR="${PKI_PWD}/${PKI_DIR}/${PKI_SCRIPTS_DIR}"
 COMPOSE_DOGTAG_PKI_THEME_PACKAGES="compose_dogtag_pki_theme_packages"
 COMPOSE_PKI_CORE_PACKAGES="compose_pki_core_packages"
-COMPOSE_PKI_RA_PACKAGES="compose_pki_ra_packages"
 COMPOSE_PKI_TPS_PACKAGES="compose_pki_tps_packages"
 COMPOSE_PKI_CONSOLE_PACKAGES="compose_pki_console_packages"
 
@@ -112,13 +111,11 @@ COMPOSE_PKI_CONSOLE_PACKAGES="compose_pki_console_packages"
 PKI_PACKAGES_DIR="${PKI_PWD}/packages"
 PKI_DOGTAG_THEME_PACKAGES_DIR="${PKI_PWD}/packages.dogtag_theme"
 PKI_CORE_PACKAGES_DIR="${PKI_PWD}/packages.core"
-PKI_RA_PACKAGES_DIR="${PKI_PWD}/packages.ra"
 PKI_TPS_PACKAGES_DIR="${PKI_PWD}/packages.tps"
 PKI_CONSOLE_PACKAGES_DIR="${PKI_PWD}/packages.console"
 
 # Establish PKI theme package names
 PKI_SERVER_THEME=${PKI_FLAVOR}-pki-server-theme${RPM_EXT}
-PKI_RA_THEME=${PKI_FLAVOR}-pki-ra-theme${RPM_EXT}
 PKI_TPS_THEME=${PKI_FLAVOR}-pki-tps-theme${RPM_EXT}
 PKI_CONSOLE_THEME=${PKI_FLAVOR}-pki-console-theme${RPM_EXT}
 
@@ -134,9 +131,6 @@ PKI_KRA=pki-kra${RPM_EXT}
 PKI_OCSP=pki-ocsp${RPM_EXT}
 PKI_TKS=pki-tks${RPM_EXT}
 
-# Establish PKI ra package names
-PKI_RA=pki-ra${RPM_EXT}
-
 # Establish PKI tps package names
 PKI_TPS=pki-tps${RPM_EXT}
 
@@ -147,7 +141,6 @@ PKI_CONSOLE=pki-console${RPM_EXT}
 rm -rf ${PKI_PACKAGES_DIR}
 rm -rf ${PKI_DOGTAG_THEME_PACKAGES_DIR}
 rm -rf ${PKI_CORE_PACKAGES_DIR}
-rm -rf ${PKI_RA_PACKAGES_DIR}
 rm -rf ${PKI_TPS_PACKAGES_DIR}
 rm -rf ${PKI_CONSOLE_PACKAGES_DIR}
 
@@ -156,7 +149,7 @@ cd ${PKI_PWD}
 ${PKI_COMPOSE_SCRIPTS_DIR}/${COMPOSE_DOGTAG_PKI_THEME_PACKAGES} rpms
 mv ${PKI_PACKAGES_DIR} ${PKI_DOGTAG_THEME_PACKAGES_DIR}
 cd ${PKI_DOGTAG_THEME_PACKAGES_DIR}/${RPM_DIR}/${NOARCH}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SERVER_THEME} ${PKI_RA_THEME} ${PKI_TPS_THEME} ${PKI_CONSOLE_THEME}
+${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SERVER_THEME} ${PKI_TPS_THEME} ${PKI_CONSOLE_THEME}
 
 # Compose and install 'pki-core' packages
 cd ${PKI_PWD}
@@ -168,13 +161,6 @@ cp -p ${NOARCH}/*.rpm ${PKI_ARCH}/*.rpm ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${CO
 cd ${PKI_CORE_PACKAGES_DIR}/${RPM_DIR}/${COMBINED}
 ${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_SYMKEY} ${PKI_BASE} ${PKI_JAVADOC} ${PKI_TOOLS} ${PKI_SERVER} ${PKI_SELINUX} ${PKI_CA} ${PKI_KRA} ${PKI_OCSP} ${PKI_TKS}
 
-# Compose and install 'pki-ra' packages
-cd ${PKI_PWD}
-${PKI_COMPOSE_SCRIPTS_DIR}/${COMPOSE_PKI_RA_PACKAGES} rpms
-mv ${PKI_PACKAGES_DIR} ${PKI_RA_PACKAGES_DIR}
-cd ${PKI_RA_PACKAGES_DIR}/${RPM_DIR}/${NOARCH}
-${PKI_SUDO} ${YUM_EXE} ${YUM_EXE_OPTIONS} ${PKI_RA}
-
 # Compose and install 'pki-tps' packages
 cd ${PKI_PWD}
 ${PKI_COMPOSE_SCRIPTS_DIR}/${COMPOSE_PKI_TPS_PACKAGES} rpms
diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages
index 67d85a599..18cddb00b 100755
--- a/scripts/compose_pki_core_packages
+++ b/scripts/compose_pki_core_packages
@@ -45,7 +45,7 @@ if [ "$WITHOUT_JAVADOC" = "" ]; then
 fi
 
 if [ "$WITHOUT_SERVER" = "" ]; then
-    PKI_COMPONENT_LIST="$PKI_COMPONENT_LIST server ca kra ocsp tks tps-tomcat setup silent"
+    PKI_COMPONENT_LIST="$PKI_COMPONENT_LIST server ca kra ocsp tks tps-tomcat setup"
 fi
 
 ##
diff --git a/scripts/compose_pki_ra_packages b/scripts/compose_pki_ra_packages
deleted file mode 100755
index 5c37a52c8..000000000
--- a/scripts/compose_pki_ra_packages
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/bash
-# BEGIN COPYRIGHT BLOCK
-# (C) 2010 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-##
-## Include common 'compose' functions
-##
-
-COMPOSE_PWD=`dirname $0`
-source ${COMPOSE_PWD}/compose_functions
-
-
-## Always switch into the base directory three levels
-## above this shell script prior to executing it so
-## that all of its output is written to this directory
-
-cd `dirname $0`/../..
-
-
-##
-## Retrieve the name of this base directory
-##
-
-PKI_PWD=`pwd`
-
-
-##
-## Establish the 'pki-ra' name and version information
-##
-
-PKI_RA="pki-ra"
-PKI_RA_VERSION="10.2.0"
-
-
-##
-## Establish the SOURCE files/directories of the 'pki-ra' source directory
-##
-
-PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_RA}.spec"
-PKI_COMPONENT_LIST="ra"
-
-
-##
-## Establish the TARGET files/directories of the 'pki-ra' source/spec files
-##
-
-if [ $WORK_DIR ]; then
-    PKI_PACKAGES="`cd $WORK_DIR ; pwd`"
-else
-    PKI_PACKAGES="${PKI_PWD}/packages"
-fi
-
-PKI_RA_BUILD_DIR="${PKI_PACKAGES}/BUILD"
-PKI_RA_RPMS_DIR="${PKI_PACKAGES}/RPMS"
-PKI_RA_SOURCES_DIR="${PKI_PACKAGES}/SOURCES"
-PKI_RA_SPECS_DIR="${PKI_PACKAGES}/SPECS"
-PKI_RA_SRPMS_DIR="${PKI_PACKAGES}/SRPMS"
-
-PKI_RA_TARBALL="${PKI_RA}-${PKI_RA_VERSION}.tar.gz"
-PKI_RA_SPEC_FILE="${PKI_RA_SPECS_DIR}/${PKI_RA}.spec"
-PKI_RA_PACKAGE_SCRIPT="${PKI_PACKAGES}/package_${PKI_RA}"
-PKI_RA_PACKAGE_COMMAND="${RPMBUILD_CMD} SPECS/${PKI_RA}.spec"
-
-PKI_RA_STAGING_DIR="${PKI_PACKAGES}/staging"
-PKI_RA_DIR="${PKI_RA_STAGING_DIR}/${PKI_RA}-${PKI_RA_VERSION}"
-PKI_RA_BASE_DIR="${PKI_RA_DIR}/base"
-
-
-##
-## Always create a top-level 'packages' directory
-##
-
-mkdir -p ${PKI_PACKAGES}
-
-
-##
-## Always create 'pki-ra' package directories
-##
-
-mkdir -p ${PKI_RA_BUILD_DIR}
-mkdir -p ${PKI_RA_RPMS_DIR}
-mkdir -p ${PKI_RA_SOURCES_DIR}
-mkdir -p ${PKI_RA_SPECS_DIR}
-mkdir -p ${PKI_RA_SRPMS_DIR}
-
-
-##
-## Always start with new 'pki-ra' package files
-##
-
-rm -rf ${PKI_RA_BUILD_DIR}/${PKI_RA}-${PKI_RA_VERSION}
-rm -f  ${PKI_RA_RPMS_DIR}/${PKI_RA}-${PKI_RA_VERSION}*.rpm
-rm -f  ${PKI_RA_SOURCES_DIR}/${PKI_RA_TARBALL}
-rm -f  ${PKI_RA_SPEC_FILE}
-rm -f  ${PKI_RA_SRPMS_DIR}/${PKI_RA}-${PKI_RA_VERSION}*.rpm
-
-
-##
-## Copy a new 'pki-ra' spec file from the
-## current contents of the PKI working repository
-##
-
-cp -p ${PKI_SPECS_FILE} ${PKI_RA_SPECS_DIR}
-
-
-##
-## If specified, copy all Patches from the spec file URL to SOURCES
-##
-
-if [ ${FETCH_PATCH_FILES} -eq 1 ] ; then
-	Fetch_Patch_Files ${PKI_SPECS_FILE} ${PKI_RA_SOURCES_DIR}
-fi
-
-
-##
-## Copy the specified Source Tarball from the spec file URL to SOURCES, or
-## Generate a fresh Source Tarball from the local source
-##
-
-if [ ${FETCH_SOURCE_TARBALL} -eq 1 ] ; then
-	Fetch_Source_Tarball ${PKI_SPECS_FILE} ${PKI_RA_SOURCES_DIR}
-else
-	##
-	## Always start with a new 'pki-ra' staging directory
-	##
-
-	rm -rf ${PKI_RA_STAGING_DIR}
-
-
-	##
-	## To generate the 'pki-ra' tarball, construct a staging area
-	## consisting of the 'pki-ra' source components from the
-	## current contents of the PKI working repository
-	##
-
-	mkdir -p ${PKI_RA_DIR}
-	cd ${PKI_DIR}
-	for file in "${PKI_FILE_LIST}" ;
-	do
-		cp -p ${file} ${PKI_RA_DIR}
-	done
-	find ${PKI_CMAKE_DIR}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${PKI_RA_DIR} > /dev/null 2>&1
-	cd - > /dev/null 2>&1
-
-	mkdir -p ${PKI_RA_BASE_DIR}
-	cd ${PKI_BASE_DIR}
-	cp -p ${PKI_BASE_MANIFEST} ${PKI_RA_BASE_DIR}
-	for component in "${PKI_COMPONENT_LIST}" ;
-	do
-		find ${component}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${PKI_RA_BASE_DIR} > /dev/null 2>&1
-	done
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Create the 'pki-ra' tarball
-	##
-
-	mkdir -p ${PKI_RA_SOURCES_DIR}
-	cd ${PKI_RA_STAGING_DIR}
-	gtar -zcvf ${PKI_RA_TARBALL}    \
-		"${PKI_RA}-${PKI_RA_VERSION}" > /dev/null 2>&1
-	mv ${PKI_RA_TARBALL} ${PKI_RA_SOURCES_DIR}
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Always remove the PKI staging area
-	##
-
-	rm -rf ${PKI_RA_STAGING_DIR}
-fi
-
-
-##
-## Always generate a fresh 'pki-ra' package script
-##
-
-rm -rf ${PKI_RA_PACKAGE_SCRIPT}
-printf "#!/bin/bash\n\n"                >  ${PKI_RA_PACKAGE_SCRIPT}
-printf "${PKI_RA_PACKAGE_COMMAND}\n\n" >> ${PKI_RA_PACKAGE_SCRIPT}
-chmod 775 ${PKI_RA_PACKAGE_SCRIPT}
-
-
-##
-## Automatically invoke RPM/SRPM creation
-##
-
-cd ${PKI_PACKAGES} ;
-bash ./package_${PKI_RA} | tee package_${PKI_RA}.log 2>&1
-
diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package
index 5b26220a7..2aea422e5 100755
--- a/scripts/compose_pki_test_package
+++ b/scripts/compose_pki_test_package
@@ -83,7 +83,6 @@ CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/server/tomcat/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/server/cms/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/server/cmscore/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/server/test
-CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/silent/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/ca/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/ca/functional/src
 CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/kra/src
diff --git a/scripts/pki_patch_maker b/scripts/pki_patch_maker
index 08e8aacd8..69834100f 100755
--- a/scripts/pki_patch_maker
+++ b/scripts/pki_patch_maker
@@ -37,7 +37,7 @@ Usage()
 ## Identify source associated with srpm
 ##
 IPA_PKI_THEME="dogtag/ca-ui dogtag/common-ui"
-PKI_CORE="base/ca base/common base/java-tools base/native-tools base/selinux base/setup base/silent base/symkey base/util"
+PKI_CORE="base/ca base/common base/java-tools base/native-tools base/selinux base/setup base/symkey base/util"
 
 
 ##