Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text needs

correction


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

17 files changed, 47 insertions, 25 deletions

diff --git a/pki/dogtag/common-ui/build_dogtag b/pki/dogtag/common-ui/build_dogtag
index 9ca909e94..3f807e192 100755
--- a/pki/dogtag/common-ui/build_dogtag
+++ b/pki/dogtag/common-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="common-ui"
 export PKI_PRODUCT
-PKI_VERSION="1.3.1"
+PKI_VERSION="1.3.2"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
index 286da4045..e80546563 100644
--- a/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
+++ b/pki/dogtag/common-ui/dogtag-pki-common-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-common-ui
-Version:        1.3.1
-Release:        2%{?dist}
+Version:        1.3.2
+Release:        1%{?dist}
 Summary:        Dogtag Certificate System - PKI Common Framework User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -62,6 +62,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Thu Apr 8 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.2-1
+- Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text
+  needs correction
+
 * Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-2
 - Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
   associated Red Hat PKI UI Packages . . .
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/donepanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/donepanel.vm
index 17f5aa803..dd49ad9fc 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/donepanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/donepanel.vm
@@ -33,12 +33,12 @@ function performPanel() {
 <img alt="" src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
 #end
 #if ($systemType.equals("tks"))
-As 'root', restart the server on the command line by typing "$initCommand restart". After performing this restart, the server should become operational. 
+As 'root', restart the server on the command line by typing "$initCommand restart $instanceId". After performing this restart, the server should become operational. 
 #else
 #if ($externalCA.equals("true") && $systemType.equals("kra"))
-As 'root', restart the server on the command line by typing "$initCommand restart". Startup the administration console to add the peer CA to the Trusted Manager's Group. Make sure to add the transport certificate and connector information to the peer CA. After performing this restart, the server should become operational.
+As 'root', restart the server on the command line by typing "$initCommand restart $instanceId". Startup the administration console to add the peer CA to the Trusted Manager's Group. Make sure to add the transport certificate and connector information to the peer CA. After performing this restart, the server should become operational.
 #else
-As 'root', restart the server on the command line by typing "$initCommand restart". After performing this restart, the server should become operational.
+As 'root', restart the server on the command line by typing "$initCommand restart $instanceId". After performing this restart, the server should become operational.
 <br/>
 Please go to the <A href="https://$host:$port/$systemType/services"><b>services page</b></A> to access all of the available interfaces.
 <br/>
diff --git a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
index 59bbb01d7..0e6a902eb 100644
--- a/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/common-ui/shared/admin/console/config/securitydomainpanel.vm
@@ -109,7 +109,7 @@ Enter the URL to an existing security domain.
 <table>
 <tr>
 <td valign="top"><b>NOTE:&nbsp;&nbsp; </b></td>
-<td>Since a Security Domain MUST be a CA (although all CAs are NOT necessarily Security Domains), an appropriate value for this URL may be obtained by logging into the machine which hosts the desired Security Domain CA as 'root' and running the command "$initCommand status" from the command-line.</td>
+<td>Since a Security Domain MUST be a CA (although all CAs are NOT necessarily Security Domains), an appropriate value for this URL may be obtained by logging into the machine which hosts the desired Security Domain CA as 'root' and running the command "$initCommand status $instanceId" from the command-line.</td>
 </tr>
 </table>
 <br/>
diff --git a/pki/dogtag/common/pki-common.spec b/pki/dogtag/common/pki-common.spec
index fcb56bec3..657c941bc 100644
--- a/pki/dogtag/common/pki-common.spec
+++ b/pki/dogtag/common/pki-common.spec
@@ -114,6 +114,8 @@ rm -rf %{buildroot}
 
 %changelog
 * Thu Apr 8 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.5-1
+- Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text
+  needs correction
 - Update source tarball
 
 * Tue Apr 6 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.4-2
diff --git a/pki/dogtag/ra-ui/build_dogtag b/pki/dogtag/ra-ui/build_dogtag
index 255d88912..bdbaef8ea 100755
--- a/pki/dogtag/ra-ui/build_dogtag
+++ b/pki/dogtag/ra-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="ra-ui"
 export PKI_PRODUCT
-PKI_VERSION="1.3.0"
+PKI_VERSION="1.3.1"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
index 26284afc7..1c88c04e4 100644
--- a/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
+++ b/pki/dogtag/ra-ui/dogtag-pki-ra-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-ra-ui
-Version:        1.3.0
-Release:        6%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Registration Authority User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -62,6 +62,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Thu Apr 8 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1
+- Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text
+  needs correction
+
 * Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-6
 - Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
   associated Red Hat PKI UI Packages . . .
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
index af23ff226..bc7ccfc01 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/donepanel.vm
@@ -33,7 +33,7 @@ function performPanel() {
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
 #end
 As 'root', restart the server on the command line by typing "$initCommand
- restart". After performing this restart, the server should become operational.
+ restart $instanceID". After performing this restart, the server should become operational.
 <br/>
 Please go to the <A href="https://$host:$non_clientauth_port"><b>services page</b></A> to access all of the available interfaces.
 <br/>
diff --git a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
index 59bbb01d7..3bd19c520 100644
--- a/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/securitydomainpanel.vm
@@ -109,7 +109,7 @@ Enter the URL to an existing security domain.
 <table>
 <tr>
 <td valign="top"><b>NOTE:&nbsp;&nbsp; </b></td>
-<td>Since a Security Domain MUST be a CA (although all CAs are NOT necessarily Security Domains), an appropriate value for this URL may be obtained by logging into the machine which hosts the desired Security Domain CA as 'root' and running the command "$initCommand status" from the command-line.</td>
+<td>Since a Security Domain MUST be a CA (although all CAs are NOT necessarily Security Domains), an appropriate value for this URL may be obtained by logging into the machine which hosts the desired Security Domain CA as 'root' and running the command "$initCommand status $instanceID" from the command-line.</td>
 </tr>
 </table>
 <br/>
diff --git a/pki/dogtag/ra/build_dogtag b/pki/dogtag/ra/build_dogtag
index 175873f50..c565dde49 100755
--- a/pki/dogtag/ra/build_dogtag
+++ b/pki/dogtag/ra/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="ra"
 export PKI_PRODUCT
-PKI_VERSION="1.3.0"
+PKI_VERSION="1.3.1"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/ra/pki-ra.spec b/pki/dogtag/ra/pki-ra.spec
index 93df6434f..bcdacd399 100644
--- a/pki/dogtag/ra/pki-ra.spec
+++ b/pki/dogtag/ra/pki-ra.spec
@@ -1,6 +1,6 @@
 Name:           pki-ra
-Version:        1.3.0
-Release:        6%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Registration Authority
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2
@@ -106,6 +106,10 @@ fi
 %{_localstatedir}/run/*
 
 %changelog
+* Thu Apr 8 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1
+- Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text
+  needs correction
+
 * Tue Feb 16 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-6
 - Bugzilla Bug #566060 -  Add 'pki-native-tools' as a runtime dependency
   for RA, and TPS . . .
diff --git a/pki/dogtag/tps-ui/build_dogtag b/pki/dogtag/tps-ui/build_dogtag
index 1e42e11a5..54f7dca71 100755
--- a/pki/dogtag/tps-ui/build_dogtag
+++ b/pki/dogtag/tps-ui/build_dogtag
@@ -40,7 +40,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="tps-ui"
 export PKI_PRODUCT
-PKI_VERSION="1.3.1"
+PKI_VERSION="1.3.2"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index 309a50217..0b58f7905 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -1,6 +1,6 @@
 Name:           dogtag-pki-tps-ui
-Version:        1.3.1
-Release:        2%{?dist}
+Version:        1.3.2
+Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Token Processing System User Interface
 URL:            http://pki.fedoraproject.org/
 License:        GPLv2 and LGPLv2
@@ -62,6 +62,10 @@ rm -rf %{buildroot}
 %{_datadir}/pki/
 
 %changelog
+* Thu Apr 8 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.2-1
+- Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text
+  needs correction
+
 * Wed Apr 7 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-2
 - Bugzilla Bug #580282 - Dogtag PKI UI Packages should "Conflict" with
   associated Red Hat PKI UI Packages . . .
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
index 7cd3db527..bc20a4e60 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/donepanel.vm
@@ -32,13 +32,13 @@ function performPanel() {
 <img src="../img/icon_crit_update.gif">&nbsp;<font color="red">$errorString</font>
 #end
 #if ($systemType == "tks")
-As 'root', restart the server on the command line by typing "$initCommand restart". After performing this restart, the server should become operational. 
+As 'root', restart the server on the command line by typing "$initCommand restart $instanceID". After performing this restart, the server should become operational. 
 #else
 #if ($externalCA == "true" && $systemType == "kra")
-As 'root', restart the server on the command line by typing "$initCommand restart". Startup the administration console to add the peer CA to the Trusted Manager's Group. Make sure to add the transport certificate and connector information to the peer CA. After performing this restart, the server should become operational.
+As 'root', restart the server on the command line by typing "$initCommand restart $instanceID". Startup the administration console to add the peer CA to the Trusted Manager's Group. Make sure to add the transport certificate and connector information to the peer CA. After performing this restart, the server should become operational.
 #else
 As 'root', restart the server on the command line by typing "$initCommand
- restart". After performing this restart, the server should become operational.
+ restart $instanceID". After performing this restart, the server should become operational.
 <br/>
 Please go to the <A href="https://$host:$non_clientauth_port">services page</A> to access all of the available interfaces.
 <br/>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
index d983abcb8..f54703668 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
+++ b/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/securitydomainpanel.vm
@@ -108,7 +108,7 @@ Enter the URL to an existing security domain.
 <table>
 <tr>
 <td valign="top"><b>NOTE:&nbsp;&nbsp; </b></td>
-<td>Since a Security Domain MUST be a CA (although all CAs are NOT necessarily Security Domains), an appropriate value for this URL may be obtained by logging into the machine which hosts the desired Security Domain CA as 'root' and running the command "$initCommand status" from the command-line.</td>
+<td>Since a Security Domain MUST be a CA (although all CAs are NOT necessarily Security Domains), an appropriate value for this URL may be obtained by logging into the machine which hosts the desired Security Domain CA as 'root' and running the command "$initCommand status $instanceID" from the command-line.</td>
 </tr>
 </table>
 <br/>
diff --git a/pki/dogtag/tps/build_dogtag b/pki/dogtag/tps/build_dogtag
index 6702691f5..8889c97a8 100755
--- a/pki/dogtag/tps/build_dogtag
+++ b/pki/dogtag/tps/build_dogtag
@@ -41,7 +41,7 @@ PKI_PRODUCT_PREFIX="pki"
 export PKI_PRODUCT_PREFIX
 PKI_PRODUCT="tps"
 export PKI_PRODUCT
-PKI_VERSION="1.3.0"
+PKI_VERSION="1.3.1"
 export PKI_VERSION
 
 # Set Dogtag helper variables
diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec
index 7fd744d8b..aeb791995 100644
--- a/pki/dogtag/tps/pki-tps.spec
+++ b/pki/dogtag/tps/pki-tps.spec
@@ -1,6 +1,6 @@
 Name:           pki-tps
-Version:        1.3.0
-Release:        8%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Dogtag Certificate System - Token Processing System
 URL:            http://pki.fedoraproject.org/
 License:        LGPLv2
@@ -209,6 +209,10 @@ fi
 %{_libdir}/libtps.so
 
 %changelog
+* Thu Apr 8 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.1-1
+- Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text
+  needs correction
+
 * Tue Feb 16 2010 Matthew Harmsen <mharmsen@redhat.com> 1.3.0-8
 - Bugzilla Bug #566060 -  Add 'pki-native-tools' as a runtime dependency
   for RA, and TPS . . .