Bugzilla Bug #467155 - Change "renameTo" to "cp -p ".

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

29 files changed, 49 insertions, 29 deletions

diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
index f83aed09b..53a670828 100644
--- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
+++ b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      7
+%define base_release      8
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -222,6 +222,8 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-8
+- Bugzilla Bug #467155 - Change "renameTo" to "cp -p "
 * Tue Jan 27 2009 Ade Lee <alee@redhat.com> 1.0.0-7
 - Bugzilla Bug #482738 - selinux changes needed for cloning
 * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-6
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
index 5608878d9..7d5aade5f 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
@@ -46,7 +46,7 @@ If authentication is successful, a cloned subsystem will retrieve the configurat
       <tr>
         <th>Password:</th>
 
-        <td><input type="password" size="40" name="password" value="$password" autocomplete="off"/></td>
+        <td><input type="password" size="40" name="__password" value="$password" autocomplete="off"/></td>
       </tr>
     </table>
 <p>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
index 4a7e79174..2124e7a36 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
@@ -42,7 +42,7 @@ The uid and password are used to authenticate to the CA from which this subsyste
       <tr>
         <th>Password:</th>
 
-        <td><input type="password" size="40" name="password" value="$password" autocomplete="off"/></td>
+        <td><input type="password" size="40" name="__password" value="$password" autocomplete="off"/></td>
       </tr>
     </table>
 <br/>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm
index 407544ad5..cf845f466 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_clone.vm
@@ -75,7 +75,7 @@ A cloned subsystem setup provides scalability and high-availability. The connect
       <tr>
         <th>Bind Password:</th>
                                                                                 
-        <td><input type="password" length="128" size="40" name="bindpassword" autocomplete="off"/></td>
+        <td><input type="password" length="128" size="40" name="__bindpassword" autocomplete="off"/></td>
       </tr>
     </table>
 
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm
index 94217f3a6..67914c834 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_db.vm
@@ -93,7 +93,7 @@
       <tr>
         <th>Bind Password:</th>
                                                                                 
-        <td><input type="password" length="128" size="40" name="bindpwd" value="$bindpwd" autocomplete="off" /></td>
+        <td><input type="password" length="128" size="40" name="__bindpwd" value="$bindpwd" autocomplete="off" /></td>
       </tr>
         <td><input type="hidden" name="display" value=$displayStr /></td>
     </table>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm b/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm
index b9855c2f7..3fa62527c 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/config_join.vm
@@ -95,7 +95,7 @@ To join this PKI network, the setup wizard needs to submit the certificate reque
       </tr>       
       <tr>
         <th>Password:</th>
-        <td><input type="password" length="64" size="40" name="pwd" value="" autocomplete="off" /></td>
+        <td><input type="password" length="64" size="40" name="__pwd" value="" autocomplete="off" /></td>
       </tr>       
     </table>
 <p>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/login.vm b/pki/dogtag/common-ui/shared/admin/console/config/login.vm
index c84f4b6c4..cf1f83707 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/login.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/login.vm
@@ -82,7 +82,7 @@ A one time random pin has been generated during setup to protect unauthorized ac
     <table class="details">
       <tr>
         <th>PIN:</th>
-        <td><input type=password name=pin></td>
+        <td><input type=password name="__pin"></td>
       </tr>
     </table>
                                                                                      <div align="right">
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
index 8b08ed448..c499c9d44 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/restorekeycertpanel.vm
@@ -46,7 +46,7 @@ By default, if the path is left blank, no PKCS #12 file will be imported.
       <tr>
         <th>PKCS #12 Password:</th>
 
-        <td><input type="password" size="40" name="password" value="$password" autocomplete="off"/></td>
+        <td><input type="password" size="40" name="__password" value="$password" autocomplete="off"/></td>
       </tr>
     </table>
 <br/>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
index d02b11756..caf4b595f 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
@@ -70,7 +70,7 @@
       <tr>
         <th>Password:</th>
                                                                                 
-        <td><input type="password" length="64" size="40" name="pwd" value="$sd_pwd" autocomplete="off" /></td>
+        <td><input type="password" length="64" size="40" name="__pwd" value="$sd_pwd" autocomplete="off" /></td>
       </tr>       
 <input type=hidden name=url value="$url">
 
diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index c230bfd16..95d9c78de 100644
--- a/pki/dogtag/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      37
+%define base_release      38
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -280,6 +280,9 @@ chmod 00755 %{_datadir}/%{base_prefix}/setup/postinstall
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-38
+- Bugzilla Bug #467155 - Change "renameTo" to "cp -p "
+- cleaned up some javadoc warnings
 * Wed Feb 11 2009 Ade Lee <alee@redhat.com> 1.0.0-37
 - Bugzilla Bug: 443417 - requestor email does not make it to mail 
 * Mon Feb 2 2009 Ade Lee <alee@redhat.com> 1.0.0-36
