Bugzilla Bug #445402: Fix contents of new "*dogtag*" files (with the exception

of any "*.spec" files) to refer to "dogtag" rather than "linux" in the new
"pki/dogtag/" directory.


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

30 files changed, 257 insertions, 257 deletions

diff --git a/pki/dogtag/ca-ui/build_dogtag b/pki/dogtag/ca-ui/build_dogtag
index 337fbb3fd..fc88953a6 100755
--- a/pki/dogtag/ca-ui/build_dogtag
+++ b/pki/dogtag/ca-ui/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-ca-ui.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-ca-ui.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/ca/build_dogtag b/pki/dogtag/ca/build_dogtag
index 6be41e5e1..aa2ab5d1c 100755
--- a/pki/dogtag/ca/build_dogtag
+++ b/pki/dogtag/ca/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-ca.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-ca.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/common-ui/build_dogtag b/pki/dogtag/common-ui/build_dogtag
index 10a6bc982..841772610 100755
--- a/pki/dogtag/common-ui/build_dogtag
+++ b/pki/dogtag/common-ui/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-common-ui.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-common-ui.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/common/build_dogtag b/pki/dogtag/common/build_dogtag
index 51618a126..bb2d6dfee 100755
--- a/pki/dogtag/common/build_dogtag
+++ b/pki/dogtag/common/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-common.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-common.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/config-ext/build_dogtag_pki b/pki/dogtag/config-ext/build_dogtag_pki
index d9ea91e8c..24cc247bd 100755
--- a/pki/dogtag/config-ext/build_dogtag_pki
+++ b/pki/dogtag/config-ext/build_dogtag_pki
@@ -24,7 +24,7 @@ cd `dirname $0`/..
 
 # Set pre-defined variables
 #
-# NOTE:  Variables prefixed with "LINUX" are defined in the invoking script.
+# NOTE:  Variables prefixed with "DOGTAG" are defined in the invoking script.
 #        Variables prefixed with "PKI" are defined in this shared script.
 #        Variables containing no prefix are reserved for the generated script.
 #
@@ -32,57 +32,57 @@ PKI_ABORT_SCRIPT="false"
 PKI_BASEDIR="../../.."
 PKI_BUILD_XML=build.xml
 PKI_DIR=pki
-PKI_LINUX_DIR=linux
+PKI_DOGTAG_DIR=dogtag
 PKI_RELEASE_DIR=release
 PKI_RELEASE_SCRIPT=release
 PKI_SHARED_SCRIPT=`basename $0`
 PKI_SRC_DIR=base
 
 # Check the values of the passed-in environment variables
-if [ "${LINUX_BUILD_SCRIPT}" == "" ]; then
-    printf "ERROR:  The 'LINUX_BUILD_SCRIPT' environment variable is undefined!\n"
+if [ "${DOGTAG_BUILD_SCRIPT}" == "" ]; then
+    printf "ERROR:  The 'DOGTAG_BUILD_SCRIPT' environment variable is undefined!\n"
     PKI_ABORT_SCRIPT="true"
 fi
-if [ "${LINUX_COMPONENT}" == "" ]; then
-    printf "ERROR:  The 'LINUX_COMPONENT' environment variable is undefined!\n"
+if [ "${DOGTAG_COMPONENT}" == "" ]; then
+    printf "ERROR:  The 'DOGTAG_COMPONENT' environment variable is undefined!\n"
     PKI_ABORT_SCRIPT="true"
 fi
-if [ "${LINUX_SPECFILE}" == "" ]; then
-    printf "ERROR:  The 'LINUX_SPECFILE' environment variable is undefined!\n"
+if [ "${DOGTAG_SPECFILE}" == "" ]; then
+    printf "ERROR:  The 'DOGTAG_SPECFILE' environment variable is undefined!\n"
     PKI_ABORT_SCRIPT="true"
 fi
 if [ "${PKI_ABORT_SCRIPT}" == "true" ]; then
     printf "\n"
     printf "The '${PKI_SHARED_SCRIPT}' shared build script MUST be invoked by "
