modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 7 ++++--- modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-)
New commits: commit da32f65506ed18dcdf4d5865b840750d5a18b615 Author: Lukas Krejci lkrejci@redhat.com Date: Tue Jul 27 18:49:43 2010 +0200
BZ 618741 - add the configuration name to the name of the JBoss AS (4 and 5) server resources.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java index 8ef756d..5068f2d 100644 --- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java +++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java @@ -316,6 +316,7 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom
String description = installInfo.getProductType().DESCRIPTION; File deployDir = new File(absoluteConfigPath, "deploy"); + File rhqInstallerWar = new File(deployDir, "rhq-installer.war"); File rhqInstallerWarUndeployed = new File(deployDir, "rhq-installer.war.rej"); boolean isRhqServer = rhqInstallerWar.exists() || rhqInstallerWarUndeployed.exists(); @@ -324,13 +325,13 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom // We know this is an RHQ Server. Let's add an event source for its server log file, but disable it by default. configureEventSourceForServerLogFile(pluginConfig); } - String name = formatServerName(bindAddress, namingPort, discoveryContext.getSystemInformation().getHostname(), isRhqServer); + String name = formatServerName(bindAddress, namingPort, discoveryContext.getSystemInformation().getHostname(), absoluteConfigPath.getName(), isRhqServer);
return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key, name, installInfo.getVersion(), description, pluginConfig, processInfo); }
- public String formatServerName(String bindingAddress, String jnpPort, String hostname, boolean isRhq) { + public String formatServerName(String bindingAddress, String jnpPort, String hostname, String configurationName, boolean isRhq) {
if (isRhq) { return hostname + " RHQ Server"; @@ -355,7 +356,7 @@ public class ApplicationServerDiscoveryComponent implements ResourceDiscoveryCom hostnameToUse += ":" + jnpPort; }
- return hostnameToUse; + return hostnameToUse + " " + configurationName; } }
diff --git a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java index 05483e4..78a3330 100644 --- a/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java +++ b/modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java @@ -325,7 +325,7 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma } } } - String name = formatServerName(bindingAddress, namingPort, discoveryContext.getSystemInformation().getHostname(), isInServer); + String name = formatServerName(bindingAddress, namingPort, discoveryContext.getSystemInformation().getHostname(), configName, isInServer);
return new DiscoveredResourceDetails(discoveryContext.getResourceType(), key, name, installInfo.getVersion(), description, pluginConfiguration, processInfo); @@ -404,7 +404,7 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma setPluginConfigurationDefaults(pluginConfiguration);
String resourceName = formatServerName(bindAddress, jnpPort, - context.getSystemInformation().getHostname(), isRhqServer(configDir)); + context.getSystemInformation().getHostname(), configName, isRhqServer(configDir)); DiscoveredResourceDetails resource = new DiscoveredResourceDetails(context.getResourceType(), configDir .getAbsolutePath(), resourceName, version, "JBoss AS server that the RHQ Plugin Container is running within", pluginConfiguration, null); @@ -420,7 +420,7 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma return null; }
- public String formatServerName(String bindingAddress, String jnpPort, String hostname, boolean isRhq) { + public String formatServerName(String bindingAddress, String jnpPort, String hostname, String configurationName, boolean isRhq) {
if (isRhq) { return hostname + " RHQ Server"; @@ -444,7 +444,7 @@ public class JBossASDiscoveryComponent implements ResourceDiscoveryComponent, Ma hostnameToUse += ":" + jnpPort; }
- return hostnameToUse; + return hostnameToUse + " " + configurationName; } }
rhq-commits@lists.fedorahosted.org