Return-Path: 
 <commits-return-26374-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 6BC8B10871
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed, 10 Jul 2013 10:26:07 +0000 (UTC)
Received: (qmail 4010 invoked by uid 500); 10 Jul 2013 10:26:07 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 3993 invoked by uid 500); 10 Jul 2013 10:26:07 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 3986 invoked by uid 99); 10 Jul 2013 10:26:06 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Jul 2013 10:26:06 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 9A17888B8BF; Wed, 10 Jul 2013 10:26:06 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: weizhou@apache.org
To: commits@cloudstack.apache.org
Message-Id: <c9bd88a5d6184f44a4979ee1ef344944@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: updated refs/heads/4.1 to 3d1c873
Date: Wed, 10 Jul 2013 10:26:06 +0000 (UTC)

Updated Branches:
  refs/heads/4.1 73a6aa788 -> 3d1c873db


CLOUDSTACK-3438: update CPVM SSL certificate for both Premium and non-Premium cases


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d1c873d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d1c873d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d1c873d

Branch: refs/heads/4.1
Commit: 3d1c873db445b0acfa6a599baea0a71c854779c7
Parents: 73a6aa7
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Wed Jul 10 12:26:00 2013 +0200
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Wed Jul 10 12:26:00 2013 +0200

----------------------------------------------------------------------
 client/WEB-INF/web.xml                          |  2 ++
 .../consoleproxy/ConsoleProxyManagerImpl.java   | 20 ++++++++------------
 2 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d1c873d/client/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/client/WEB-INF/web.xml b/client/WEB-INF/web.xml
index da2f13c..e5c05d3 100644
--- a/client/WEB-INF/web.xml
+++ b/client/WEB-INF/web.xml
@@ -45,11 +45,13 @@
     <servlet>
         <servlet-name>apiServlet</servlet-name>
         <servlet-class>com.cloud.api.ApiServlet</servlet-class>
+        <load-on-startup>5</load-on-startup>
     </servlet>
     
     <servlet>
         <servlet-name>consoleServlet</servlet-name>
         <servlet-class>com.cloud.servlet.ConsoleProxyServlet</servlet-class>
+        <load-on-startup>6</load-on-startup>
     </servlet>
 	
 	<servlet>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d1c873d/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 831c812..13c438a 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -1763,20 +1763,16 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
     @Override
     public void startAgentHttpHandlerInVM(StartupProxyCommand startupCmd) {
         StartConsoleProxyAgentHttpHandlerCommand cmd = null;
-        if (_configDao.isPremium()) {
-            String storePassword = String.valueOf(_random.nextLong());
-            byte[] ksBits = _ksMgr.getKeystoreBits(ConsoleProxyManager.CERTIFICATE_NAME, ConsoleProxyManager.CERTIFICATE_NAME, storePassword);
 
-            assert (ksBits != null);
-            if (ksBits == null) {
-                s_logger.error("Could not find and construct a valid SSL certificate");
-            }
-            cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword);
-            cmd.setEncryptorPassword(getEncryptorPassword());
-        } else {
-            cmd = new StartConsoleProxyAgentHttpHandlerCommand();
-            cmd.setEncryptorPassword(getEncryptorPassword());
+        String storePassword = String.valueOf(_random.nextLong());
+        byte[] ksBits = _ksMgr.getKeystoreBits(ConsoleProxyManager.CERTIFICATE_NAME, ConsoleProxyManager.CERTIFICATE_NAME, storePassword);
+
+        assert (ksBits != null);
+        if (ksBits == null) {
+            s_logger.error("Could not find and construct a valid SSL certificate");
         }
+        cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword);
+        cmd.setEncryptorPassword(getEncryptorPassword());
 
         try {
             long proxyVmId = startupCmd.getProxyVmId();