-    printf "a\nPKI component-specific build script (e. g. - '${LINUX_BUILD_SCRIPT}')\n"
-    printf "which defines ALL environment variables prefixed by 'LINUX'!\n"
+    printf "a\nPKI component-specific build script (e. g. - '${DOGTAG_BUILD_SCRIPT}')\n"
+    printf "which defines ALL environment variables prefixed by 'DOGTAG'!\n"
     exit 255
 fi
 
 # Compute remaining variables by assigning their values from the specfile
-PKI_SOURCE_CODE_URL="https://pki-svn.fedora.redhat.com/svn/pki/trunk/${PKI_DIR}/${PKI_SRC_DIR}/${LINUX_COMPONENT}"
-PKI_PRODUCT_UI_PREFIX=`grep " base_ui_prefix" ${LINUX_SPECFILE} | awk '{ print $3; }'`
-PKI_PRODUCT_PREFIX=`grep " base_prefix" ${LINUX_SPECFILE} | awk '{ print $3; }'`
-PKI_PRODUCT=`grep " base_component" ${LINUX_SPECFILE} | awk '{ print $3; }'`
+PKI_SOURCE_CODE_URL="https://pki-svn.fedora.redhat.com/svn/pki/trunk/${PKI_DIR}/${PKI_SRC_DIR}/${DOGTAG_COMPONENT}"
+PKI_PRODUCT_UI_PREFIX=`grep " base_ui_prefix" ${DOGTAG_SPECFILE} | awk '{ print $3; }'`
+PKI_PRODUCT_PREFIX=`grep " base_prefix" ${DOGTAG_SPECFILE} | awk '{ print $3; }'`
+PKI_PRODUCT=`grep " base_component" ${DOGTAG_SPECFILE} | awk '{ print $3; }'`
 if [ "${PKI_PRODUCT_UI_PREFIX}" != "" ]; then
     PKI_PRODUCT_BUILD_XML="${PKI_BUILD_XML}"
     PKI_PRODUCT_NAME="${PKI_PRODUCT_PREFIX}-${PKI_PRODUCT}"
-    PKI_PRODUCT_SOURCE_PATH="${PKI_DIR}/${PKI_LINUX_DIR}/${LINUX_COMPONENT}"
+    PKI_PRODUCT_SOURCE_PATH="${PKI_DIR}/${PKI_DOGTAG_DIR}/${DOGTAG_COMPONENT}"
 elif [ "${PKI_PRODUCT_PREFIX}" != "" ]; then
-    PKI_PRODUCT_BUILD_XML="${PKI_BASEDIR}/${PKI_DIR}/${PKI_SRC_DIR}/${LINUX_COMPONENT}/${PKI_BUILD_XML}"
+    PKI_PRODUCT_BUILD_XML="${PKI_BASEDIR}/${PKI_DIR}/${PKI_SRC_DIR}/${DOGTAG_COMPONENT}/${PKI_BUILD_XML}"
     PKI_PRODUCT_NAME="${PKI_PRODUCT_PREFIX}-${PKI_PRODUCT}"
-    PKI_PRODUCT_SOURCE_PATH="${PKI_DIR}/${PKI_SRC_DIR}/${LINUX_COMPONENT}"
+    PKI_PRODUCT_SOURCE_PATH="${PKI_DIR}/${PKI_SRC_DIR}/${DOGTAG_COMPONENT}"
 else
-    PKI_PRODUCT_BUILD_XML="${PKI_BASEDIR}/${PKI_DIR}/${PKI_SRC_DIR}/${LINUX_COMPONENT}/${PKI_BUILD_XML}"
+    PKI_PRODUCT_BUILD_XML="${PKI_BASEDIR}/${PKI_DIR}/${PKI_SRC_DIR}/${DOGTAG_COMPONENT}/${PKI_BUILD_XML}"
     PKI_PRODUCT_NAME="${PKI_PRODUCT}"
-    PKI_PRODUCT_SOURCE_PATH="${PKI_DIR}/${PKI_SRC_DIR}/${LINUX_COMPONENT}"
+    PKI_PRODUCT_SOURCE_PATH="${PKI_DIR}/${PKI_SRC_DIR}/${DOGTAG_COMPONENT}"
 fi
 PKI_RELEASE_ROOT="${PKI_BASEDIR}/${PKI_RELEASE_DIR}/${PKI_PRODUCT_SOURCE_PATH}"
 PKI_SOURCE_CODE_LOCAL_REPOSITORY="`pwd`/${PKI_BASEDIR}/${PKI_PRODUCT_SOURCE_PATH}"
 
 # Always check that local source code for this PKI component is available
 if [ ! -d "${PKI_SOURCE_CODE_LOCAL_REPOSITORY}" ]; then