diff --git a/pki/dogtag/java-tools/pki-java-tools.spec b/pki/dogtag/java-tools/pki-java-tools.spec
index d7906ef14..aab134594 100644
--- a/pki/dogtag/java-tools/pki-java-tools.spec
+++ b/pki/dogtag/java-tools/pki-java-tools.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      4
+%define base_release      5
 %define base_group        System Environment/Shells
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -255,6 +255,9 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-5
+- Bugzilla Bug #467155 - Change "renameTo" to "cp -p "
+- cleaned up some javadoc warnings
 * Thu Jan 22 2009 Christina Fu <cfu@redhat.com> 1.0.0-4
 - Bugzilla Bug 481237 - Audit Log signing framework
 * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3
diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
index 13b9ff477..cca86fb53 100644
--- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
+++ b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      4
+%define base_release      5
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -222,6 +222,8 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-5
+- Bugzilla Bug #467155 - Change "renameTo" to "cp -p "
 * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-4
 - Bugzilla Bug #445402 - changed "linux"/"fedora" to "dogtag"; changed
                          "pki-svn.fedora.redhat.com" to "pki.fedoraproject.org"
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
index 5608878d9..7d5aade5f 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/adminauthenticatepanel.vm
@@ -46,7 +46,7 @@ If authentication is successful, a cloned subsystem will retrieve the configurat
       <tr>
         <th>Password:</th>
 
-        <td><input type="password" size="40" name="password" value="$password" autocomplete="off"/></td>
+        <td><input type="password" size="40" name="__password" value="$password" autocomplete="off"/></td>
       </tr>
     </table>
 <p>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
index 4a7e79174..2124e7a36 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/agentauthenticatepanel.vm
@@ -42,7 +42,7 @@ The uid and password are used to authenticate to the CA from which this subsyste
       <tr>
         <th>Password:</th>
 
-        <td><input type="password" size="40" name="password" value="$password" autocomplete="off"/></td>
+        <td><input type="password" size="40" name="__password" value="$password" autocomplete="off"/></td>
       </tr>
     </table>
 <br/>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
index 09220443e..351b26041 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_db.vm
@@ -93,7 +93,7 @@
       <tr>
         <th>Bind Password:</th>
                                                                                 
-        <td><input type="password" length="128" size="40" name="bindpwd" value="$bindpwd" autocomplete="off" /></td>
+        <td><input type="password" length="128" size="40" name="__bindpwd" value="$bindpwd" autocomplete="off" /></td>
       </tr>
         <td><input type="hidden" name="display" value=$displayStr /></td>
     </table>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
index 8f5db2fad..b912e5187 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/config_join.vm
@@ -95,7 +95,7 @@ To join this PKI network, the setup wizard needs to submit the certificate reque
       </tr>       
       <tr>
         <th>Password:</th>
-        <td><input type="password" length="64" size="40" name="pwd" value="" autocomplete="off" /></td>
+        <td><input type="password" length="64" size="40" name="__pwd" value="" autocomplete="off" /></td>
       </tr>       
     </table>
 <p>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
index 35904eb91..37683e4f5 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/login.vm
@@ -80,7 +80,7 @@ A one time random pin has been generated during setup to protect unauthorized ac
     <table class="details">
       <tr>
         <th>PIN:</th>
-        <td><input type=password name=pin></td>
+        <td><input type=password name="__pin"></td>
       </tr>
     </table>
                                                                                      <div align="right">
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
index 75f8135ec..88eff28b9 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainloginpanel.vm
@@ -70,7 +70,7 @@
       <tr>
         <th>Password:</th>
                                                                                 
-        <td><input type="password" length="64" size="40" name="pwd" value="$sd_pwd" autocomplete="off" /></td>
+        <td><input type="password" length="64" size="40" name="__pwd" value="$sd_pwd" autocomplete="off" /></td>
       </tr>       
 <input type=hidden name=url value="$url">
 
diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec
index 58f8c7b73..784d2e022 100644
--- a/pki/dogtag/ra/pki-ra.spec
+++ b/pki/dogtag/ra/pki-ra.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      12
+%define base_release      13
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -261,6 +261,8 @@ fi
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-13
+- Bugzilla Bug #467155 - Change "renameTo" to "cp -p "
 * Wed Feb 11 2009 Ade Lee <alee@redhat.com> 1.0.0-12
 - Bugzilla # 484826 -selinux policy required for TPS and RA subsystems
 * Tue Jan 27 2009 Ade Lee <alee@redhat.com> 1.0.0-11
