From abaa8473f51a5c436a2952920625b7447e226b29 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Wed, 3 Sep 2014 21:07:07 -0700 Subject: Rename pki-tps-tomcat to pki-tps * PKI TRAC Ticket #1017 - Rename pki-tps-tomcat to pki-tps --- scripts/compose_pki_core_packages | 9 ++------- scripts/compose_pki_test_package | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'scripts') diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages index 9fbde025c..99730beb3 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" + PKI_COMPONENT_LIST="$PKI_COMPONENT_LIST server ca kra ocsp tks tps setup" # required for native 'tpsclient' utility PKI_COMPONENT_LIST="$PKI_COMPONENT_LIST tps-client" fi @@ -161,12 +161,7 @@ else cp -p VERSION ${PKI_CORE_BASE_DIR} for component in ${PKI_COMPONENT_LIST} ; do - if [ "${component}" = "tps-tomcat" ] ; then - # rename tps-tomcat to tps - dest="tps" - else - dest="${component}" - fi + dest="${component}" # copying ${PKI_BASE_DIR}/${component} to ${PKI_CORE_BASE_DIR}/${dest} cd ${component} diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package index 2aea422e5..a3bdeb952 100755 --- a/scripts/compose_pki_test_package +++ b/scripts/compose_pki_test_package @@ -89,7 +89,7 @@ CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/kra/src CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/kra/functional/src CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/ocsp/src CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tks/src -CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tps-tomcat/src +CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tps/src CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/migrate/80 CLASSPATH=$CLASSPATH:/usr/share/java/junit4.jar CLASSPATH=$CLASSPATH:`pwd`/src -- cgit