From 6e35f93208fbc9d0886696169b7a53633e8d29ef Mon Sep 17 00:00:00 2001
From: frank <frank.zhang@citrix.com>
Date: Wed, 7 Dec 2011 13:52:17 -0800
Subject: [PATCH] Bug 11939 - unify components.xml and components-premium.xml
 into components.xml

more fix
---
 client/tomcatconf/components.xml.in                             | 2 +-
 server/src/com/cloud/configuration/PremiumComponentLibrary.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
index 7d7d32ba8a8..0394d4ec218 100755
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@ -31,7 +31,7 @@
     </system-integrity-checker>
 
     <interceptor library="com.cloud.configuration.DefaultInterceptorLibrary"/>
-    <management-server class="com.cloud.server.ManagementServerImpl" library="com.cloud.configuration.DefaultComponentLibrary">
+    <management-server class="com.cloud.server.ManagementServerImpl" library="com.cloud.configuration.PremiumComponentLibrary">
         <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl">
              <param name="premium">true</param>
         </dao>
diff --git a/server/src/com/cloud/configuration/PremiumComponentLibrary.java b/server/src/com/cloud/configuration/PremiumComponentLibrary.java
index 3bef79117d3..d0841d6843f 100755
--- a/server/src/com/cloud/configuration/PremiumComponentLibrary.java
+++ b/server/src/com/cloud/configuration/PremiumComponentLibrary.java
@@ -49,6 +49,7 @@ import com.cloud.utils.component.SystemIntegrityChecker;
 public class PremiumComponentLibrary extends DefaultComponentLibrary {
     @Override
     protected void populateDaos() {
+    	super.populateDaos();
         addDao("UsageJobDao", UsageJobDaoImpl.class);
         addDao("UsageDao", UsageDaoImpl.class);
         addDao("UsageIpAddressDao", UsageIPAddressDaoImpl.class);
@@ -61,6 +62,7 @@ public class PremiumComponentLibrary extends DefaultComponentLibrary {
     @Override
     protected void populateManagers() {
     	// override FOSS SSVM manager
+    	super.populateManagers();
         addManager("secondary storage vm manager", PremiumSecondaryStorageManagerImpl.class);
 	
         addManager("HA Manager", HighAvailabilityManagerExtImpl.class);