diff --git a/pki/dogtag/setup/pki-setup.spec b/pki/dogtag/setup/pki-setup.spec
index 21fa86fd7..beabb748b 100644
--- a/pki/dogtag/setup/pki-setup.spec
+++ b/pki/dogtag/setup/pki-setup.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      10
+%define base_release      11
 %define base_group        System Environment/Shells
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -217,6 +217,8 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-11
+- Bugzilla Bug #467155 - Change "renameTo" to "cp -p "
 * Mon Feb 9 2009 Ade Lee <alee@redhat.com> 1.0.0-10
 - Bugzilla Bugs #480418, 480419, 479891
 * Thu Jan 22 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-9
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index 05cba3aa8..5c5dd204e 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      5
+%define base_release      6
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -222,6 +222,8 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-6
+- Bugzilla Bug #467155 - Change "renameTo" to "cp -p "
 * Tue Jan 27 2009 Ade Lee <alee@redhat.com> 1.0.0-5
 - Bugzilla Bug #479092 TPS roles enhancements
 * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-4
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
index 958ac5b1a..c62f5f095 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/adminauthenticatepanel.vm
@@ -46,7 +46,7 @@ If authentication is successful, a cloned subsystem will retrieve the configurat
       <tr>
         <th>Password:</th>
 
-        <td><input type="password" size="40" name="password" value="$password" autocomplete="off"/></td>
+        <td><input type="password" size="40" name="__password" value="$password" autocomplete="off"/></td>
       </tr>
     </table>
 <p>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
index b4cd94704..b2af26ccd 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/agentauthenticatepanel.vm
@@ -42,7 +42,7 @@ The uid and password are used to authenticate to the CA from which this subsyste
       <tr>
         <th>Password:</th>
 
-        <td><input type="password" size="40" name="password" value="$password" autocomplete="off"/></td>
+        <td><input type="password" size="40" name="__password" value="$password" autocomplete="off"/></td>
       </tr>
     </table>
 <br/>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
index cd87a7147..035e4bdc1 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_db.vm
@@ -93,7 +93,7 @@
       <tr>
         <th>Bind Password:</th>
                                                                                 
-        <td><input type="password" length="128" size="40" name="bindpwd" value="$bindpwd" autocomplete="off" /></td>
+        <td><input type="password" length="128" size="40" name="__bindpwd" value="$bindpwd" autocomplete="off" /></td>
       </tr>
         <td><input type="hidden" name="display" value=$displayStr /></td>
     </table>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
index 01106cf6a..abf27464d 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/config_join.vm
@@ -95,7 +95,7 @@ To join this PKI network, the setup wizard needs to submit the certificate reque
       </tr>       
       <tr>
         <th>Password:</th>
-        <td><input type="password" length="64" size="40" name="pwd" value="" autocomplete="off" /></td>
+        <td><input type="password" length="64" size="40" name="__pwd" value="" autocomplete="off" /></td>
       </tr>       
     </table>
 <p>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
index 26efabee2..ac7a4c4f6 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/login.vm
@@ -80,7 +80,7 @@ A one time random pin has been generated during setup to protect unauthorized ac
     <table class="details">
       <tr>
         <th>PIN:</th>
-        <td><input type=password name=pin></td>
+        <td><input type=password name="__pin"></td>
       </tr>
     </table>
                                                                                      <div align="right">
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
index 7e744c281..ce68b2d8d 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainloginpanel.vm
@@ -70,7 +70,7 @@
       <tr>
         <th>Password:</th>
                                                                                 
-        <td><input type="password" length="64" size="40" name="pwd" value="$sd_pwd" autocomplete="off" /></td>
+        <td><input type="password" length="64" size="40" name="__pwd" value="$sd_pwd" autocomplete="off" /></td>
       </tr>       
 <input type=hidden name=url value="$url">
 
diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec
index 281eeb6aa..e128b67d2 100644
--- a/pki/dogtag/tps/pki-tps.spec
+++ b/pki/dogtag/tps/pki-tps.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      19
+%define base_release      20
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      LGPLv2 with exceptions
@@ -308,6 +308,8 @@ fi
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-20
+- Bugzilla Bug #467155 - Change "renameTo" to "cp -p "
 * Wed Feb 11 2009 Ade Lee <alee@redhat.com> 1.0.0-19
 - Bugzilla # 484826 -selinux policy required for TPS and RA subsystems  
 * Fri Feb 6 2009 Christina Fu <cfu@redhat.com> 1.0.0-18
diff --git a/pki/dogtag/util/pki-util.spec b/pki/dogtag/util/pki-util.spec
index 2b03b0dbe..58936fc60 100644
--- a/pki/dogtag/util/pki-util.spec
+++ b/pki/dogtag/util/pki-util.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      8
+%define base_release      9
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -278,6 +278,8 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-9
+- cleaned up some javadoc warnings
 * Fri Nov 28 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-8
 - Bugzilla Bug #445402 - changed "linux"/"fedora" to "dogtag"; changed
                          "pki-svn.fedora.redhat.com" to "pki.fedoraproject.org"