modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java | 8 +++-- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 14 +++++++++- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java | 8 +++++ 3 files changed, 25 insertions(+), 5 deletions(-)
New commits: commit 4cb63bd38e658a533c2a33782ae4e062535780f9 Author: Heiko W. Rupp hwr@redhat.com Date: Fri Nov 4 14:56:42 2011 +0100
BZ 751065 better detect the version and mark EAP servers as such. (cherry picked from commit f335fb5f32f81f10cbbf984669e87ecdfe7f9067)
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java index bbf3304..2b1e9aa 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java @@ -47,7 +47,7 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl private static final String JBOSS_AS_PREFIX = "jboss-as-"; protected Document hostXml; protected final Log log = LogFactory.getLog(this.getClass()); - + private static final String JBOSS_EAP_PREFIX = "jboss-eap-";
/** * Read the host.xml or standalone.xml file depending on isDomainMode. If isDomainMode is true, @@ -68,7 +68,7 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl is.close(); } } catch (Exception e) { - e.printStackTrace(); // TODO: Customise this generated block + log.error(e.getMessage()); } }
@@ -314,8 +314,10 @@ public abstract class AbstractBaseDiscovery<T extends ResourceComponent<?>> impl protected String determineServerVersionFromHomeDir(String homeDir) { String version; String tmp = homeDir.substring(homeDir.lastIndexOf("/")+1); - if (tmp.startsWith("jboss-as-")) { + if (tmp.startsWith(JBOSS_AS_PREFIX)) { version = tmp.substring(JBOSS_AS_PREFIX.length()); + } else if (tmp.startsWith(JBOSS_EAP_PREFIX)) { + version = tmp.substring(JBOSS_EAP_PREFIX.length()); } else { version = homeDir.substring(homeDir.lastIndexOf("-") + 1); } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index 037c40e..2a2013f 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -74,12 +74,18 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou String psName = psr.getProcessScan().getName(); String description = discoveryContext.getResourceType().getDescription(); String homeDir = getHomeDirFromCommandLine(commandLine); - String version = null; + String version = determineServerVersionFromHomeDir(homeDir); + boolean isEAP = false;
//retrieve specific boot log file. Override for Standalone as server.log is more appropriate String bootLogFile = getLogFileFromCommandLine(commandLine); String logFile = bootLogFile;
+ if (homeDir.contains("eap")) { + isEAP=true; + version="EAP " + version; + } + if (psName.equals("HostController")) {
readStandaloneOrHostXml(psr.getProcessInfo(), true); @@ -109,6 +115,8 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou
} else { // Standalone server serverNameFull = homeDir; + + readStandaloneOrHostXml(psr.getProcessInfo(), false); if ( serverNameFull.isEmpty()) { // Try to obtain the server name @@ -141,6 +149,10 @@ public class BaseProcessDiscovery extends AbstractBaseDiscovery implements Resou logFile = bootLogFile.substring(0, bootLogFile.lastIndexOf("/")) + File.separator + "server.log"; }
+ if (isEAP) { + description=description.replace("AS7","EAP6"); + } + initLogEventSourcesConfigProp(logFile, config);
HostPort managmentPort = getManagementPortFromHostXml(commandLine); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java index c8cdba8..6421035 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java @@ -105,12 +105,18 @@ public class ManagedASDiscovery extends AbstractBaseDiscovery initLogFile(scans, serverInfo.name, config, homeDir);
String version = determineServerVersionFromHomeDir(homeDir); + String resourceDescription = "Managed AS7 instance"; + + if (homeDir.contains("eap")) { + version = "EAP " + version; + resourceDescription = resourceDescription.replace("AS7","EAP6"); + }
DiscoveredResourceDetails detail = new DiscoveredResourceDetails(discoveryContext.getResourceType(), // ResourceType hostName + "/" + serverInfo.name, // key serverInfo.name, // Name version, // TODO get from Domain as soon as it is provided - "Managed AS 7 instance", // Description + resourceDescription, // Description config, null);
// Add to return values