modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 21 +++++----- 1 file changed, 11 insertions(+), 10 deletions(-)
New commits: commit 6eec59e0b0ae4a43aa4d4fbe03c1046c837359f3 Author: John Mazzitelli mazz@redhat.com Date: Fri Sep 21 14:44:01 2012 -0400
don't do anything about uninstalling the installer. I think we can leave our new AS7 installer intact. just commenting this out instead of deleting it just in case we do want to resurrect this (its possible we may end up wanting to remove the installer after it runs)
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java index 4e2a9ab..54aa48d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java @@ -625,16 +625,17 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot * Ensures the installer is no longer deployed. */ public void undeployInstaller() { - // TODO: call the mgmt api to undeploy the installer so a rogue user won't mess with it - try { - log.warn("!!!!!!!!TODO: UNDEPLOY THE INSTALLER HERE!!!!!"); - } catch (Exception e) { - log.warn("Please manually remove installer war to secure your deployment: " + e); - return; - } - - // we only get here if we are SURE we removed it! - log.info("Confirmed that the installer has been undeployed"); + // No need for this anymore - the new RHQ installer in AS7 detects it already installed things and will point the user to login screen + // We leave this in here in case we want to re-introduce the ability to uninstall the installer. + // try { + // log.warn("!!!!!!!!TODO: UNDEPLOY THE INSTALLER HERE!!!!!"); + // } catch (Exception e) { + // log.warn("Please manually remove installer war to secure your deployment: " + e); + // return; + // } + // + // // we only get here if we are SURE we removed it! + // log.info("Confirmed that the installer has been undeployed"); return; }
rhq-commits@lists.fedorahosted.org