diff --git a/client/tomcatconf/components-premium.xml.in b/client/tomcatconf/components-premium.xml.in
deleted file mode 100755
index b1b5a75ece0..00000000000
--- a/client/tomcatconf/components-premium.xml.in
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
index 90be416d4e8..7d7d32ba8a8 100755
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@ -32,6 +32,9 @@
+
+ true
+
@@ -49,7 +52,7 @@
-
+
@@ -91,6 +94,10 @@
+
+
+
+
@@ -98,25 +105,45 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
- false
+ true
diff --git a/utils/src/com/cloud/utils/component/ComponentLocator.java b/utils/src/com/cloud/utils/component/ComponentLocator.java
index 01116873368..ab489e526a4 100755
--- a/utils/src/com/cloud/utils/component/ComponentLocator.java
+++ b/utils/src/com/cloud/utils/component/ComponentLocator.java
@@ -825,9 +825,9 @@ public class ComponentLocator implements ComponentLocatorMBean {
}
if (configFile == null || PropertiesUtil.findConfigFile(configFile) == null) {
- configFile = "components-premium.xml";
+ configFile = "components.xml";
if (PropertiesUtil.findConfigFile(configFile) == null){
- configFile = "components.xml";
+ throw new CloudRuntimeException("Can not find components.xml");
}
}
return getLocatorInternal(server, true, configFile, "log4j-cloud");