diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
index 66940f90c0a..52b9e46123d 100755
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@ -49,15 +49,10 @@
-
+
-
- 50
- -1
- routing
-
5000
300
@@ -73,7 +68,7 @@
-
+
@@ -85,90 +80,105 @@
-
+
-
-
-
+
+ 50
+ -1
+ routing
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
-
-
- false
-
+
+
+
+
@@ -177,65 +187,50 @@
+
+
-
-
-
+
-
+
+
+
+
+
-
+
+
+
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ false
+
+
50
-1
-
-
-
+
+
diff --git a/server/src/com/cloud/configuration/ConfigurationManager.java b/server/src/com/cloud/configuration/ConfigurationManager.java
index 7d5bfd2035f..737aebf0471 100644
--- a/server/src/com/cloud/configuration/ConfigurationManager.java
+++ b/server/src/com/cloud/configuration/ConfigurationManager.java
@@ -300,12 +300,6 @@ public interface ConfigurationManager extends Manager {
*/
String listToCsvTags(List tags);
- /**
- * Returns a flag that describes whether the manager is being used in a Premium context or not.
- * @return true for Premium, false for not
- */
- boolean isPremium();
-
/**
* Persists a config value via the API call
* @param cmd - the command that wraps instance, component, category, name, value, description parameters
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index d441dd512f5..ef13d04feee 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -131,16 +131,12 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
@Inject SecondaryStorageVmDao _secStorageDao;
@Inject AccountManager _accountMgr;
@Inject NetworkManager _networkMgr;
- public boolean _premium;
- private int _maxVolumeSizeInGb;
+ private int _maxVolumeSizeInGb;
@Override
public boolean configure(final String name, final Map params) throws ConfigurationException {
_name = name;
-
- Object premium = params.get("premium");
- _premium = (premium != null) && ((String) premium).equals("true");
String maxVolumeSizeInGbString = _configDao.getValue("max.volume.size.gb");
int maxVolumeSizeGb = NumbersUtil.parseInt(maxVolumeSizeInGbString, 2000);
@@ -155,11 +151,6 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
return _name;
}
- @Override
- public boolean isPremium() {
- return _premium;
- }
-
@Override
public boolean start() {
return true;