modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java
| 7 ++++-
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java
| 12 ++++------
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java
| 7 ++++-
3 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit d7e9f5b9871824d1f02ae762b44cff85ff6c3d44
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Tue Jul 23 10:41:12 2013 +0200
Bug 969621 - EAP 6 managed plug-in is unable to discover EAP servers when more then
one is running on a single host
Update expected resource keys in itests
diff --git
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java
index 91ece92..269474b 100644
---
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java
+++
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java
@@ -43,8 +43,11 @@ public class DomainServerComponentTest extends
AbstractServerComponentTest {
public static final ResourceType RESOURCE_TYPE =
new ResourceType("JBossAS7 Host Controller", PLUGIN_NAME,
ResourceCategory.SERVER, null);
- // The key is the server's base dir.
- public static final String RESOURCE_KEY = new File(JBOSS_HOME,
"domain").getPath();
+ // The key is the server host config file
+ // hostConfig: /tmp/jboss-as-6.0.0/domain/configuration/host.xml
+ public static final String RESOURCE_KEY = "hostConfig: "
+ + new File(JBOSS_HOME, "domain" + File.separator +
"configuration" + File.separator + "host.xml")
+ .getAbsolutePath();
@Override
protected ResourceType getServerResourceType() {
diff --git
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java
index d128144..182ef36 100644
---
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java
+++
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2011 Red Hat, Inc.
+ * Copyright (C) 2005-2013 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -13,8 +13,8 @@
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.itest.domain;
@@ -488,10 +488,8 @@ public class SecurityModuleOptionsTest extends
AbstractJBossAS7PluginTest {
InventoryManager im = pluginContainer.getInventoryManager();
Resource platform = im.getPlatform();
//host controller
- ResourceType hostControllerType = new ResourceType("JBossAS7 Host
Controller", PLUGIN_NAME,
- ResourceCategory.SERVER, null);
- Resource hostController = getResourceByTypeAndKey(platform,
hostControllerType,
- "/tmp/jboss-as-6.0.0/domain");
+ Resource hostController = getResourceByTypeAndKey(platform,
DomainServerComponentTest.RESOURCE_TYPE,
+ DomainServerComponentTest.RESOURCE_KEY);
//profile=full-ha
ResourceType profileType = new ResourceType("Profile", PLUGIN_NAME,
ResourceCategory.SERVICE, null);
String key = PROFILE;
diff --git
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java
index 8446345..32f92c7 100644
---
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java
+++
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java
@@ -51,8 +51,11 @@ public class StandaloneServerComponentTest extends
AbstractServerComponentTest {
public static final ResourceType RESOURCE_TYPE =
new ResourceType("JBossAS7 Standalone Server", PLUGIN_NAME,
ResourceCategory.SERVER, null);
- // The key is the server's base dir.
- public static final String RESOURCE_KEY = new File(JBOSS_HOME,
"standalone").getPath();
+ // The key is the server host config file
+ // hostConfig: /tmp/jboss-as-6.0.0/standalone/configuration/standalone-full-ha.xml
+ public static final String RESOURCE_KEY = "hostConfig: "
+ + new File(JBOSS_HOME, "standalone" + File.separator +
"configuration" + File.separator
+ + "standalone-full-ha.xml").getAbsolutePath();
private static final String RELOAD_OPERATION_NAME = "reload";
private static final String RESTART_OPERATION_NAME = "restart";