-    printf "Please checkout the '${LINUX_COMPONENT}' source code from:\n\n"
+    printf "Please checkout the '${DOGTAG_COMPONENT}' source code from:\n\n"
     printf "    '${PKI_SOURCE_CODE_URL}'\n\n"
     printf "to:\n\n"
     printf "    '${PKI_SOURCE_CODE_LOCAL_REPOSITORY}'\n\n"
@@ -141,7 +141,7 @@ usage() {
         echo "$1"
     fi
     echo
-    echo "Usage:  ${LINUX_BUILD_SCRIPT} [target]"
+    echo "Usage:  ${DOGTAG_BUILD_SCRIPT} [target]"
     echo
     echo "        where [target] is one of the optional values:"
     echo
@@ -176,7 +176,7 @@ fi
 # This script may ONLY be run on Linux!
 PKI_OS=`uname`
 if [ "${PKI_OS}" != "Linux" ]; then
-    printf "The '${LINUX_BUILD_SCRIPT}' script is ONLY executable on a 'Linux' machine!\n"
+    printf "The '${DOGTAG_BUILD_SCRIPT}' script is ONLY executable on a 'Linux' machine!\n"
     exit 255
 fi
 
@@ -197,7 +197,7 @@ if [ -d ${PKI_RELEASE_ROOT}/config-ext ]; then
 fi
 
 # Create the default spec file
-cp ${LINUX_SPECFILE} ${PKI_RELEASE_ROOT}/${PKI_PRODUCT_NAME}.spec
+cp ${DOGTAG_SPECFILE} ${PKI_RELEASE_ROOT}/${PKI_PRODUCT_NAME}.spec
 
 # Use bash-specific syntax to create the default build script
 cat >> ${PKI_RELEASE_ROOT}/${PKI_RELEASE_SCRIPT} << END_OF_SCRIPT
diff --git a/pki/dogtag/console-ui/build_dogtag b/pki/dogtag/console-ui/build_dogtag
index bbcd0a6a4..b6cb9074a 100755
--- a/pki/dogtag/console-ui/build_dogtag
+++ b/pki/dogtag/console-ui/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-console-ui.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-console-ui.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/console/build_dogtag b/pki/dogtag/console/build_dogtag
index 9700d8321..d86f0b84f 100755
--- a/pki/dogtag/console/build_dogtag
+++ b/pki/dogtag/console/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-console.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-console.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/java-tools/build_dogtag b/pki/dogtag/java-tools/build_dogtag
index 3eaf7df2f..b7c6e9ea9 100755
--- a/pki/dogtag/java-tools/build_dogtag
+++ b/pki/dogtag/java-tools/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-java-tools.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-java-tools.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/kra-ui/build_dogtag b/pki/dogtag/kra-ui/build_dogtag
index c934ba268..d2f8ad85a 100755
--- a/pki/dogtag/kra-ui/build_dogtag
+++ b/pki/dogtag/kra-ui/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-kra-ui.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-kra-ui.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/kra/build_dogtag b/pki/dogtag/kra/build_dogtag
index 016383c11..26dcfc699 100755
--- a/pki/dogtag/kra/build_dogtag
+++ b/pki/dogtag/kra/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-kra.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-kra.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/manage/build_dogtag b/pki/dogtag/manage/build_dogtag
index 4e79895db..ea33450f3 100755
--- a/pki/dogtag/manage/build_dogtag
+++ b/pki/dogtag/manage/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-manage.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-manage.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/migrate/build_dogtag b/pki/dogtag/migrate/build_dogtag
index 4bc21a648..3bc50f48d 100755
--- a/pki/dogtag/migrate/build_dogtag
+++ b/pki/dogtag/migrate/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-migrate.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-migrate.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/native-tools/build_dogtag b/pki/dogtag/native-tools/build_dogtag
index 65861b388..722efbf81 100755
--- a/pki/dogtag/native-tools/build_dogtag
+++ b/pki/dogtag/native-tools/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-native-tools.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-native-tools.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/ocsp-ui/build_dogtag b/pki/dogtag/ocsp-ui/build_dogtag
index 8b4629672..ed81f278c 100755
--- a/pki/dogtag/ocsp-ui/build_dogtag
+++ b/pki/dogtag/ocsp-ui/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-ocsp-ui.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-ocsp-ui.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/ocsp/build_dogtag b/pki/dogtag/ocsp/build_dogtag
index 698dde47c..e62c5c980 100755
--- a/pki/dogtag/ocsp/build_dogtag
+++ b/pki/dogtag/ocsp/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-ocsp.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-ocsp.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/osutil/build_dogtag b/pki/dogtag/osutil/build_dogtag
index 2f98316d8..80eacc438 100755
--- a/pki/dogtag/osutil/build_dogtag
+++ b/pki/dogtag/osutil/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="osutil.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="osutil.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/ra-ui/build_dogtag b/pki/dogtag/ra-ui/build_dogtag
index f330d94fb..c3280b0de 100755
--- a/pki/dogtag/ra-ui/build_dogtag
+++ b/pki/dogtag/ra-ui/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-ra-ui.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-ra-ui.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/ra/build_dogtag b/pki/dogtag/ra/build_dogtag
index 8b9c03b57..7ad952859 100755
--- a/pki/dogtag/ra/build_dogtag
+++ b/pki/dogtag/ra/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-ra.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-ra.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/scripts/build_ca b/pki/dogtag/scripts/build_ca
index e581096e2..9ac38de1b 100755
--- a/pki/dogtag/scripts/build_ca
+++ b/pki/dogtag/scripts/build_ca
@@ -31,11 +31,11 @@ if [ "${PKI_OS}" != "Linux" ]; then
     exit 255
 fi
 
-# Set Linux variables
-PKI_FLAVOR="linux"
+# Set Dogtag variables
+PKI_FLAVOR="dogtag"
 PKI_UI_DIR="${PKI_DIR}/${PKI_FLAVOR}"
 PKI_BUILD_SCRIPT_DIR="${PKI_PWD}/${PKI_UI_DIR}"
-PKI_BUILD_SCRIPT="build_linux"
+PKI_BUILD_SCRIPT="build_dogtag"
 
 # Set packaging variables
 RPM_EXE="/bin/rpm"
diff --git a/pki/dogtag/scripts/build_pki b/pki/dogtag/scripts/build_pki
index 9d248e6c2..57f54881f 100755
--- a/pki/dogtag/scripts/build_pki
+++ b/pki/dogtag/scripts/build_pki
@@ -31,11 +31,11 @@ if [ "${PKI_OS}" != "Linux" ]; then
     exit 255
 fi
 
-# Set Linux variables
-PKI_FLAVOR="linux"
+# Set Dogtag variables
+PKI_FLAVOR="dogtag"
 PKI_UI_DIR="${PKI_DIR}/${PKI_FLAVOR}"
 PKI_BUILD_SCRIPT_DIR="${PKI_PWD}/${PKI_UI_DIR}"
-PKI_BUILD_SCRIPT="build_linux"
+PKI_BUILD_SCRIPT="build_dogtag"
 
 # Set packaging variables
 RPM_EXE="/bin/rpm"
diff --git a/pki/dogtag/scripts/dogtag_svn_external_properties_db b/pki/dogtag/scripts/dogtag_svn_external_properties_db
index f73b03339..a98454b77 100644
--- a/pki/dogtag/scripts/dogtag_svn_external_properties_db
+++ b/pki/dogtag/scripts/dogtag_svn_external_properties_db
@@ -1,2 +1,2 @@
-config https://pki-svn.fedora.redhat.com/svn/pki/trunk/pki/base/config
-config-ext https://pki-svn.fedora.redhat.com/svn/pki/trunk/pki/linux/config-ext
+config https://pki.fedoraproject.org/svn/pki/trunk/pki/base/config
+config-ext https://pki.fedoraproject.org/svn/pki/trunk/pki/dogtag/config-ext
diff --git a/pki/dogtag/scripts/set_dogtag_SVN_external_properties b/pki/dogtag/scripts/set_dogtag_SVN_external_properties
index 902f0b9eb..5ea5285e5 100755
--- a/pki/dogtag/scripts/set_dogtag_SVN_external_properties
+++ b/pki/dogtag/scripts/set_dogtag_SVN_external_properties
@@ -14,7 +14,7 @@ PKI_PWD=`pwd`
 
 # Name and location of the SVN external properties DB.
 SVN_EXTERNAL_PROPERTIES_DB_LOCATION="${PKI_PWD}"
-SVN_EXTERNAL_PROPERTIES_DB_NAME="linux_svn_external_properties_db"
+SVN_EXTERNAL_PROPERTIES_DB_NAME="dogtag_svn_external_properties_db"
 SVN_EXTERNAL_PROPERTIES_DB="${SVN_EXTERNAL_PROPERTIES_DB_LOCATION}/${SVN_EXTERNAL_PROPERTIES_DB_NAME}"
 
 # Always make sure that the SVN external properties DB exists.
diff --git a/pki/dogtag/setup/build_dogtag b/pki/dogtag/setup/build_dogtag
index 84726f767..8a55624af 100755
--- a/pki/dogtag/setup/build_dogtag
+++ b/pki/dogtag/setup/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-setup.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-setup.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/silent/build_dogtag b/pki/dogtag/silent/build_dogtag
index 4405ed28d..cbf75b65a 100755
--- a/pki/dogtag/silent/build_dogtag
+++ b/pki/dogtag/silent/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-silent.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-silent.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/symkey/build_dogtag b/pki/dogtag/symkey/build_dogtag
index 845692d6a..a2ad5fbce 100755
--- a/pki/dogtag/symkey/build_dogtag
+++ b/pki/dogtag/symkey/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="symkey.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="symkey.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/tks-ui/build_dogtag b/pki/dogtag/tks-ui/build_dogtag
index 2d85d3c90..9cc324095 100755
--- a/pki/dogtag/tks-ui/build_dogtag
+++ b/pki/dogtag/tks-ui/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-tks-ui.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-tks-ui.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/tks/build_dogtag b/pki/dogtag/tks/build_dogtag
index 91e2b581f..e70d9a725 100755
--- a/pki/dogtag/tks/build_dogtag
+++ b/pki/dogtag/tks/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-tks.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-tks.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/tps-ui/build_dogtag b/pki/dogtag/tps-ui/build_dogtag
index 428562e99..41583a91a 100755
--- a/pki/dogtag/tps-ui/build_dogtag
+++ b/pki/dogtag/tps-ui/build_dogtag
@@ -26,14 +26,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-tps-ui.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-tps-ui.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/tps/build_dogtag b/pki/dogtag/tps/build_dogtag
index fa3f9c958..412b9a588 100755
--- a/pki/dogtag/tps/build_dogtag
+++ b/pki/dogtag/tps/build_dogtag
@@ -26,14 +26,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-tps.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-tps.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@
 
diff --git a/pki/dogtag/util/build_dogtag b/pki/dogtag/util/build_dogtag
index 4a33825cd..1fc2bd951 100755
--- a/pki/dogtag/util/build_dogtag
+++ b/pki/dogtag/util/build_dogtag
@@ -25,14 +25,14 @@ cd `dirname $0`
 # Retrieve the directory name housing this component
 PWD=`pwd`
 
-# Set Linux component-specific environment variables
-LINUX_BUILD_SCRIPT=`basename $0`
-export LINUX_BUILD_SCRIPT
-LINUX_COMPONENT=`basename ${PWD}`
-export LINUX_COMPONENT
-LINUX_SPECFILE="pki-util.spec"
-export LINUX_SPECFILE
+# Set Dogtag component-specific environment variables
+DOGTAG_BUILD_SCRIPT=`basename $0`
+export DOGTAG_BUILD_SCRIPT
+DOGTAG_COMPONENT=`basename ${PWD}`
+export DOGTAG_COMPONENT
+DOGTAG_SPECFILE="pki-util.spec"
+export DOGTAG_SPECFILE
 
-# Invoke the shared Linux PKI build script
-config-ext/build_linux_pki $@
+# Invoke the shared Dogtag PKI build script
+config-ext/build_dogtag_pki $@