>From f2f504a1e12647fada4581efff1ade1792614b6e Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Tue, 9 Sep 2014 16:59:32 -0700
Subject: [PATCH] Remove IPA theme component and old unused UI directories

- PKI TRAC Ticket #1136 - Remove ipa-pki-theme component
- Remove 'ca-ui', 'kra-ui', 'ocsp-ui', 'ra-ui', 'tks-ui', and 'tps-ui' directories
- Consolidate 'pki-core' packages
---
 CMakeLists.txt                            |  19 +-
 dogtag/CMakeLists.txt                     |   3 -
 dogtag/ca-ui/CMakeLists.txt               |   8 -
 dogtag/ca-ui/LICENSE                      | 291 ------------------------------
 dogtag/kra-ui/CMakeLists.txt              |   8 -
 dogtag/kra-ui/LICENSE                     | 291 ------------------------------
 dogtag/kra-ui/build.xml                   | 273 ----------------------------
 dogtag/kra-ui/build_dogtag                |  82 ---------
 dogtag/kra-ui/dogtag-pki-kra-ui.spec      |  61 -------
 dogtag/ocsp-ui/CMakeLists.txt             |   8 -
 dogtag/ocsp-ui/LICENSE                    | 291 ------------------------------
 dogtag/ocsp-ui/build.xml                  | 273 ----------------------------
 dogtag/ocsp-ui/build_dogtag               |  82 ---------
 dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec    |  62 -------
 dogtag/ra-ui/CMakeLists.txt               |   8 -
 dogtag/ra-ui/LICENSE                      | 291 ------------------------------
 dogtag/ra-ui/build.xml                    | 273 ----------------------------
 dogtag/ra-ui/build_dogtag                 |  82 ---------
 dogtag/ra-ui/dogtag-pki-ra-ui.spec        |  61 -------
 dogtag/tks-ui/CMakeLists.txt              |   8 -
 dogtag/tks-ui/LICENSE                     | 291 ------------------------------
 dogtag/tks-ui/build.xml                   | 273 ----------------------------
 dogtag/tks-ui/build_dogtag                |  82 ---------
 dogtag/tks-ui/dogtag-pki-tks-ui.spec      |  61 -------
 dogtag/tps-ui/CMakeLists.txt              |   8 -
 dogtag/tps-ui/LICENSE                     | 291 ------------------------------
 dogtag/tps-ui/build.xml                   | 285 -----------------------------
 dogtag/tps-ui/build_dogtag                |  82 ---------
 dogtag/tps-ui/dogtag-pki-tps-ui.spec      |  65 -------
 scripts/compose_dogtag_pki_theme_packages |   2 +-
 scripts/compose_ipa_pki_theme_packages    | 222 -----------------------
 scripts/create_pki_yum_repos              |   2 +-
 scripts/pki_patch_maker                   |   8 +-
 specs/dogtag-pki-theme.spec               |  66 ++-----
 specs/dogtag-pki.spec                     |  45 ++---
 specs/ipa-pki-theme.spec                  | 203 ---------------------
 36 files changed, 41 insertions(+), 4420 deletions(-)
 delete mode 100644 dogtag/ca-ui/CMakeLists.txt
 delete mode 100644 dogtag/ca-ui/LICENSE
 delete mode 100644 dogtag/kra-ui/CMakeLists.txt
 delete mode 100644 dogtag/kra-ui/LICENSE
 delete mode 100644 dogtag/kra-ui/build.xml
 delete mode 100755 dogtag/kra-ui/build_dogtag
 delete mode 100644 dogtag/kra-ui/dogtag-pki-kra-ui.spec
 delete mode 100644 dogtag/ocsp-ui/CMakeLists.txt
 delete mode 100644 dogtag/ocsp-ui/LICENSE
 delete mode 100644 dogtag/ocsp-ui/build.xml
 delete mode 100755 dogtag/ocsp-ui/build_dogtag
 delete mode 100644 dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
 delete mode 100644 dogtag/ra-ui/CMakeLists.txt
 delete mode 100644 dogtag/ra-ui/LICENSE
 delete mode 100644 dogtag/ra-ui/build.xml
 delete mode 100755 dogtag/ra-ui/build_dogtag
 delete mode 100644 dogtag/ra-ui/dogtag-pki-ra-ui.spec
 delete mode 100644 dogtag/tks-ui/CMakeLists.txt
 delete mode 100644 dogtag/tks-ui/LICENSE
 delete mode 100644 dogtag/tks-ui/build.xml
 delete mode 100755 dogtag/tks-ui/build_dogtag
 delete mode 100644 dogtag/tks-ui/dogtag-pki-tks-ui.spec
 delete mode 100644 dogtag/tps-ui/CMakeLists.txt
 delete mode 100644 dogtag/tps-ui/LICENSE
 delete mode 100644 dogtag/tps-ui/build.xml
 delete mode 100755 dogtag/tps-ui/build_dogtag
 delete mode 100644 dogtag/tps-ui/dogtag-pki-tps-ui.spec
 delete mode 100755 scripts/compose_ipa_pki_theme_packages
 delete mode 100644 specs/ipa-pki-theme.spec

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0862c4..1b04500 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,9 +17,7 @@ string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" APPLICATION_VERSION_P
 option(WITH_JAVADOC "Build Javadoc" ON)
 option(WITH_SERVER "Build Server" ON)
 
-if (BUILD_IPA_PKI_THEME)
-    set(APPLICATION_FLAVOR_IPA_PKI_THEME TRUE)
-elseif (BUILD_DOGTAG_PKI_THEME)
+if (BUILD_DOGTAG_PKI_THEME)
     set(APPLICATION_FLAVOR_DOGTAG_PKI_THEME TRUE)
 elseif (BUILD_REDHAT_PKI_THEME)
     set(APPLICATION_FLAVOR_REDHAT_PKI_THEME TRUE)
@@ -56,18 +54,15 @@ include(Java)
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/classes)
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/dist)
 
-# required for all PKI components EXCEPT IPA_PKI_THEME
-if (NOT APPLICATION_FLAVOR_IPA_PKI_THEME)
-    include(JUnit)
+# required for all PKI components
+include(JUnit)
 
-    add_custom_target(test)
-endif ()
+add_custom_target(test)
 
 # search for libraries
 
 # required for all PKI components EXCEPT Theme-based components and PKI_MIGRATE
