diff options
author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-04-09 00:37:24 +0000 |
---|---|---|
committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-04-09 00:37:24 +0000 |
commit | 577e291e2e90ed14580092eac04f6ff16721236d (patch) | |
tree | a3ab901f1f2da14c95c3384ad4f25bcbadf0d225 /pki/base/common/src/com/netscape | |
parent | 9801a2ec286fcfc0cf2c84063cc8ae14cae6d949 (diff) | |
download | pki-577e291e2e90ed14580092eac04f6ff16721236d.tar.gz pki-577e291e2e90ed14580092eac04f6ff16721236d.tar.xz pki-577e291e2e90ed14580092eac04f6ff16721236d.zip |
Bugzilla Bug #564131 - Config wizard : all subsystems - done panel text needs
correction
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1034 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/common/src/com/netscape')
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java | 16 | ||||
-rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java | 14 |
2 files changed, 24 insertions, 6 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java index e665925b9..5b358005c 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/DonePanel.java @@ -187,12 +187,24 @@ public class DonePanel extends WizardPanelBase { select = cs.getString("preop.subsystem.select", ""); } catch (Exception e) {} + String initDaemon = ""; + if (type.equals("CA")) { + initDaemon = "pki-cad"; + } else if (type.equals("KRA")) { + initDaemon = "pki-krad"; + } else if (type.equals("OCSP")) { + initDaemon = "pki-ocspd"; + } else if (type.equals("TKS")) { + initDaemon = "pki-tksd"; + } String os = System.getProperty( "os.name" ); if( os.equalsIgnoreCase( "Linux" ) ) { - context.put( "initCommand", "/sbin/service " + instanceId ); + context.put( "initCommand", "/sbin/service " + initDaemon ); + context.put( "instanceId", instanceId ); } else { /* default case: e. g. - ( os.equalsIgnoreCase( "SunOS" ) */ - context.put( "initCommand", "/etc/init.d/" + instanceId ); + context.put( "initCommand", "/etc/init.d/" + initDaemon ); + context.put( "instanceId", instanceId ); } context.put("title", "Done"); context.put("panel", "admin/console/config/donepanel.vm"); diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java index 0a493df51..bfe1a1e46 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java +++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/SecurityDomainPanel.java @@ -210,13 +210,16 @@ public class SecurityDomainPanel extends WizardPanelBase { } // Information for "existing" Security Domain CAs + String initDaemon = "pki-cad"; String instanceId = "<security_domain_instance_name>"; String os = System.getProperty( "os.name" ); if( os.equalsIgnoreCase( "Linux" ) ) { - context.put( "initCommand", "/sbin/service " + instanceId ); + context.put( "initCommand", "/sbin/service " + initDaemon ); + context.put( "instanceId", instanceId ); } else { /* default case: e. g. - ( os.equalsIgnoreCase( "SunOS" ) */ - context.put( "initCommand", "/etc/init.d/" + instanceId ); + context.put( "initCommand", "/etc/init.d/" + initDaemon ); + context.put( "instanceId", instanceId ); } } @@ -472,13 +475,16 @@ public class SecurityDomainPanel extends WizardPanelBase { } catch (EBaseException e) {} // Information for "existing" Security Domain CAs + String initDaemon = "pki-cad"; String instanceId = "<security_domain_instance_name>"; String os = System.getProperty( "os.name" ); if( os.equalsIgnoreCase( "Linux" ) ) { - context.put( "initCommand", "/sbin/service " + instanceId ); + context.put( "initCommand", "/sbin/service " + initDaemon ); + context.put( "instanceId", instanceId ); } else { /* default case: e. g. - ( os.equalsIgnoreCase( "SunOS" ) */ - context.put( "initCommand", "/etc/init.d/" + instanceId ); + context.put( "initCommand", "/etc/init.d/" + initDaemon ); + context.put( "instanceId", instanceId ); } context.put("title", "Security Domain"); |