modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
New commits: commit 68f57f8fe40779de0553aa2b4430f6780662a4f3 Merge: 9eb1aa6 3a80401 Author: John Mazzitelli mazz@redhat.com Date: Tue Dec 4 10:32:08 2012 -0500
Merge remote-tracking branch 'origin/master' into rhq-on-as7
commit 3a80401e9899f9025b9119259467118b64338c87 Author: Simeon Pinder spinder@fulliautomatix.conchfritter.com Date: Tue Dec 4 07:50:29 2012 -0500
[BZ 871535] update product types to support EPP->JPP rename.
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 87e31f3..7239c02 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,6 +34,7 @@ public enum JBossProductType { EAP("EAP", "JBoss EAP 6", "JBoss Enterprise Application Platform 6", "EAP"), JDG("JDG", "JBoss JDG 6", "JBoss Data Grid 6", "Data Grid"), EPP("EPP", "JBoss EAP 6", "JBoss Enterprise Portal Platform 6", "EPP"), + JPP("JPP", "JBoss EAP 6", "JBoss Portal Platform 6", "JPP"), // EWP("EWP", "JBoss EWP 6", "JBoss Enterprise Web Platform 6", "EWP"), SOA("SOA-P", "JBoss SOA-P 6", "JBoss Enterprise SOA Platform (ESB)", "SOAP");
@@ -97,8 +98,10 @@ public enum JBossProductType { productType = JBossProductType.EAP; } else if (slot.equals("jdg")) { productType = JBossProductType.JDG; - } else if (slot.equals("epp")) { + } else if (slot.equals("epp")) {//old EPP productType = JBossProductType.EPP; + } else if (slot.equals("jpp")) {//new EPP->JPP plugin + productType = JBossProductType.JPP; } else if (slot.equals("soa-p")) { productType = JBossProductType.SOA; } else { @@ -122,6 +125,8 @@ public enum JBossProductType { productType = JBossProductType.JDG; } else if (homeDirName.contains("-epp-")) { productType = JBossProductType.EPP; + } else if (homeDirName.contains("-jpp-")) { + productType = JBossProductType.JPP; } else if (homeDirName.contains("soa-p-")) { productType = JBossProductType.SOA; } else {
rhq-commits@lists.fedorahosted.org