-if (NOT APPLICATION_FLAVOR_IPA_PKI_THEME      AND
-    NOT APPLICATION_FLAVOR_DOGTAG_PKI_THEME   AND
+if (NOT APPLICATION_FLAVOR_DOGTAG_PKI_THEME   AND
     NOT APPLICATION_FLAVOR_REDHAT_PKI_THEME   AND
     NOT APPLICATION_FLAVOR_PKI_MIGRATE)
     find_package(NSPR REQUIRED)
@@ -152,9 +147,7 @@ if (APPLICATION_FLAVOR_PKI_CORE      OR
 endif ()
 
 # 'Themes' MUST be "mutually-exclusive"!
-if (APPLICATION_FLAVOR_IPA_PKI_THEME)
-    add_subdirectory(dogtag)
-elseif (APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
+if (APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
     add_subdirectory(dogtag)
 elseif (APPLICATION_FLAVOR_REDHAT_PKI_THEME)
     add_subdirectory(redhat)
diff --git a/dogtag/CMakeLists.txt b/dogtag/CMakeLists.txt
index 2561495..83558f9 100644
--- a/dogtag/CMakeLists.txt
+++ b/dogtag/CMakeLists.txt
@@ -1,8 +1,5 @@
 project(dogtag)
 
-if (APPLICATION_FLAVOR_IPA_PKI_THEME)
-    add_subdirectory(common-ui)
-endif (APPLICATION_FLAVOR_IPA_PKI_THEME)
 if (APPLICATION_FLAVOR_DOGTAG_PKI_THEME)
     add_subdirectory(common-ui)
     add_subdirectory(console-ui)
diff --git a/dogtag/ca-ui/CMakeLists.txt b/dogtag/ca-ui/CMakeLists.txt
deleted file mode 100644
index 68c1c20..0000000
--- a/dogtag/ca-ui/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-project(ca-ui)
-
-install(
-    DIRECTORY
-        shared/
-    DESTINATION
-        ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}
-)
diff --git a/dogtag/ca-ui/LICENSE b/dogtag/ca-ui/LICENSE
deleted file mode 100644
index e281f43..0000000
--- a/dogtag/ca-ui/LICENSE
+++ /dev/null
@@ -1,291 +0,0 @@
-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
diff --git a/dogtag/kra-ui/CMakeLists.txt b/dogtag/kra-ui/CMakeLists.txt
deleted file mode 100644
index 0079e52..0000000
--- a/dogtag/kra-ui/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-project(kra-ui)
-
-install(
-    DIRECTORY
-        shared/
-    DESTINATION
-        ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}
-)
diff --git a/dogtag/kra-ui/LICENSE b/dogtag/kra-ui/LICENSE
deleted file mode 100644
index e281f43..0000000
--- a/dogtag/kra-ui/LICENSE
+++ /dev/null
@@ -1,291 +0,0 @@
-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
diff --git a/dogtag/kra-ui/build.xml b/dogtag/kra-ui/build.xml
deleted file mode 100644
index 7826cc4..0000000
--- a/dogtag/kra-ui/build.xml
+++ /dev/null
@@ -1,273 +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="kra-ui" default="main" basedir=".">
-
-    <import file="config/product.xml"/>
-    <import file="config/product-ext.xml" optional="true"/>
-
-
-    <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}"/>
-        <echo message="${empty.compile.java.log.message}"/>
-        <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}"/>
-        <echo message="${empty.build.jars.log.message}"/>
-        <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}"/>
-        <echo message="${empty.clean.javadocs.log.message}"/>
-        <echo message="${end.clean.javadocs.log.message}"/>
-    </target>
-
-
-    <target name="compose_javadocs"
-            depends="build"
-            description="--> generate javadocs">
-        <echo message="${begin.compose.javadocs.log.message}"/>
-        <echo message="${empty.compose.javadocs.log.message}"/>
-        <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="build,document"
-            description="--> create the zip and gzipped tar binary distributions">
-        <echo message="${begin.distribute.binaries.log.message}"/>
-        <mkdir dir="${dist.base.binaries}"/>
-
-        <echo message="${begin.binary.wrappers.log.message}"/>
-        <echo message="${empty.binary.wrappers.log.message}"/>
-        <echo message="${end.binary.wrappers.log.message}"/>
-
-        <echo message="${begin.binary.zip.log.message}"/>
-        <zip destfile="${dist.base.binaries}/${dist.name}.zip">
-            <zipfileset dir="./shared"
-                        filemode="644"
-                        prefix="usr/share/${product.prefix}/${product}">
-                <include name="**"/>
-            </zipfileset>
-            <zipfileset dir="."
-                        filemode="644"
-                        prefix="usr/share/doc/${dist.name}">
-                <include name="LICENSE"/>
-            </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="./shared"
-                        mode="644"
-                        prefix="${dist.name}/usr/share/${product.prefix}/${product}">
-                <include name="**"/>
-            </tarfileset>
-            <tarfileset dir="."
-                        mode="644"
-                        prefix="${dist.name}/usr/share/doc/${dist.name}">
-                <include name="LICENSE"/>
-            </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="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="shared/**"/>
-            </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="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="shared/**"/>
-            </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/dogtag/kra-ui/build_dogtag b/dogtag/kra-ui/build_dogtag
deleted file mode 100755
index 74e9bc8..0000000
--- a/dogtag/kra-ui/build_dogtag
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-# 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.
-#
-# (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-# Always switch into the base directory of this
-# shell script prior to executing it so that all
-# of its output is written to this directory
-cd `dirname $0`
-
-# Retrieve the directory name housing this component
-PWD=`pwd`
-
-# Set Dogtag component-specific environment variables
-DOGTAG_BUILD_SCRIPT=`basename $0`
-export DOGTAG_BUILD_SCRIPT
-DOGTAG_COMPONENT=`basename ${PWD}`
-export DOGTAG_COMPONENT
-DOGTAG_SPECFILE="dogtag-pki-kra-ui.spec"
-export DOGTAG_SPECFILE
-
-# Set PKI 'ant' environment variables (originally obtained from specfile)
-PKI_PRODUCT_UI_FLAVOR_PREFIX="dogtag"
-export PKI_PRODUCT_UI_FLAVOR_PREFIX
-PKI_PRODUCT_PREFIX="pki"
-export PKI_PRODUCT_PREFIX
-PKI_PRODUCT="kra-ui"
-export PKI_PRODUCT
-PKI_VERSION="9.0.0"
-export PKI_VERSION
-
-# Set Dogtag helper variables
-DOGTAG_COMPONENT_NAME=${PKI_PRODUCT}
-export DOGTAG_COMPONENT_NAME
-DOGTAG_WGET_URL=http://cvs.fedora.redhat.com/viewvc
-export DOGTAG_WGET_URL
-
-# Obtain '${DOGTAG_SPECFILE}' as necessary
-if [ "$1" = "refresh" ]; then
-	if [ -f "${DOGTAG_SPECFILE}" ]; then
-		printf "Removing '${DOGTAG_SPECFILE}' . . . "
-		rm -rf ${DOGTAG_SPECFILE}
-		printf "done.\n"
-	fi
-	shift
-fi
-if [ ! -f "${DOGTAG_SPECFILE}" ]; then
-	# Check for Fedora Operating System
-	if [ ! -f /etc/fedora-release ]; then
-		printf "'${DOGTAG_COMPONENT_NAME}' ONLY builds on Fedora!\n"
-		exit 255
-	fi
-	# Obtain Fedora Operating System Version
-	FEDORA_VERSION="F-`cat /etc/fedora-release | awk '{print $3}'`"
-	export FEDORA_VERSION
-	# Retrieve '${DOGTAG_SPECFILE}' from Koji
-	printf "Fetching '${DOGTAG_SPECFILE}' for '${FEDORA_VERSION}' . . .\n"
-	wget -O ${DOGTAG_SPECFILE} ${DOGTAG_WGET_URL}/${FEDORA_VERSION}/${DOGTAG_COMPONENT_NAME}/${DOGTAG_SPECFILE}?view=co
-	if [ ! -s "${DOGTAG_SPECFILE}" ]; then
-		printf "Failed to fetch '${DOGTAG_SPECFILE}' for '${FEDORA_VERSION}'!\n"
-		rm -rf ${DOGTAG_SPECFILE}
-		exit 255
-	fi
-fi
-
-# Invoke the shared Dogtag PKI build script
-config-ext/build_dogtag_pki $@
-
diff --git a/dogtag/kra-ui/dogtag-pki-kra-ui.spec b/dogtag/kra-ui/dogtag-pki-kra-ui.spec
deleted file mode 100644
index 274d1ec..0000000
--- a/dogtag/kra-ui/dogtag-pki-kra-ui.spec
+++ /dev/null
@@ -1,61 +0,0 @@
-Name:           dogtag-pki-kra-ui
-Version:        9.0.0
-Release:        1%{?dist}
-Summary:        Dogtag Certificate System - Data Recovery Authority User Interface
-URL:            http://pki.fedoraproject.org/
-License:        GPLv2
-Group:          System Environment/Base
-
-BuildArch:      noarch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  ant
-
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  Several PKI packages require a "virtual" UI component.  These
-#        "virtual" UI components are "Provided" by various UI "flavors"
-#        including "dogtag", "redhat", and "null".  Consequently,
-#        all "dogtag", "redhat", and "null" UI components MUST be
-#        mutually exclusive!
-Provides:       pki-kra-ui = %{version}-%{release}
-
-Obsoletes:      pki-kra-ui < %{version}-%{release}
-
-Conflicts:      redhat-pki-kra-ui
-
-%description
-Dogtag Certificate System is an enterprise software system designed
-to manage enterprise Public Key Infrastructure (PKI) deployments.
-
-The Dogtag Data Recovery Authority User Interface contains the graphical
-user interface for the Dogtag Data Recovery Manager.
-
-%prep
-
-%setup -q
-
-%build
-ant \
-    -Dproduct.ui.flavor.prefix="dogtag" \
-    -Dproduct.prefix="pki" \
-    -Dproduct="kra-ui" \
-    -Dversion="%{version}"
-
-%install
-rm -rf %{buildroot}
-cd dist/binary
-unzip %{name}-%{version}.zip -d %{buildroot}
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE
-%{_datadir}/pki/
-
-%changelog
-* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/dogtag/ocsp-ui/CMakeLists.txt b/dogtag/ocsp-ui/CMakeLists.txt
deleted file mode 100644
index 5a40de3..0000000
--- a/dogtag/ocsp-ui/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-project(ocsp-ui)
-
-install(
-    DIRECTORY
-        shared/
-    DESTINATION
-        ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}
-)
diff --git a/dogtag/ocsp-ui/LICENSE b/dogtag/ocsp-ui/LICENSE
deleted file mode 100644
index e281f43..0000000
--- a/dogtag/ocsp-ui/LICENSE
+++ /dev/null
@@ -1,291 +0,0 @@
-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
diff --git a/dogtag/ocsp-ui/build.xml b/dogtag/ocsp-ui/build.xml
deleted file mode 100644
index babdbca..0000000
--- a/dogtag/ocsp-ui/build.xml
+++ /dev/null
@@ -1,273 +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="ocsp-ui" default="main" basedir=".">
-
-    <import file="config/product.xml"/>
-    <import file="config/product-ext.xml" optional="true"/>
-
-
-    <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}"/>
-        <echo message="${empty.compile.java.log.message}"/>
-        <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}"/>
-        <echo message="${empty.build.jars.log.message}"/>
-        <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}"/>
-        <echo message="${empty.clean.javadocs.log.message}"/>
-        <echo message="${end.clean.javadocs.log.message}"/>
-    </target>
-
-
-    <target name="compose_javadocs"
-            depends="build"
-            description="--> generate javadocs">
-        <echo message="${begin.compose.javadocs.log.message}"/>
-        <echo message="${empty.compose.javadocs.log.message}"/>
-        <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}"/>
-
-        <echo message="${begin.binary.wrappers.log.message}"/>
-        <echo message="${empty.binary.wrappers.log.message}"/>
-        <echo message="${end.binary.wrappers.log.message}"/>
-
-        <echo message="${begin.binary.zip.log.message}"/>
-        <zip destfile="${dist.base.binaries}/${dist.name}.zip">
-            <zipfileset dir="./shared"
-                        filemode="644"
-                        prefix="usr/share/${product.prefix}/${product}">
-                <include name="**"/>
-            </zipfileset>
-            <zipfileset dir="."
-                        filemode="644"
-                        prefix="usr/share/doc/${dist.name}">
-                <include name="LICENSE"/>
-            </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="./shared"
-                        mode="644"
-                        prefix="${dist.name}/usr/share/${product.prefix}/${product}">
-                <include name="**"/>
-            </tarfileset>
-            <tarfileset dir="."
-                        mode="644"
-                        prefix="${dist.name}/usr/share/doc/${dist.name}">
-                <include name="LICENSE"/>
-            </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="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="shared/**"/>
-            </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="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="shared/**"/>
-            </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/dogtag/ocsp-ui/build_dogtag b/dogtag/ocsp-ui/build_dogtag
deleted file mode 100755
index 27066ed..0000000
--- a/dogtag/ocsp-ui/build_dogtag
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-# 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.
-#
-# (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-# Always switch into the base directory of this
-# shell script prior to executing it so that all
-# of its output is written to this directory
-cd `dirname $0`
-
-# Retrieve the directory name housing this component
-PWD=`pwd`
-
-# Set Dogtag component-specific environment variables
-DOGTAG_BUILD_SCRIPT=`basename $0`
-export DOGTAG_BUILD_SCRIPT
-DOGTAG_COMPONENT=`basename ${PWD}`
-export DOGTAG_COMPONENT
-DOGTAG_SPECFILE="dogtag-pki-ocsp-ui.spec"
-export DOGTAG_SPECFILE
-
-# Set PKI 'ant' environment variables (originally obtained from specfile)
-PKI_PRODUCT_UI_FLAVOR_PREFIX="dogtag"
-export PKI_PRODUCT_UI_FLAVOR_PREFIX
-PKI_PRODUCT_PREFIX="pki"
-export PKI_PRODUCT_PREFIX
-PKI_PRODUCT="ocsp-ui"
-export PKI_PRODUCT
-PKI_VERSION="9.0.0"
-export PKI_VERSION
-
-# Set Dogtag helper variables
-DOGTAG_COMPONENT_NAME=${PKI_PRODUCT}
-export DOGTAG_COMPONENT_NAME
-DOGTAG_WGET_URL=http://cvs.fedora.redhat.com/viewvc
-export DOGTAG_WGET_URL
-
-# Obtain '${DOGTAG_SPECFILE}' as necessary
-if [ "$1" = "refresh" ]; then
-	if [ -f "${DOGTAG_SPECFILE}" ]; then
-		printf "Removing '${DOGTAG_SPECFILE}' . . . "
-		rm -rf ${DOGTAG_SPECFILE}
-		printf "done.\n"
-	fi
-	shift
-fi
-if [ ! -f "${DOGTAG_SPECFILE}" ]; then
-	# Check for Fedora Operating System
-	if [ ! -f /etc/fedora-release ]; then
-		printf "'${DOGTAG_COMPONENT_NAME}' ONLY builds on Fedora!\n"
-		exit 255
-	fi
-	# Obtain Fedora Operating System Version
-	FEDORA_VERSION="F-`cat /etc/fedora-release | awk '{print $3}'`"
-	export FEDORA_VERSION
-	# Retrieve '${DOGTAG_SPECFILE}' from Koji
-	printf "Fetching '${DOGTAG_SPECFILE}' for '${FEDORA_VERSION}' . . .\n"
-	wget -O ${DOGTAG_SPECFILE} ${DOGTAG_WGET_URL}/${FEDORA_VERSION}/${DOGTAG_COMPONENT_NAME}/${DOGTAG_SPECFILE}?view=co
-	if [ ! -s "${DOGTAG_SPECFILE}" ]; then
-		printf "Failed to fetch '${DOGTAG_SPECFILE}' for '${FEDORA_VERSION}'!\n"
-		rm -rf ${DOGTAG_SPECFILE}
-		exit 255
-	fi
-fi
-
-# Invoke the shared Dogtag PKI build script
-config-ext/build_dogtag_pki $@
-
diff --git a/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec b/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
deleted file mode 100644
index 5ea4610..0000000
--- a/dogtag/ocsp-ui/dogtag-pki-ocsp-ui.spec
+++ /dev/null
@@ -1,62 +0,0 @@
-Name:           dogtag-pki-ocsp-ui
-Version:        9.0.0
-Release:        1%{?dist}
-Summary:        Dogtag Certificate System - Online Certificate Status Protocol User Interface
-URL:            http://pki.fedoraproject.org/
-License:        GPLv2
-Group:          System Environment/Base
-
-BuildArch:      noarch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  ant
-
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  Several PKI packages require a "virtual" UI component.  These
-#        "virtual" UI components are "Provided" by various UI "flavors"
-#        including "dogtag", "redhat", and "null".  Consequently,
-#        all "dogtag", "redhat", and "null" UI components MUST be
-#        mutually exclusive!
-Provides:       pki-ocsp-ui = %{version}-%{release}
-
-Obsoletes:      pki-ocsp-ui < %{version}-%{release}
-
-Conflicts:      redhat-pki-ocsp-ui
-
-%description
-Dogtag Certificate System is an enterprise software system designed
-to manage enterprise Public Key Infrastructure (PKI) deployments.
-
-The Dogtag Online Certificate Status Protocol User Interface contains the
-graphical user interface for the
-Dogtag Online Certificate Status Protocol Manager.
-
-%prep
-
-%setup -q
-
-%build
-ant \
-    -Dproduct.ui.flavor.prefix="dogtag" \
-    -Dproduct.prefix="pki" \
-    -Dproduct="ocsp-ui" \
-    -Dversion="%{version}"
-
-%install
-rm -rf %{buildroot}
-cd dist/binary
-unzip %{name}-%{version}.zip -d %{buildroot}
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE
-%{_datadir}/pki/
-
-%changelog
-* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/dogtag/ra-ui/CMakeLists.txt b/dogtag/ra-ui/CMakeLists.txt
deleted file mode 100644
index 3bdbb46..0000000
--- a/dogtag/ra-ui/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-project(ra-ui)
-
-install(
-    DIRECTORY
-        shared/
-    DESTINATION
-        ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}
-)
diff --git a/dogtag/ra-ui/LICENSE b/dogtag/ra-ui/LICENSE
deleted file mode 100644
index e281f43..0000000
--- a/dogtag/ra-ui/LICENSE
+++ /dev/null
@@ -1,291 +0,0 @@
-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
diff --git a/dogtag/ra-ui/build.xml b/dogtag/ra-ui/build.xml
deleted file mode 100644
index 512a622..0000000
--- a/dogtag/ra-ui/build.xml
+++ /dev/null
@@ -1,273 +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="ra-ui" default="main" basedir=".">
-
-    <import file="config/product.xml"/>
-    <import file="config/product-ext.xml" optional="true"/>
-
-
-    <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}"/>
-        <echo message="${empty.compile.java.log.message}"/>
-        <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}"/>
-        <echo message="${empty.build.jars.log.message}"/>
-        <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}"/>
-        <echo message="${empty.clean.javadocs.log.message}"/>
-        <echo message="${end.clean.javadocs.log.message}"/>
-    </target>
-
-
-    <target name="compose_javadocs"
-            depends="build"
-            description="--> generate javadocs">
-        <echo message="${begin.compose.javadocs.log.message}"/>
-        <echo message="${empty.compose.javadocs.log.message}"/>
-        <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}"/>
-
-        <echo message="${begin.binary.wrappers.log.message}"/>
-        <echo message="${empty.binary.wrappers.log.message}"/>
-        <echo message="${end.binary.wrappers.log.message}"/>
-
-        <echo message="${begin.binary.zip.log.message}"/>
-        <zip destfile="${dist.base.binaries}/${dist.name}.zip">
-            <zipfileset dir="./shared"
-                        filemode="644"
-                        prefix="usr/share/${product.prefix}/${product}">
-                <include name="**"/>
-            </zipfileset>
-            <zipfileset dir="."
-                        filemode="644"
-                        prefix="usr/share/doc/${dist.name}">
-                <include name="LICENSE"/>
-            </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="./shared"
-                        mode="644"
-                        prefix="${dist.name}/usr/share/${product.prefix}/${product}">
-                <include name="**"/>
-            </tarfileset>
-            <tarfileset dir="."
-                        mode="644"
-                        prefix="${dist.name}/usr/share/doc/${dist.name}">
-                <include name="LICENSE"/>
-            </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="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="shared/**"/>
-            </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="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="shared/**"/>
-            </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/dogtag/ra-ui/build_dogtag b/dogtag/ra-ui/build_dogtag
deleted file mode 100755
index f88e983..0000000
--- a/dogtag/ra-ui/build_dogtag
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-# 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.
-#
-# (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-# Always switch into the base directory of this
-# shell script prior to executing it so that all
-# of its output is written to this directory
-cd `dirname $0`
-
-# Retrieve the directory name housing this component
-PWD=`pwd`
-
-# Set Dogtag component-specific environment variables
-DOGTAG_BUILD_SCRIPT=`basename $0`
-export DOGTAG_BUILD_SCRIPT
-DOGTAG_COMPONENT=`basename ${PWD}`
-export DOGTAG_COMPONENT
-DOGTAG_SPECFILE="dogtag-pki-ra-ui.spec"
-export DOGTAG_SPECFILE
-
-# Set PKI 'ant' environment variables (originally obtained from specfile)
-PKI_PRODUCT_UI_FLAVOR_PREFIX="dogtag"
-export PKI_PRODUCT_UI_FLAVOR_PREFIX
-PKI_PRODUCT_PREFIX="pki"
-export PKI_PRODUCT_PREFIX
-PKI_PRODUCT="ra-ui"
-export PKI_PRODUCT
-PKI_VERSION="9.0.0"
-export PKI_VERSION
-
-# Set Dogtag helper variables
-DOGTAG_COMPONENT_NAME=${PKI_PRODUCT}
-export DOGTAG_COMPONENT_NAME
-DOGTAG_WGET_URL=http://cvs.fedora.redhat.com/viewvc
-export DOGTAG_WGET_URL
-
-# Obtain '${DOGTAG_SPECFILE}' as necessary
-if [ "$1" = "refresh" ]; then
-	if [ -f "${DOGTAG_SPECFILE}" ]; then
-		printf "Removing '${DOGTAG_SPECFILE}' . . . "
-		rm -rf ${DOGTAG_SPECFILE}
-		printf "done.\n"
-	fi
-	shift
-fi
-if [ ! -f "${DOGTAG_SPECFILE}" ]; then
-	# Check for Fedora Operating System
-	if [ ! -f /etc/fedora-release ]; then
-		printf "'${DOGTAG_COMPONENT_NAME}' ONLY builds on Fedora!\n"
-		exit 255
-	fi
-	# Obtain Fedora Operating System Version
-	FEDORA_VERSION="F-`cat /etc/fedora-release | awk '{print $3}'`"
-	export FEDORA_VERSION
-	# Retrieve '${DOGTAG_SPECFILE}' from Koji
-	printf "Fetching '${DOGTAG_SPECFILE}' for '${FEDORA_VERSION}' . . .\n"
-	wget -O ${DOGTAG_SPECFILE} ${DOGTAG_WGET_URL}/${FEDORA_VERSION}/${DOGTAG_COMPONENT_NAME}/${DOGTAG_SPECFILE}?view=co
-	if [ ! -s "${DOGTAG_SPECFILE}" ]; then
-		printf "Failed to fetch '${DOGTAG_SPECFILE}' for '${FEDORA_VERSION}'!\n"
-		rm -rf ${DOGTAG_SPECFILE}
-		exit 255
-	fi
-fi
-
-# Invoke the shared Dogtag PKI build script
-config-ext/build_dogtag_pki $@
-
diff --git a/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/dogtag/ra-ui/dogtag-pki-ra-ui.spec
deleted file mode 100644
index 32e9a72..0000000
--- a/dogtag/ra-ui/dogtag-pki-ra-ui.spec
+++ /dev/null
@@ -1,61 +0,0 @@
-Name:           dogtag-pki-ra-ui
-Version:        9.0.0
-Release:        1%{?dist}
-Summary:        Dogtag Certificate System - Registration Authority User Interface
-URL:            http://pki.fedoraproject.org/
-License:        GPLv2
-Group:          System Environment/Base
-
-BuildArch:      noarch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  ant
-
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  Several PKI packages require a "virtual" UI component.  These
-#        "virtual" UI components are "Provided" by various UI "flavors"
-#        including "dogtag", "redhat", and "null".  Consequently,
-#        all "dogtag", "redhat", and "null" UI components MUST be
-#        mutually exclusive!
-Provides:       pki-ra-ui = %{version}-%{release}
-
-Obsoletes:      pki-ra-ui < %{version}-%{release}
-
-Conflicts:      redhat-pki-ra-ui
-
-%description
-Dogtag Certificate System is an enterprise software system designed
-to manage enterprise Public Key Infrastructure (PKI) deployments.
-
-The Dogtag Registration Authority User Interface contains the graphical
-user interface for the Dogtag Registration Authority.
-
-%prep
-
-%setup -q
-
-%build
-ant \
-    -Dproduct.ui.flavor.prefix="dogtag" \
-    -Dproduct.prefix="pki" \
-    -Dproduct="ra-ui" \
-    -Dversion="%{version}"
-
-%install
-rm -rf %{buildroot}
-cd dist/binary
-unzip %{name}-%{version}.zip -d %{buildroot}
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE
-%{_datadir}/pki/
-
-%changelog
-* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/dogtag/tks-ui/CMakeLists.txt b/dogtag/tks-ui/CMakeLists.txt
deleted file mode 100644
index 31d58df..0000000
--- a/dogtag/tks-ui/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-project(tks-ui)
-
-install(
-    DIRECTORY
-        shared/
-    DESTINATION
-        ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}
-)
diff --git a/dogtag/tks-ui/LICENSE b/dogtag/tks-ui/LICENSE
deleted file mode 100644
index e281f43..0000000
--- a/dogtag/tks-ui/LICENSE
+++ /dev/null
@@ -1,291 +0,0 @@
-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
diff --git a/dogtag/tks-ui/build.xml b/dogtag/tks-ui/build.xml
deleted file mode 100644
index 26d16c6..0000000
--- a/dogtag/tks-ui/build.xml
+++ /dev/null
@@ -1,273 +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="tks-ui" default="main" basedir=".">
-
-    <import file="config/product.xml"/>
-    <import file="config/product-ext.xml" optional="true"/>
-
-
-    <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}"/>
-        <echo message="${empty.compile.java.log.message}"/>
-        <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}"/>
-        <echo message="${empty.build.jars.log.message}"/>
-        <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}"/>
-        <echo message="${empty.clean.javadocs.log.message}"/>
-        <echo message="${end.clean.javadocs.log.message}"/>
-    </target>
-
-
-    <target name="compose_javadocs"
-            depends="build"
-            description="--> generate javadocs">
-        <echo message="${begin.compose.javadocs.log.message}"/>
-        <echo message="${empty.compose.javadocs.log.message}"/>
-        <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}"/>
-
-        <echo message="${begin.binary.wrappers.log.message}"/>
-        <echo message="${empty.binary.wrappers.log.message}"/>
-        <echo message="${end.binary.wrappers.log.message}"/>
-
-        <echo message="${begin.binary.zip.log.message}"/>
-        <zip destfile="${dist.base.binaries}/${dist.name}.zip">
-            <zipfileset dir="./shared"
-                        filemode="644"
-                        prefix="usr/share/${product.prefix}/${product}">
-                <include name="**"/>
-            </zipfileset>
-            <zipfileset dir="."
-                        filemode="644"
-                        prefix="usr/share/doc/${dist.name}">
-                <include name="LICENSE"/>
-            </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="./shared"
-                        mode="644"
-                        prefix="${dist.name}/usr/share/${product.prefix}/${product}">
-                <include name="**"/>
-            </tarfileset>
-            <tarfileset dir="."
-                        mode="644"
-                        prefix="${dist.name}/usr/share/doc/${dist.name}">
-                <include name="LICENSE"/>
-            </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="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="shared/**"/>
-            </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="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="shared/**"/>
-            </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/dogtag/tks-ui/build_dogtag b/dogtag/tks-ui/build_dogtag
deleted file mode 100755
index e769ab5..0000000
--- a/dogtag/tks-ui/build_dogtag
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-# 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.
-#
-# (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-# Always switch into the base directory of this
-# shell script prior to executing it so that all
-# of its output is written to this directory
-cd `dirname $0`
-
-# Retrieve the directory name housing this component
-PWD=`pwd`
-
-# Set Dogtag component-specific environment variables
-DOGTAG_BUILD_SCRIPT=`basename $0`
-export DOGTAG_BUILD_SCRIPT
-DOGTAG_COMPONENT=`basename ${PWD}`
-export DOGTAG_COMPONENT
-DOGTAG_SPECFILE="dogtag-pki-tks-ui.spec"
-export DOGTAG_SPECFILE
-
-# Set PKI 'ant' environment variables (originally obtained from specfile)
-PKI_PRODUCT_UI_FLAVOR_PREFIX="dogtag"
-export PKI_PRODUCT_UI_FLAVOR_PREFIX
-PKI_PRODUCT_PREFIX="pki"
-export PKI_PRODUCT_PREFIX
-PKI_PRODUCT="tks-ui"
-export PKI_PRODUCT
-PKI_VERSION="9.0.0"
-export PKI_VERSION
-
-# Set Dogtag helper variables
-DOGTAG_COMPONENT_NAME=${PKI_PRODUCT}
-export DOGTAG_COMPONENT_NAME
-DOGTAG_WGET_URL=http://cvs.fedora.redhat.com/viewvc
-export DOGTAG_WGET_URL
-
-# Obtain '${DOGTAG_SPECFILE}' as necessary
-if [ "$1" = "refresh" ]; then
-	if [ -f "${DOGTAG_SPECFILE}" ]; then
-		printf "Removing '${DOGTAG_SPECFILE}' . . . "
-		rm -rf ${DOGTAG_SPECFILE}
-		printf "done.\n"
-	fi
-	shift
-fi
-if [ ! -f "${DOGTAG_SPECFILE}" ]; then
-	# Check for Fedora Operating System
-	if [ ! -f /etc/fedora-release ]; then
-		printf "'${DOGTAG_COMPONENT_NAME}' ONLY builds on Fedora!\n"
-		exit 255
-	fi
-	# Obtain Fedora Operating System Version
-	FEDORA_VERSION="F-`cat /etc/fedora-release | awk '{print $3}'`"
-	export FEDORA_VERSION
-	# Retrieve '${DOGTAG_SPECFILE}' from Koji
-	printf "Fetching '${DOGTAG_SPECFILE}' for '${FEDORA_VERSION}' . . .\n"
-	wget -O ${DOGTAG_SPECFILE} ${DOGTAG_WGET_URL}/${FEDORA_VERSION}/${DOGTAG_COMPONENT_NAME}/${DOGTAG_SPECFILE}?view=co
-	if [ ! -s "${DOGTAG_SPECFILE}" ]; then
-		printf "Failed to fetch '${DOGTAG_SPECFILE}' for '${FEDORA_VERSION}'!\n"
-		rm -rf ${DOGTAG_SPECFILE}
-		exit 255
-	fi
-fi
-
-# Invoke the shared Dogtag PKI build script
-config-ext/build_dogtag_pki $@
-
diff --git a/dogtag/tks-ui/dogtag-pki-tks-ui.spec b/dogtag/tks-ui/dogtag-pki-tks-ui.spec
deleted file mode 100644
index f51d903..0000000
--- a/dogtag/tks-ui/dogtag-pki-tks-ui.spec
+++ /dev/null
@@ -1,61 +0,0 @@
-Name:           dogtag-pki-tks-ui
-Version:        9.0.0
-Release:        1%{?dist}
-Summary:        Dogtag Certificate System - Token Key Service User Interface
-URL:            http://pki.fedoraproject.org/
-License:        GPLv2
-Group:          System Environment/Base
-
-BuildArch:      noarch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  ant
-
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  Several PKI packages require a "virtual" UI component.  These
-#        "virtual" UI components are "Provided" by various UI "flavors"
-#        including "dogtag", "redhat", and "null".  Consequently,
-#        all "dogtag", "redhat", and "null" UI components MUST be
-#        mutually exclusive!
-Provides:       pki-tks-ui = %{version}-%{release}
-
-Obsoletes:      pki-tks-ui < %{version}-%{release}
-
-Conflicts:      redhat-pki-tks-ui
-
-%description
-Dogtag Certificate System is an enterprise software system designed
-to manage enterprise Public Key Infrastructure (PKI) deployments.
-
-The Dogtag Token Key Service User Interface contains the graphical
-user interface for the Dogtag Token Key Service.
-
-%prep
-
-%setup -q
-
-%build
-ant \
-    -Dproduct.ui.flavor.prefix="dogtag" \
-    -Dproduct.prefix="pki" \
-    -Dproduct="tks-ui" \
-    -Dversion="%{version}"
-
-%install
-rm -rf %{buildroot}
-cd dist/binary
-unzip %{name}-%{version}.zip -d %{buildroot}
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE
-%{_datadir}/pki/
-
-%changelog
-* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
diff --git a/dogtag/tps-ui/CMakeLists.txt b/dogtag/tps-ui/CMakeLists.txt
deleted file mode 100644
index 1164a7c..0000000
--- a/dogtag/tps-ui/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-project(tps-ui)
-
-install(
-    DIRECTORY
-        shared/
-    DESTINATION
-        ${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}/${PROJECT_NAME}
-)
diff --git a/dogtag/tps-ui/LICENSE b/dogtag/tps-ui/LICENSE
deleted file mode 100644
index e281f43..0000000
--- a/dogtag/tps-ui/LICENSE
+++ /dev/null
@@ -1,291 +0,0 @@
-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
diff --git a/dogtag/tps-ui/build.xml b/dogtag/tps-ui/build.xml
deleted file mode 100644
index 2fc35e8..0000000
--- a/dogtag/tps-ui/build.xml
+++ /dev/null
@@ -1,285 +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="tps-ui" default="main" basedir=".">
-
-    <import file="config/product.xml"/>
-    <import file="config/product-ext.xml" optional="true"/>
-
-
-    <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}"/>
-        <echo message="${empty.compile.java.log.message}"/>
-        <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}"/>
-        <echo message="${empty.build.jars.log.message}"/>
-        <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}"/>
-        <echo message="${empty.clean.javadocs.log.message}"/>
-        <echo message="${end.clean.javadocs.log.message}"/>
-    </target>
-
-
-    <target name="compose_javadocs"
-            depends="build"
-            description="--> generate javadocs">
-        <echo message="${begin.compose.javadocs.log.message}"/>
-        <echo message="${empty.compose.javadocs.log.message}"/>
-        <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}"/>
-
-        <echo message="${begin.binary.wrappers.log.message}"/>
-        <echo message="${empty.binary.wrappers.log.message}"/>
-        <echo message="${end.binary.wrappers.log.message}"/>
-
-        <echo message="${begin.binary.zip.log.message}"/>
-        <zip destfile="${dist.base.binaries}/${dist.name}.zip">
-            <zipfileset dir="./shared"
-                        filemode="644"
-                        prefix="usr/share/${product.prefix}/${product}">
-                <include name="**"/>
-                <exclude name="cgi-bin/sow/cfg.pl"/>
-            </zipfileset>
-            <zipfileset dir="./shared"
-                        filemode="755"
-                        prefix="usr/share/${product.prefix}/${product}">
-                <include name="cgi-bin/sow/cfg.pl"/>
-            </zipfileset>
-            <zipfileset dir="."
-                        filemode="644"
-                        prefix="usr/share/doc/${dist.name}">
-                <include name="LICENSE"/>
-            </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="./shared"
-                        mode="644"
-                        prefix="${dist.name}/usr/share/${product.prefix}/${product}">
-                <include name="**"/>
-                <exclude name="cgi-bin/sow/cfg.pl"/>
-            </tarfileset>
-            <tarfileset dir="./shared"
-                        mode="755"
-                        prefix="${dist.name}/usr/share/${product.prefix}/${product}">
-                <include name="cgi-bin/sow/cfg.pl"/>
-            </tarfileset>
-            <tarfileset dir="."
-                        mode="644"
-                        prefix="${dist.name}/usr/share/doc/${dist.name}">
-                <include name="LICENSE"/>
-            </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="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="shared/**"/>
-            </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="LICENSE"/>
-                <include name="build.xml"/>
-                <include name="config/product*.xml"/>
-                <include name="config/release*.xml"/>
-                <include name="release"/>
-                <include name="shared/**"/>
-            </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/dogtag/tps-ui/build_dogtag b/dogtag/tps-ui/build_dogtag
deleted file mode 100755
index 0e2bf56..0000000
--- a/dogtag/tps-ui/build_dogtag
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-# 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.
-#
-# (C) 2007 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-
-# Always switch into the base directory of this
-# shell script prior to executing it so that all
-# of its output is written to this directory
-cd `dirname $0`
-
-# Retrieve the directory name housing this component
-PWD=`pwd`
-
-# Set Dogtag component-specific environment variables
-DOGTAG_BUILD_SCRIPT=`basename $0`
-export DOGTAG_BUILD_SCRIPT
-DOGTAG_COMPONENT=`basename ${PWD}`
-export DOGTAG_COMPONENT
-DOGTAG_SPECFILE="dogtag-pki-tps-ui.spec"
-export DOGTAG_SPECFILE
-
-# Set PKI 'ant' environment variables (originally obtained from specfile)
-PKI_PRODUCT_UI_FLAVOR_PREFIX="dogtag"
-export PKI_PRODUCT_UI_FLAVOR_PREFIX
-PKI_PRODUCT_PREFIX="pki"
-export PKI_PRODUCT_PREFIX
-PKI_PRODUCT="tps-ui"
-export PKI_PRODUCT
-PKI_VERSION="9.0.0"
-export PKI_VERSION
-
-# Set Dogtag helper variables
-DOGTAG_COMPONENT_NAME=${PKI_PRODUCT}
-export DOGTAG_COMPONENT_NAME
-DOGTAG_WGET_URL=http://cvs.fedora.redhat.com/viewvc
-export DOGTAG_WGET_URL
-
-# Obtain '${DOGTAG_SPECFILE}' as necessary
-if [ "$1" = "refresh" ]; then
-	if [ -f "${DOGTAG_SPECFILE}" ]; then
-		printf "Removing '${DOGTAG_SPECFILE}' . . . "
-		rm -rf ${DOGTAG_SPECFILE}
-		printf "done.\n"
-	fi
-	shift
-fi
-if [ ! -f "${DOGTAG_SPECFILE}" ]; then
-	# Check for Fedora Operating System
-	if [ ! -f /etc/fedora-release ]; then
-		printf "'${DOGTAG_COMPONENT_NAME}' ONLY builds on Fedora!\n"
-		exit 255
-	fi
-	# Obtain Fedora Operating System Version
-	FEDORA_VERSION="F-`cat /etc/fedora-release | awk '{print $3}'`"
-	export FEDORA_VERSION
-	# Retrieve '${DOGTAG_SPECFILE}' from Koji
-	printf "Fetching '${DOGTAG_SPECFILE}' for '${FEDORA_VERSION}' . . .\n"
-	wget -O ${DOGTAG_SPECFILE} ${DOGTAG_WGET_URL}/${FEDORA_VERSION}/${DOGTAG_COMPONENT_NAME}/${DOGTAG_SPECFILE}?view=co
-	if [ ! -s "${DOGTAG_SPECFILE}" ]; then
-		printf "Failed to fetch '${DOGTAG_SPECFILE}' for '${FEDORA_VERSION}'!\n"
-		rm -rf ${DOGTAG_SPECFILE}
-		exit 255
-	fi
-fi
-
-# Invoke the shared Dogtag PKI build script
-config-ext/build_dogtag_pki $@
-
diff --git a/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/dogtag/tps-ui/dogtag-pki-tps-ui.spec
deleted file mode 100644
index 414967e..0000000
--- a/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ /dev/null
@@ -1,65 +0,0 @@
-Name:           dogtag-pki-tps-ui
-Version:        9.0.0
-Release:        2%{?dist}
-Summary:        Dogtag Certificate System - Token Processing System User Interface
-URL:            http://pki.fedoraproject.org/
-License:        GPLv2 and LGPLv2
-Group:          System Environment/Base
-
-BuildArch:      noarch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  ant
-
-Source0:        http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
-
-# NOTE:  Several PKI packages require a "virtual" UI component.  These
-#        "virtual" UI components are "Provided" by various UI "flavors"
-#        including "dogtag", "redhat", and "null".  Consequently,
-#        all "dogtag", "redhat", and "null" UI components MUST be
-#        mutually exclusive!
-Provides:       pki-tps-ui =  %{version}-%{release}
-
-Obsoletes:      pki-tps-ui <  %{version}-%{release}
-
-Conflicts:      redhat-pki-tps-ui
-
-%description
-Dogtag Certificate System is an enterprise software system designed
-to manage enterprise Public Key Infrastructure (PKI) deployments.
-
-The Dogtag Token Processing System User Interface contains the graphical
-user interface for the Dogtag Token Processing System.
-
-%prep
-
-%setup -q
-
-%build
-ant \
-    -Dproduct.ui.flavor.prefix="dogtag" \
-    -Dproduct.prefix="pki" \
-    -Dproduct="tps-ui" \
-    -Dversion="%{version}"
-
-%install
-rm -rf %{buildroot}
-cd dist/binary
-unzip %{name}-%{version}.zip -d %{buildroot}
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%doc LICENSE
-%{_datadir}/pki/
-
-%changelog
-* Fri Feb 4 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-2
-- Bugzilla Bug 606944- Use openldap instead of mozldap
-
-* Fri Nov 19 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
-- Updated Dogtag 1.3.x --> Dogtag 2.0.0 --> Dogtag 9.0.0.
-
diff --git a/scripts/compose_dogtag_pki_theme_packages b/scripts/compose_dogtag_pki_theme_packages
index 57a9e72..0a736b7 100755
--- a/scripts/compose_dogtag_pki_theme_packages
+++ b/scripts/compose_dogtag_pki_theme_packages
@@ -39,7 +39,7 @@ DOGTAG_PKI_THEME_VERSION="10.2.0"
 ##
 
 PKI_SPECS_FILE="${PKI_DIR}/specs/${DOGTAG_PKI_THEME}.spec"
-PKI_COMPONENT_LIST="test common-ui ra-ui tps-ui console-ui"
+PKI_COMPONENT_LIST="common-ui console-ui"
 
 
 ##
diff --git a/scripts/compose_ipa_pki_theme_packages b/scripts/compose_ipa_pki_theme_packages
deleted file mode 100755
index 1742e45..0000000
--- a/scripts/compose_ipa_pki_theme_packages
+++ /dev/null
@@ -1,222 +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 'ipa-pki' name and version information
-##
-
-IPA_PKI_THEME="ipa-pki-theme"
-IPA_PKI_THEME_VERSION="10.2.0"
-
-
-##
-## Establish the SOURCE files/directories of the 'ipa-pki' source directory
-##
-
-PKI_SPECS_FILE="${PKI_DIR}/specs/${IPA_PKI_THEME}.spec"
-PKI_COMPONENT_LIST="common-ui ca-ui"
-
-
-##
-## Establish the TARGET files/directories of the 'ipa-pki' source/spec files
-##
-
-if [ $WORK_DIR ]; then
-    PKI_PACKAGES="`cd $WORK_DIR ; pwd`"
-else
-    PKI_PACKAGES="${PKI_PWD}/packages"
-fi
-
-IPA_PKI_THEME_BUILD_DIR="${PKI_PACKAGES}/BUILD"
-IPA_PKI_THEME_RPMS_DIR="${PKI_PACKAGES}/RPMS"
-IPA_PKI_THEME_SOURCES_DIR="${PKI_PACKAGES}/SOURCES"
-IPA_PKI_THEME_SPECS_DIR="${PKI_PACKAGES}/SPECS"
-IPA_PKI_THEME_SRPMS_DIR="${PKI_PACKAGES}/SRPMS"
-
-IPA_PKI_THEME_TARBALL="${IPA_PKI_THEME}-${IPA_PKI_THEME_VERSION}.tar.gz"
-IPA_PKI_THEME_SPEC_FILE="${IPA_PKI_THEME_SPECS_DIR}/${IPA_PKI_THEME}.spec"
-IPA_PKI_THEME_PACKAGE_SCRIPT="${PKI_PACKAGES}/package_${IPA_PKI_THEME}"
-IPA_PKI_THEME_PACKAGE_COMMAND="${RPMBUILD_CMD} SPECS/${IPA_PKI_THEME}.spec"
-
-IPA_PKI_THEME_STAGING_DIR="${PKI_PACKAGES}/staging"
-IPA_PKI_THEME_DIR="${IPA_PKI_THEME_STAGING_DIR}/${IPA_PKI_THEME}-${IPA_PKI_THEME_VERSION}"
-IPA_PKI_THEME_DOGTAG_DIR="${IPA_PKI_THEME_DIR}/dogtag"
-IPA_PKI_THEME_DOGTAG_SUBDIR="${IPA_PKI_THEME}-${IPA_PKI_THEME_VERSION}/dogtag"
-
-
-##
-## Always create a top-level 'packages' directory
-##
-
-mkdir -p ${PKI_PACKAGES}
-
-
-##
-## Always create 'ipa-pki' package directories
-##
-
-mkdir -p ${IPA_PKI_THEME_BUILD_DIR}
-mkdir -p ${IPA_PKI_THEME_RPMS_DIR}
-mkdir -p ${IPA_PKI_THEME_SOURCES_DIR}
-mkdir -p ${IPA_PKI_THEME_SPECS_DIR}
-mkdir -p ${IPA_PKI_THEME_SRPMS_DIR}
-
-
-##
-## Always start with new 'ipa-pki' package files
-##
-
-rm -rf ${IPA_PKI_THEME_BUILD_DIR}/${IPA_PKI_THEME}-${IPA_PKI_THEME_VERSION}
-rm -f  ${IPA_PKI_THEME_RPMS_DIR}/${IPA_PKI_THEME}-${IPA_PKI_THEME_VERSION}*.rpm
-rm -f  ${IPA_PKI_THEME_SOURCES_DIR}/${IPA_PKI_THEME_TARBALL}
-rm -f  ${IPA_PKI_THEME_SPEC_FILE}
-rm -f  ${IPA_PKI_THEME_SRPMS_DIR}/${IPA_PKI_THEME}-${IPA_PKI_THEME_VERSION}*.rpm
-
-
-##
-## Copy a new 'ipa-pki' spec file from the
-## current contents of the PKI working repository
-##
-
-cp -p ${PKI_SPECS_FILE} ${IPA_PKI_THEME_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} ${IPA_PKI_THEME_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} ${IPA_PKI_THEME_SOURCES_DIR}
-else
-	##
-	## Always start with a new 'ipa-pki' staging directory
-	##
-
-	rm -rf ${IPA_PKI_THEME_STAGING_DIR}
-
-
-	##
-	## To generate the 'ipa-pki' tarball, construct a staging area
-	## consisting of the 'ipa-pki' source components from the
-	## current contents of the PKI working repository
-	##
-
-	mkdir -p ${IPA_PKI_THEME_DIR}
-	cd ${PKI_DIR}
-	for file in "${PKI_FILE_LIST}" ;
-	do
-		cp -p ${file} ${IPA_PKI_THEME_DIR}
-	done
-	find ${PKI_CMAKE_DIR}             \
-		-name .svn -prune -o          \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${IPA_PKI_THEME_DIR} > /dev/null 2>&1
-	cd - > /dev/null 2>&1
-
-	mkdir -p ${IPA_PKI_THEME_DOGTAG_DIR}
-	cd ${PKI_DOGTAG_DIR}
-	cp -p ${PKI_DOGTAG_MANIFEST} ${IPA_PKI_THEME_DOGTAG_DIR}
-	for component in "${PKI_COMPONENT_LIST}" ;
-	do
-		find ${component}             \
-		-name .svn -prune -o          \
-		-name *.spec -prune -o        \
-		-name *.swp -prune -o         \
-		-print | cpio -pdum ${IPA_PKI_THEME_DOGTAG_DIR} > /dev/null 2>&1
-	done
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Create the 'ipa-pki' tarball
-	##
-
-	mkdir -p ${IPA_PKI_THEME_SOURCES_DIR}
-	cd ${IPA_PKI_THEME_STAGING_DIR}
-	# Remove all '*.htm*' web pages and 'Dogtag-specific' graphics
-	# Map 'Dogtag' color '#225580' to black
-	# Map 'Dogtag' color '#4f52b5' to black
-	# Map 'DCS'    text to 'XXX'
-	# Map 'dogtag' text to 'XXXXXX'
-	# Map 'Dogtag' text to 'XXXXXX'
-	# Map 'DOGTAG' text to 'XXXXXX'
-	# Map 'Fedora' text to 'XXXXXX'
-	# Map 'FEDORA' text to 'XXXXXX'
-	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -name "favicon.ico"     -print -or \
-	                                    -name "*.htm"           -print -or \
-	                                    -name "*.html"          -print -or \
-	                                    -name "logo_header.gif" -print | xargs rm        ;
-	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/#225580/#000000/g' {} \; ;
-	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/#4f52b5/#000000/g' {} \; ;
-	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/DCS/XXX/g'         {} \; ;
-	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/dogtag/XXXXXX/g'   {} \; ;
-	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/Dogtag/XXXXXX/g'   {} \; ;
-	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/DOGTAG/XXXXXX/g'   {} \; ;
-	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/Fedora/XXXXXX/g'   {} \; ;
-	find ${IPA_PKI_THEME_DOGTAG_SUBDIR} -type f -exec sed -i 's/FEDORA/XXXXXX/g'   {} \;
-	gtar -zcvf ${IPA_PKI_THEME_TARBALL}    \
-		"${IPA_PKI_THEME}-${IPA_PKI_THEME_VERSION}" > /dev/null 2>&1
-	mv ${IPA_PKI_THEME_TARBALL} ${IPA_PKI_THEME_SOURCES_DIR}
-	cd - > /dev/null 2>&1
-
-
-	##
-	## Always remove the PKI staging area
-	##
-
-	rm -rf ${IPA_PKI_THEME_STAGING_DIR}
-fi
-
-
-##
-## Always generate a fresh 'ipa-pki' package script
-##
-
-rm -rf ${IPA_PKI_THEME_PACKAGE_SCRIPT}
-printf "#!/bin/bash\n\n"                >  ${IPA_PKI_THEME_PACKAGE_SCRIPT}
-printf "${IPA_PKI_THEME_PACKAGE_COMMAND}\n\n" >> ${IPA_PKI_THEME_PACKAGE_SCRIPT}
-chmod 775 ${IPA_PKI_THEME_PACKAGE_SCRIPT}
-
-
-##
-## Automatically invoke RPM/SRPM creation
-##
-
-cd ${PKI_PACKAGES} ;
-bash ./package_${IPA_PKI_THEME} | tee package_${IPA_PKI_THEME}.log 2>&1
-
diff --git a/scripts/create_pki_yum_repos b/scripts/create_pki_yum_repos
index b900e18..ff09ac5 100755
--- a/scripts/create_pki_yum_repos
+++ b/scripts/create_pki_yum_repos
@@ -17,7 +17,7 @@ cd `dirname $0`/../..
 PKI_PWD=`pwd`
 
 # Establish a list of 'packages' directories
-PKI_PACKAGE_DIRS_LIST="packages packages.dogtag_theme packages.ipa_theme packages.core packages.kra packages.ocsp packages.ra packages.tks packages.tps packages.console"
+PKI_PACKAGE_DIRS_LIST="packages packages.dogtag_theme packages.core packages.kra packages.ocsp packages.ra packages.tks packages.tps packages.console"
 
 # This script is only executable from the directory
 # containing at the "./pki" directory!
diff --git a/scripts/pki_patch_maker b/scripts/pki_patch_maker
index 6983410..dcd5b5e 100755
--- a/scripts/pki_patch_maker
+++ b/scripts/pki_patch_maker
@@ -21,13 +21,12 @@ Usage()
 	printf "            <startrev> is the starting SVN revision\n\n"
 	printf "            <endrev> is the ending SVN revision\n\n"
 	printf "            <srpm> is one of the following:\n\n"
-	printf "                 ipa-pki-theme\n"
 	printf "                 pki-core\n\n"
 	printf "            <basever> is the version of the specified <srpm>\n"
 	printf "\n"
 	printf "IMPORTANT:  Successful use of this script relies upon separation\n"
-	printf "            of 'pki-core' and 'ipa-pki-theme' check-ins.  All\n"
-	printf "            patch files automatically produced by this script\n"
+	printf "            of 'pki-core' check-ins.  All patch files\n"
+	printf "            automatically produced by this script\n"
 	printf "            should be applied and tested thoroughly before\n"
 	printf "            being accepted as proper patches.\n\n"
 }
@@ -36,7 +35,6 @@ 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/symkey base/util"
 
 
@@ -57,8 +55,6 @@ basever=$4
 
 if [ ${srpm} == "pki-core" ]; then
     source=${PKI_CORE}
-elif [ ${srpm} == "ipa-pki-theme" ]; then
-    source=${IPA_PKI_THEME}
 else
     printf "ERROR:  Invalid <srpm> specified!\n"
 	Usage
diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
index 0b4171f..e625b1c 100644
--- a/specs/dogtag-pki-theme.spec
+++ b/specs/dogtag-pki-theme.spec
@@ -1,6 +1,6 @@
 Name:             dogtag-pki-theme
 Version:          10.2.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          Certificate System - Dogtag PKI Theme Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -21,27 +21,11 @@ ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
 %endif
 
 %global overview                                                       \
-Several PKI packages require a "virtual" theme component.  These       \
+Several PKI packages utilize a "virtual" theme component.  These       \
 "virtual" theme components are "Provided" by various theme "flavors"   \
-including "dogtag", "redhat", and "ipa".  Consequently,                \
-all "dogtag", "redhat", and "ipa" theme components MUST be             \
-mutually exclusive!                                                    \
-                                                                       \
-On Fedora systems, the "dogtag" theme packages are the ONLY available  \
-theme components.                                                      \
-                                                                       \
-Similarly, the "ipa" theme packages are ONLY available on RHEL         \
-systems, and represent the default theme components.                   \
-                                                                       \
-Alternatively, on RHEL systems, if the "dogtag" theme packages are     \
-available as EPEL packages, while they may be used as a transparent    \
-replacement for their corresponding "ipa" theme package, they are not  \
-intended to be used as a replacement for their corresponding "redhat"  \
-theme components.                                                      \
-                                                                       \
-Finally, if available for a RHEL system (e. g. - RHCS subscription),   \
-each "redhat" theme package MUST be used as a transparent replacement  \
-for its corresponding "ipa" theme package or "dogtag" theme package.   \
+including "dogtag" or a user customized theme package.  Consequently,  \
+all "dogtag" and any customized theme components MUST be mutually      \
+exclusive!                                                             \
 %{nil}
 
 %description %{overview}
@@ -51,36 +35,6 @@ for its corresponding "ipa" theme package or "dogtag" theme package.   \
 Summary:          Certificate System - PKI Server Framework User Interface
 Group:            System Environment/Base
 
-%if 0%{?rhel}
-# EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
-Conflicts:        redhat-pki-server-theme
-Conflicts:        redhat-pki-common-theme
-Conflicts:        redhat-pki-common-ui
-Conflicts:        redhat-pki-ca-theme
-Conflicts:        redhat-pki-ca-ui
-Conflicts:        redhat-pki-kra-theme
-Conflicts:        redhat-pki-kra-ui
-Conflicts:        redhat-pki-ocsp-theme
-Conflicts:        redhat-pki-ocsp-ui
-Conflicts:        redhat-pki-tks-theme
-Conflicts:        redhat-pki-tks-ui
-Conflicts:        redhat-pki-ra-theme
-Conflicts:        redhat-pki-ra-ui
-Conflicts:        redhat-pki-tps-theme
-Conflicts:        redhat-pki-tps-ui
-
-# EPEL version of Dogtag "theme" ALWAYS replaces ALL versions of IPA "theme"
-Obsoletes:        ipa-pki-server-theme <= 9999
-Obsoletes:        ipa-pki-common-theme <= 9999
-Obsoletes:        ipa-pki-ca-theme <= 9999
-Obsoletes:        ipa-pki-kra-theme <= 9999
-
-Provides:         ipa-pki-server-theme = %{version}-%{release}
-Provides:         ipa-pki-common-theme = %{version}-%{release}
-Provides:         ipa-pki-ca-theme = %{version}-%{release}
-Provides:         ipa-pki-kra-theme = %{version}-%{release}
-%endif
-
 Obsoletes:        dogtag-pki-common-theme <= %{version}-%{release}
 Obsoletes:        dogtag-pki-common-ui
 Obsoletes:        dogtag-pki-ca-theme <= %{version}-%{release}
@@ -117,10 +71,6 @@ Provides:         dogtag-pki-tks-theme = %{version}-%{release}
 Provides:         pki-tks-theme = %{version}-%{release}
 Provides:         pki-tks-ui = %{version}-%{release}
 
-Provides:         dogtag-pki-ra-theme = %{version}-%{release}
-Provides:         pki-ra-theme = %{version}-%{release}
-Provides:         pki-ra-ui = %{version}-%{release}
-
 Provides:         dogtag-pki-tps-theme = %{version}-%{release}
 Provides:         pki-tps-theme = %{version}-%{release}
 Provides:         pki-tps-ui = %{version}-%{release}
@@ -213,6 +163,12 @@ cd build
 
 
 %changelog
+* Tue Sep  9 2014 Matthew Harmsen <mharmsen@redhat.com> 10.2.0-2
+- PKI TRAC Ticket #1136 - Remove ipa-pki-theme component
+- Remove 'ca-ui', 'kra-ui', 'ocsp-ui', 'ra-ui', 'tks-ui', and 'tps-ui'
+  directories
+- Consolidate 'pki-core' packages
+
 * Wed Sep  3 2014 Dogtag Team <pki-devel@redhat.com> 10.2.0-1
 - Update release number for release build
 
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index 38a2a99..5e40c03 100644
--- a/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
@@ -1,7 +1,7 @@
 Summary:          Dogtag Public Key Infrastructure (PKI) Suite
 Name:             dogtag-pki
 Version:          10.2.0
-Release:          2%{?dist}
+Release:          3%{?dist}
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
 URL:              http://pki.fedoraproject.org/
@@ -17,14 +17,11 @@ ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
 %define esc_version                1.1.0
 %define jss_version                4.2.6-31
 %define pki_core_version           10.2.0
-%define pki_kra_version            10.2.0
-%define pki_ocsp_version           10.2.0
-%define pki_tks_version            10.2.0
-%define pki_tps_version            10.2.0
 %define pki_console_version        10.2.0
 %define tomcatjss_version          7.1.0
 
 Requires:         apache-commons-codec
+Requires:         selinux-policy-base >= 3.11.1-43
 
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL top-level Dogtag PKI support packages
@@ -43,25 +40,20 @@ Requires:         dogtag-pki-console-theme >= %{dogtag_pki_theme_version}
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL Dogtag PKI core packages
 Requires:         pki-ca >= %{pki_core_version}
+Requires:         pki-kra >= %{pki_core_version}
+Requires:         pki-ocsp >= %{pki_core_version}
+Requires:         pki-tks >= %{pki_core_version}
+Requires:         pki-tps >= %{pki_core_version}
 Requires:         pki-server >= %{pki_core_version}
 Requires:         pki-tools >= %{pki_core_version}
 Requires:         pki-symkey >= %{pki_core_version}
 Requires:         pki-base >= %{pki_core_version}
 
-Requires:         selinux-policy-base >= 3.11.1-43
-
 # Make certain that this 'meta' package requires the latest version(s)
 # of ALL Dogtag PKI core javadocs
 Requires:         pki-javadoc >= %{pki_core_version}
 
 # Make certain that this 'meta' package requires the latest version(s)
-# of ALL other Dogtag PKI subsystems
-Requires:         pki-kra >= %{pki_kra_version}
-Requires:         pki-ocsp >= %{pki_ocsp_version}
-Requires:         pki-tks >= %{pki_tks_version}
-Requires:         pki-tps >= %{pki_tps_version}
-
-# Make certain that this 'meta' package requires the latest version(s)
 # of Dogtag PKI console
 Requires:         pki-console >= %{pki_console_version}
 
@@ -69,17 +61,6 @@ Requires:         pki-console >= %{pki_console_version}
 # of ALL Dogtag PKI clients
 Requires:         esc >= %{esc_version}
 
-# NOTE:  As a convenience for standalone deployments, this 'dogtag-pki'
-#        top-level meta package supplies Dogtag themes for use by the
-#        certificate server packages:
-#
-#          * dogtag-pki-theme (Dogtag Certificate System deployments)
-#            * dogtag-pki-server-theme
-#            * dogtag-pki-console-theme
-#
-Obsoletes:        ipa-pki
-Conflicts:        redhat-pki
-
 %description
 The Dogtag Public Key Infrastructure (PKI) Suite is comprised of the following
 five subsystems and a client (for use by a Token Management System):
@@ -103,6 +84,14 @@ To meet the database storage requirements of each CA, DRM, OCSP, TKS, or TPS
 instance, a 389 Directory Server must be up and running either locally on
 this machine, or remotely over the attached network connection.
 
+NOTE:  As a convenience for standalone deployments, this 'dogtag-pki'
+       top-level meta package supplies Dogtag themes for use by the
+       certificate server packages:
+
+         * dogtag-pki-theme (Dogtag Certificate System deployments)
+           * dogtag-pki-server-theme
+           * dogtag-pki-console-theme
+
 %prep
 cat > README <<EOF
 This package is just a "meta-package" whose dependencies pull in all of the
@@ -117,6 +106,12 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Tue Sep  9 2014 Matthew Harmsen <mharmsen@redhat.com> 10.2.0-3
+- PKI TRAC Ticket #1136 - Remove ipa-pki-theme component
+- Remove 'ca-ui', 'kra-ui', 'ocsp-ui', 'ra-ui', 'tks-ui', and 'tps-ui'
+  directories
+- Consolidate 'pki-core' packages
+
 * Sun Sep  7 2014 Dogtag Team <pki-devel@redhat.com> 10.2.0-2
 - Updated release number for release build
 - Revised dependencies
diff --git a/specs/ipa-pki-theme.spec b/specs/ipa-pki-theme.spec
deleted file mode 100644
index 5065d26..0000000
--- a/specs/ipa-pki-theme.spec
+++ /dev/null
@@ -1,203 +0,0 @@
-Name:             ipa-pki-theme
-Version:          10.2.0
-Release:          0.1%{?dist}
-Summary:          Certificate System - IPA PKI Theme Components
-URL:              http://pki.fedoraproject.org/
-License:          GPLv2
-Group:            System Environment/Base
-
-BuildArch:        noarch
-
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:    cmake
-
-Source0:          http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}%{?prerel}.tar.gz
-
-%if 0%{?rhel}
-ExcludeArch:      ppc ppc64 ppcle ppc64le s390 s390x
-%endif
-
-%global overview                                                       \
-Several PKI packages require a "virtual" theme component.  These       \
-"virtual" theme components are "Provided" by various theme "flavors"   \
-including "dogtag", "redhat", and "ipa".  Consequently,                \
-all "dogtag", "redhat", and "ipa" theme components MUST be             \
-mutually exclusive!                                                    \
-                                                                       \
-On Fedora systems, the "dogtag" theme packages are the ONLY available  \
-theme components.                                                      \
-                                                                       \
-Similarly, the "ipa" theme packages are ONLY available on RHEL         \
-systems, and represent the default theme components.                   \
-                                                                       \
-Alternatively, on RHEL systems, if the "dogtag" theme packages are     \
-available as EPEL packages, while they may be used as a transparent    \
-replacement for their corresponding "ipa" theme package, they are not  \
-intended to be used as a replacement for their corresponding "redhat"  \
-theme components.                                                      \
-                                                                       \
-Finally, if available for a RHEL system (e. g. - RHCS subscription),   \
-each "redhat" theme package MUST be used as a transparent replacement  \
-for its corresponding "ipa" theme package or "dogtag" theme package.   \
-%{nil}
-
-%description %{overview}
-
-
-%package -n       ipa-pki-server-theme
-Summary:          Certificate System - PKI Server Framework User Interface
-Group:            System Environment/Base
-
-Conflicts:        dogtag-pki-server-theme
-Conflicts:        dogtag-pki-common-theme
-Conflicts:        dogtag-pki-common-ui
-Conflicts:        dogtag-pki-ca-theme
-Conflicts:        dogtag-pki-ca-ui
-
-Conflicts:        redhat-pki-server-theme
-Conflicts:        redhat-pki-common-theme
-Conflicts:        redhat-pki-common-ui
-Conflicts:        redhat-pki-ca-theme
-Conflicts:        redhat-pki-ca-ui
-
-Obsoletes:        ipa-pki-common-theme
-Obsoletes:        ipa-pki-common-ui
-Obsoletes:        ipa-pki-ca-theme
-
-Provides:         pki-server-theme = %{version}-%{release}
-Provides:         pki-common-theme = %{version}-%{release}
-Provides:         pki-common-ui = %{version}-%{release}
-
-Provides:         ipa-pki-ca-theme = %{version}-%{release}
-Provides:         pki-ca-theme = %{version}-%{release}
-Provides:         pki-ca-ui = %{version}-%{release}
-
-%description -n   ipa-pki-server-theme
-This PKI Server Framework User Interface contains
-NO textual or graphical user interface for the PKI Server Framework.
-
-This package is used by the Certificate System utilized by IPA.
-
-%{overview}
-
-
-%prep
-
-
-%setup -q -n %{name}-%{version}%{?prerel}
-
-
-%clean
-%{__rm} -rf %{buildroot}
-
-
-%build
-%{__mkdir_p} build
-cd build
-%cmake -DVERSION=%{version}-%{release} \
-	-DBUILD_IPA_PKI_THEME:BOOL=ON \
-	..
-%{__make} VERBOSE=1 %{?_smp_mflags}
-
-
-%install
-%{__rm} -rf %{buildroot}
-cd build
-%{__make} install DESTDIR=%{buildroot} INSTALL="install -p"
-
-
-%files -n ipa-pki-server-theme
-%defattr(-,root,root,-)
-%doc dogtag/common-ui/LICENSE
-%dir %{_datadir}/pki
-%{_datadir}/pki/common-ui/
-
-
-%changelog
-* Fri Nov 22 2013 Dogtag Team <pki-devel@redhat.com> 10.2.0-0.1
-- Updated version number to 10.2.0-0.1.
-
-* Fri Nov 15 2013 Ade Lee <alee@redhat.com> 10.1.0-1
-- Trac Ticket 788 - Clean up spec files
-- Update release number for release build
-
-* Tue May 7 2013 Ade Lee <alee@redhat.com> 10.1.0-0.1
-- Change release number for 10.1 development
-
-* Fri Apr 26 2013 Ade Lee <alee@redhat.com> 10.0.2-1
-- Change release number for official release.
-
-* Wed Mar 27 2013 Endi S. Dewata <edewata@redhat.com> 10.0.2-0.1
-- Updated version number to 10.0.2-0.1.
-
-* Fri Dec 7 2012 Ade Lee <alee@redhat.com> 10.0.0-1
-- Update to official release for rc1
-
-* Mon Nov 12 2012 Ade Lee <alee@redhat.com> 10.0.0-0.6.b3
-- Update release to b3
-
-* Fri Nov 9 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.5.b2
-- Removed IPA CA theme package.
-
-* Thu Nov 8 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.4.b2
-- Renamed ipa-pki-common-theme to ipa-pki-server-theme.
-
-* Mon Oct 29 2012 Ade Lee <alee@redhat.com> 10.0.0-0.3.b2
-- Update release to b2
-
-* Mon Oct 8 2012 Ade Lee <alee@redhat.com> 10.0.0-0.2.b1
-- Update release to b1
-
-* Mon Oct 1 2012 Ade Lee <alee@redhat.com> 10.0.0-0.2.a2
-- Update release to a2
-
-* Sun Sep 30 2012 Endi S. Dewata <edewata@redhat.com> 10.0.0-0.2.a1
-- Modified CMake to use RPM version number
-
-* Wed Feb  1 2012 Nathan Kinder <nkinder@redhat.com> 10.0.0-0.1.a1
-- Updated package version number
-
-* Tue Aug 23 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.5-1
-- 'ipa-pki-ca-theme'
--      Bugzilla Bug #695015 - Serial No. of a revoked certificate is not
-       populated in the CA signedAudit messages (alee)
--      Bugzilla Bug #694143 - CA Agent not returning specified request (awnuk)
--      Bugzilla Bug #704351 - remove help buttons in agent and ee UI in all
-       subsystems (alee)
--      Bugzilla Bug #712931 - CS requires too many ports
-       to be open in the FW (alee)
-- 'ipa-pki-common-theme'
-
-* Thu Jul 14 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.4-1
-- 'ipa-pki-ca-theme'
--      Bugzilla Bug #669226 - Remove Legacy Build System
-- 'ipa-pki-common-theme'
--      Bugzilla Bug #669226 - Remove Legacy Build System
-
-* Thu Jan 20 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.3-1
-- Augmented overview description.
-- 'ipa-pki-ca-theme'
--     Bugzilla Bug #564207 - Searches for completed requests in the agent
-      interface returns zero entries
-
-* Thu Jan 20 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.2-1
-- 'ipa-pki-common-theme'
--     Bugzilla Bug #671058 - ipa2 - ipa-server-install fails on pkisilent -
-      xml parsing string -- ?
-
-* Tue Jan 18 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.1-1
-- Made 'ipa-pki-common-theme' a runtime dependency of 'ipa-pki-ca-theme'
-- https://pkgdb.lab.eng.bos.redhat.com/pkg/packages/srpm/5936/
--   Package Wrangler:  applied GPLv2 license header to 'xml.vm'
-
-* Thu Jan 13 2011 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-2
-- Bugzilla Bug #668836 - Review Request: ipa-pki-theme
--   Modified overview to pertain more to these packages
--   Removed "Obsoletes:" lines (only pertinent to internal deployments)
--   Modified installation section to preserve timestamps
--   Removed sectional comments
-
-* Wed Dec 1 2010 Matthew Harmsen <mharmsen@redhat.com> 9.0.0-1
-- Initial revision. (kwright@redhat.com & mharmsen@redhat.com)
-
-- 
1.9.3

