[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'rhq-on-as7' - modules/enterprise
From:       mazz () fedoraproject ! org (mazz)
Date:       2012-11-30 17:13:13
Message-ID: 20121130171313.A1A2D30EE () hosted02 ! fedoraproject ! org
[Download RAW message or body]

 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java \
|    4 +---  modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java \
|    2 ++  modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java \
|    1 +  3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 698e3ea30232b05f29bdad9e1dce895498da45e8
Author: John Mazzitelli <mazz at redhat.com>
Date:   Fri Nov 30 12:13:06 2012 -0500

    there is no need for this undeployInstaller method anymore

diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java \
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
 index 9e92a69..00ace88 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
                
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
 @@ -55,6 +55,7 @@ import org.rhq.core.util.ObjectNameFactory;
 import org.rhq.core.util.exception.ThrowableUtil;
 import org.rhq.enterprise.communications.ServiceContainerConfigurationConstants;
 import org.rhq.enterprise.communications.util.SecurityUtil;
+import org.rhq.enterprise.gui.client.RemoteClientServlet;
 import org.rhq.enterprise.server.RHQConstants;
 import org.rhq.enterprise.server.alert.engine.internal.AlertConditionCacheCoordinator;
  import org.rhq.enterprise.server.auth.SessionManager;
@@ -142,9 +143,6 @@ public class StartupBean {
 
         log.info("All business tier deployments are complete - finishing the \
startup...");  
-        // As a security measure, make sure the installer has been undeployed
-        systemManager.undeployInstaller();
-
         // get singletons right now so we load the classes immediately into our \
classloader  AlertConditionCacheCoordinator.getInstance();
         SessionManager.getInstance();
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 9d9155c..52cd33d 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
 @@ -620,7 +620,9 @@ public class SystemManagerBean implements SystemManagerLocal, \
SystemManagerRemot  
     /**
      * Ensures the installer is no longer deployed.
+     * @deprecated
      */
+    @Deprecated
     public void undeployInstaller() {
         // 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.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java \
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java
 index 53fe6e0..50da8ed 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java
                
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java
 @@ -117,6 +117,7 @@ public interface SystemManagerLocal {
      * Ensures the installer has been undeployed. Installer must be undeployed
      * to ensure the server deployment is secure.
      */
+    @Deprecated
     void undeployInstaller();
 
     /**


[prev in list] [next in list] [prev in thread] [next in thread]