This repository has been archived by the owner on Jul 11, 2022. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove Wildfly8 support, change AS7 plugin to only accept apiVersion …
…1.x and Wildfly10 plugin to accept only apiVersion 4.x
- Loading branch information
Michael Burman
committed
May 19, 2016
1 parent
0d3412f
commit eaa244e
Showing
11 changed files
with
244 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
modules/plugins/jboss-as-7/intentional-api-changes-since-4.13.0.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <!-- | ||
| ~ RHQ Management Platform | ||
| ~ Copyright (C) 2005-2016 Red Hat, Inc. | ||
| ~ All rights reserved. | ||
| ~ | ||
| ~ This program is free software; you can redistribute it and/or modify | ||
| ~ it under the terms of the GNU General Public License as published by | ||
| ~ the Free Software Foundation version 2 of the License. | ||
| ~ | ||
| ~ This program is distributed in the hope that it will be useful, | ||
| ~ but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| ~ GNU General Public License for more details. | ||
| ~ | ||
| ~ You should have received a copy of the GNU General Public License | ||
| ~ along with this program; if not, write to the Free Software Foundation, Inc, | ||
| ~ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA | ||
| --> | ||
|
|
||
| <differences> | ||
| <difference> | ||
| <className>org/rhq/modules/plugins/jbossas7/JBossProductType</className> | ||
| <differenceType>6001</differenceType> | ||
| <field>WILDFLY8</field> | ||
| <justification>Remove support for WILDFLY8</justification> | ||
| </difference> | ||
| </differences> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
...es/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ProductTypeTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * RHQ Management Platform | ||
| * Copyright (C) 2005-2016 Red Hat, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation version 2 of the License. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software Foundation, Inc, | ||
| * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA | ||
| */ | ||
| package org.rhq.modules.plugins.jbossas7; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileOutputStream; | ||
| import java.io.IOException; | ||
| import java.util.Properties; | ||
|
|
||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.TemporaryFolder; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| /** | ||
| * Test current product detection. | ||
| * | ||
| * @author Michael Burman | ||
| */ | ||
| public class ProductTypeTest { | ||
|
|
||
| @Rule | ||
| public TemporaryFolder homeDir = new TemporaryFolder(); | ||
|
|
||
| private void createProductConf(String productName) throws IOException { | ||
| File bin = homeDir.newFolder("bin"); | ||
| File productConf = new File(bin, "product.conf"); | ||
| FileOutputStream fos = new FileOutputStream(productConf); | ||
| Properties productConfProps = new Properties(); | ||
| productConfProps.setProperty("slot", productName); | ||
| productConfProps.store(fos, "JBoss product branding configuration"); | ||
| fos.flush(); | ||
| fos.close(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testProductParsing() throws Exception { | ||
| createProductConf("eap"); | ||
| JBossProductType jBossProductType = JBossProductType.determineJBossProductType(homeDir.getRoot(), "1.0"); | ||
| assertEquals(jBossProductType, JBossProductType.EAP); | ||
|
|
||
| createProductConf("dv"); | ||
| jBossProductType = JBossProductType.determineJBossProductType(homeDir.getRoot(), "1.0"); | ||
| assertEquals(jBossProductType, JBossProductType.JDV); | ||
|
|
||
| createProductConf("bpms"); | ||
| jBossProductType = JBossProductType.determineJBossProductType(homeDir.getRoot(), "1.0"); | ||
| assertEquals(jBossProductType, JBossProductType.BPMS); | ||
|
|
||
| createProductConf("ispn"); | ||
| jBossProductType = JBossProductType.determineJBossProductType(homeDir.getRoot(), "1.0"); | ||
| assertEquals(jBossProductType, JBossProductType.ISPN); | ||
|
|
||
| createProductConf("jpp"); | ||
| jBossProductType = JBossProductType.determineJBossProductType(homeDir.getRoot(), "1.0"); | ||
| assertEquals(jBossProductType, JBossProductType.JPP); | ||
|
|
||
| createProductConf("brms"); | ||
| jBossProductType = JBossProductType.determineJBossProductType(homeDir.getRoot(), "1.0"); | ||
| assertEquals(jBossProductType, JBossProductType.BRMS); | ||
|
|
||
| createProductConf("soa"); | ||
| jBossProductType = JBossProductType.determineJBossProductType(homeDir.getRoot(), "1.0"); | ||
| assertEquals(jBossProductType, JBossProductType.SOA); | ||
|
|
||
| createProductConf("jdg"); | ||
| jBossProductType = JBossProductType.determineJBossProductType(homeDir.getRoot(), "1.0"); | ||
| assertEquals(jBossProductType, JBossProductType.JDG); | ||
|
|
||
| createProductConf("undefined"); | ||
| jBossProductType = JBossProductType.determineJBossProductType(homeDir.getRoot(), "1.0"); | ||
| assertEquals(jBossProductType, JBossProductType.AS); | ||
|
|
||
| createProductConf("eap"); | ||
| jBossProductType = JBossProductType.determineJBossProductType(homeDir.getRoot(), "4.0"); | ||
| assertEquals(jBossProductType, JBossProductType.UNSUPPORTED); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.