modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
| 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 02ed9c403f3ee1aa7fb1b5f1e1cee5713997fa56
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Thu Oct 3 12:08:12 2013 +0200
Bug 1014501 - InvalidPluginConfigurationException in agent log - product type is JBoss
EAP 6 instead of JBoss JPP 6
Removed unused EPP entry which prevented deterministic constant look-up by
product-name value
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
index 9cb9e5a..8fa7907 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java
@@ -34,9 +34,7 @@ public enum JBossProductType {
EAP("EAP", "JBoss EAP 6", "JBoss Enterprise Application
Platform 6", "EAP"),
ISPN("ISPN", "Infinispan Server", "Infinispan Server",
"ISPN"),
JDG("JDG", "JBoss JDG 6", "JBoss Data Grid 6",
"Data Grid"),
- EPP("EPP", "JBoss EAP 6", "JBoss Enterprise Portal Platform
6", "Portal Platform"),
JPP("JPP", "JBoss JPP 6", "JBoss Portal Platform 6",
"Portal Platform"),
-// EWP("EWP", "JBoss EWP 6", "JBoss Enterprise Web Platform
6", "EWP"),
SOA("SOA-P", "JBoss SOA-P 6", "Red Hat JBoss Fuse Service
Works", "SOAP"),
WILDFLY8("WildFly","WildFly 8" ,"WildFly Application Server
8" , "WildFly");
@@ -128,9 +126,7 @@ public enum JBossProductType {
productType = JBossProductType.ISPN;
} else if (slot.equals("jdg")) {
productType = JBossProductType.JDG;
- } else if (slot.equals("epp")) {//old EPP
- productType = JBossProductType.EPP;
- } else if (slot.equals("jpp")) {//new EPP->JPP plugin
+ } else if (slot.equals("jpp")) {
productType = JBossProductType.JPP;
} else if (slot.equals("soa")) {
productType = JBossProductType.SOA;
@@ -157,8 +153,6 @@ public enum JBossProductType {
productType = JBossProductType.ISPN;
} else if
(homeDirName.contains("-jdg-")||(homeDirName.contains("datagrid-server")))
{
productType = JBossProductType.JDG;
- } else if (homeDirName.contains("-epp-")) {
- productType = JBossProductType.EPP;
} else if (homeDirName.contains("-jpp-")) {
productType = JBossProductType.JPP;
} else {
Show replies by date