August 2012 - rhq-commits - Fedora Mailing-Lists

[rhq] Branch 'feature/hadoop-plugin' - modules/plugins

by lkrejci

modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopOperationsDelegate.java | 6 modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java | 209 ++++++++++ modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerConfigurationDelegate.java | 2 modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerDiscovery.java | 153 +++++++ modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceComponent.java | 209 ---------- modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceDiscovery.java | 158 ------- modules/plugins/hadoop/src/main/resources/META-INF/rhq-plugin.xml | 30 - 7 files changed, 381 insertions(+), 386 deletions(-) New commits: commit 1f6662cc739ca16343f388d5ed8422571ad03656 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Aug 2 11:25:18 2012 +0200 Renaming stuff, making config props not required diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopOperationsDelegate.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopOperationsDelegate.java index fdffe35..933eabd 100644 --- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopOperationsDelegate.java +++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopOperationsDelegate.java @@ -41,9 +41,9 @@ public class HadoopOperationsDelegate { private static final long MAX_WAIT = 1000 * 60 * 5; private static final int MAX_OUTPUT = 2048; - private ResourceContext<HadoopServiceComponent> resourceContext; + private ResourceContext<HadoopServerComponent> resourceContext; - public HadoopOperationsDelegate(ResourceContext<HadoopServiceComponent> resourceContext) { + public HadoopOperationsDelegate(ResourceContext<HadoopServerComponent> resourceContext) { this.resourceContext = resourceContext; } @@ -147,7 +147,7 @@ public class HadoopOperationsDelegate { private ProcessExecutionResults invokeGeneralOperation(HadoopSupportedOperations operation) { String hadoopHome = resourceContext.getPluginConfiguration() - .getSimple(HadoopServiceDiscovery.HOME_DIR_PROPERTY).getStringValue(); + .getSimple(HadoopServerDiscovery.HOME_DIR_PROPERTY).getStringValue(); String executable = hadoopHome + operation.getRelativePathToExecutable(); ProcessExecutionResults results = executeExecutable(resourceContext.getSystemInformation(), executable, diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java new file mode 100644 index 0000000..9acc4ff --- /dev/null +++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerComponent.java @@ -0,0 +1,209 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.hadoop; + +import java.io.File; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.mc4j.ems.connection.EmsConnection; +import org.mc4j.ems.connection.bean.EmsBean; +import org.mc4j.ems.connection.bean.attribute.EmsAttribute; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; +import org.rhq.core.domain.measurement.AvailabilityType; +import org.rhq.core.domain.measurement.MeasurementDataNumeric; +import org.rhq.core.domain.measurement.MeasurementDataTrait; +import org.rhq.core.domain.measurement.MeasurementReport; +import org.rhq.core.domain.measurement.MeasurementScheduleRequest; +import org.rhq.core.pluginapi.configuration.ConfigurationFacet; +import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; +import org.rhq.core.pluginapi.event.EventContext; +import org.rhq.core.pluginapi.event.log.Log4JLogEntryProcessor; +import org.rhq.core.pluginapi.event.log.LogFileEventPoller; +import org.rhq.core.pluginapi.inventory.ResourceComponent; +import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.pluginapi.measurement.MeasurementFacet; +import org.rhq.core.pluginapi.operation.OperationFacet; +import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.plugins.jmx.JMXComponent; +import org.rhq.plugins.jmx.JMXServerComponent; + +public class HadoopServerComponent extends JMXServerComponent<ResourceComponent<?>> implements + JMXComponent<ResourceComponent<?>>, MeasurementFacet, OperationFacet, ConfigurationFacet { + + private static final Log LOG = LogFactory.getLog(HadoopServerComponent.class); + + private static final String LOG_EVENT_TYPE = "logEntry"; + private static final String LOG_POLLING_INTERVAL_PROPERTY = "logPollingInterval"; + + private HadoopServerConfigurationDelegate configurationDelegate; + + private HadoopOperationsDelegate operationsDelegate; + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void start(ResourceContext context) throws Exception { + super.start(context); + configurationDelegate = new HadoopServerConfigurationDelegate(context); + this.operationsDelegate = new HadoopOperationsDelegate(context); + + EventContext events = context.getEventContext(); + if (events != null) { + File logFile = determineLogFile(); + int interval = Integer.parseInt(context.getPluginConfiguration().getSimpleValue(LOG_POLLING_INTERVAL_PROPERTY, "60")); + events.registerEventPoller(new LogFileEventPoller(events, LOG_EVENT_TYPE, logFile, new Log4JLogEntryProcessor(LOG_EVENT_TYPE, logFile)), interval); + } + } + + @Override + public void stop() { + EventContext events = getResourceContext().getEventContext(); + if (events != null) { + events.unregisterEventPoller(LOG_EVENT_TYPE); + } + super.stop(); + } + + /** + * Return availability of this resource + * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability() + */ + @Override + public AvailabilityType getAvailability() { + return getResourceContext().getNativeProcess().isRunning() ? AvailabilityType.UP : AvailabilityType.DOWN; + } + + @Override + public EmsConnection getEmsConnection() { + EmsConnection conn = super.getEmsConnection(); + if (LOG.isTraceEnabled()) { + LOG.trace("EmsConnection is " + conn.toString()); + } + return conn; + + } + + /** + * Gather measurement data + * @see org.rhq.core.pluginapi.measurement.MeasurementFacet#getValues(org.rhq.core.domain.measurement.MeasurementReport, java.util.Set) + */ + public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { + for (MeasurementScheduleRequest request : metrics) { + String name = request.getName(); + int delimIndex = name.lastIndexOf(':'); + String beanName = name.substring(0, delimIndex); + String attributeName = name.substring(delimIndex + 1); + try { + EmsConnection emsConnection = getEmsConnection(); + EmsBean bean = emsConnection.getBean(beanName); + if (bean != null) { + bean.refreshAttributes(); + EmsAttribute attribute = bean.getAttribute(attributeName); + if (attribute != null) { + Object valueObject = attribute.refresh(); + if (valueObject instanceof Number) { + Number value = (Number) valueObject; + report.addData(new MeasurementDataNumeric(request, value.doubleValue())); + } else { + report.addData(new MeasurementDataTrait(request, valueObject.toString())); + } + } else { + LOG.warn("Attribute " + attributeName + " not found"); + } + } else { + LOG.warn("MBean " + beanName + " not found"); + } + } catch (Exception e) { + LOG.error("Failed to obtain measurement [" + name + "]", e); + } + } + } + + public Configuration loadResourceConfiguration() throws Exception { + return configurationDelegate.loadConfiguration(); + } + + public void updateResourceConfiguration(ConfigurationUpdateReport report) { + try { + Configuration updatedConfiguration = report.getConfiguration(); + configurationDelegate.updateConfiguration(updatedConfiguration); + report.setStatus(ConfigurationUpdateStatus.SUCCESS); + } catch (Exception e) { + report.setErrorMessageFromThrowable(e); + report.setStatus(ConfigurationUpdateStatus.FAILURE); + } + } + + /** + * Invokes the passed operation on the managed resource + * @param name Name of the operation + * @param params The method parameters + * @return An operation result + * @see org.rhq.core.pluginapi.operation.OperationFacet + */ + public OperationResult invokeOperation(String name, Configuration params) throws Exception { + HadoopSupportedOperations operation = HadoopSupportedOperations.valueOf(name.toUpperCase()); + return operationsDelegate.invoke(operation, params); + } + + private File determineLogFile() { + String username = getResourceContext().getNativeProcess().getCredentialsName().getUser(); + String hostname = getResourceContext().getSystemInformation().getHostname(); + + String serverType = getServerType(); + + String name = "hadoop-" + username + "-" + serverType + "-" + hostname + ".log"; + + return new File(new File(getHomeDir(), "logs"), name); + } + + private String getServerType() { + String mainClass = getResourceContext().getPluginConfiguration().getSimpleValue("_mainClass"); + int dot = mainClass.lastIndexOf('.'); + String className = mainClass.substring(dot + 1); + + return className.toLowerCase(); + } + + private File getHomeDir() { + File homeDir = + new File(getResourceContext().getPluginConfiguration().getSimpleValue(HadoopServerDiscovery.HOME_DIR_PROPERTY)); + + if (!homeDir.exists()) { + throw new IllegalArgumentException("The configured home directory of this Hadoop instance (" + + homeDir.getAbsolutePath() + ") no longer exists."); + } + + if (!homeDir.isDirectory()) { + throw new IllegalArgumentException("The configured home directory of this Hadoop instance (" + + homeDir.getAbsolutePath() + ") is not a directory."); + } + + if (!homeDir.canRead()) { + throw new IllegalArgumentException("The configured home directory of this Hadoop instance (" + + homeDir.getAbsolutePath() + ") is not readable."); + } + + return homeDir; + } +} diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerConfigurationDelegate.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerConfigurationDelegate.java index cf4ddf8..4a42b3d 100644 --- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerConfigurationDelegate.java +++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerConfigurationDelegate.java @@ -170,7 +170,7 @@ public class HadoopServerConfigurationDelegate { private File getHomeDir() { File homeDir = - new File(componentContext.getPluginConfiguration().getSimpleValue(HadoopServiceDiscovery.HOME_DIR_PROPERTY)); + new File(componentContext.getPluginConfiguration().getSimpleValue(HadoopServerDiscovery.HOME_DIR_PROPERTY)); if (!homeDir.exists()) { throw new IllegalArgumentException("The configured home directory of this Hadoop instance (" diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerDiscovery.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerDiscovery.java new file mode 100644 index 0000000..c1512e9 --- /dev/null +++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServerDiscovery.java @@ -0,0 +1,153 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.plugins.hadoop; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.mc4j.ems.connection.support.metadata.LocalVMTypeDescriptor; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; +import org.rhq.core.pluginapi.inventory.ProcessScanResult; +import org.rhq.core.pluginapi.inventory.ResourceComponent; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.plugins.jmx.JMXDiscoveryComponent; + +/** + * Discover individual hadoop processes + * @author Heiko W. Rupp + * @author Lukas Krejci + */ +public class HadoopServerDiscovery implements ResourceDiscoveryComponent<ResourceComponent<?>> { + + private final Log log = LogFactory.getLog(HadoopServerDiscovery.class); + private static final String HADOOP_VERSION_MATCH = "hadoop-core-([0-9\\.]+)\\.jar"; + private static final Pattern HADOOP_VERSION_PATTERN = Pattern.compile(HADOOP_VERSION_MATCH); + private static final String MAIN_CLASS_PROPERTY = "_mainClass"; + public static final String HOME_DIR_PROPERTY = "hadoop.home.dir"; + private static final String HOME_DIR_OPTION = "-Dhadoop.home.dir"; + + public Set<DiscoveredResourceDetails> discoverResources( + ResourceDiscoveryContext<ResourceComponent<?>> resourceDiscoveryContext) + throws InvalidPluginConfigurationException, Exception { + + Set<DiscoveredResourceDetails> details = new HashSet<DiscoveredResourceDetails>(); + + List<ProcessScanResult> processScans = resourceDiscoveryContext.getAutoDiscoveredProcesses(); + ResourceType resourceType = resourceDiscoveryContext.getResourceType(); + String rtName = resourceType.getName(); + + for (ProcessScanResult psr : processScans) { + + String cwd = psr.getProcessInfo().getCurrentWorkingDirectory(); + + String homeDir = getHadoopHomeDirIfAvailable(psr.getProcessInfo().getCommandLine()); + if (homeDir == null) { + homeDir = cwd; + } + + String version = getVersion(homeDir); + + Configuration pluginConfiguration = resourceDiscoveryContext.getDefaultPluginConfiguration(); + + DiscoveredResourceDetails detail = new DiscoveredResourceDetails(resourceType, // ResourceType + homeDir, // ResourceKey + rtName, // resource name + version, // Version + rtName + " ( " + cwd + " )", // description + pluginConfiguration, psr.getProcessInfo() // process info + ); + + /* + * We'll connect to the discovered VM on the local host, so set the jmx connection + * properties accordingly. This may only work on JDK6+, but then JDK5 is deprecated + * anyway. + */ + pluginConfiguration.put(new PropertySimple(JMXDiscoveryComponent.COMMAND_LINE_CONFIG_PROPERTY, + pluginConfiguration.getSimpleValue(MAIN_CLASS_PROPERTY, null))); + pluginConfiguration.put(new PropertySimple(JMXDiscoveryComponent.CONNECTION_TYPE, + LocalVMTypeDescriptor.class.getName())); + + pluginConfiguration.put(new PropertySimple(HOME_DIR_PROPERTY, homeDir)); + + log.debug("Discovered " + detail); + + details.add(detail); + } + + return details; + } + + /** + * Get hadoop version + * from command line by looking at haoop-core-xx-core.jar + * @param commandLine Command line args for the java executable + * @return hdoop version string or null if it can not be determined + */ + private String getVersion(String hadoopHomeDir) { + + File homeDir = new File(hadoopHomeDir); + if (homeDir.isDirectory() && homeDir.canRead()) { + String[] foundCoreJars = homeDir.list(new FilenameFilter() { + public boolean accept(File dir, String name) { + return HADOOP_VERSION_PATTERN.matcher(name).matches(); + } + }); + + if (foundCoreJars == null || foundCoreJars.length == 0) { + return null; + } + + Matcher matcher = HADOOP_VERSION_PATTERN.matcher(foundCoreJars[0]); + if (matcher.matches()) { + return matcher.group(1); + } else { + return null; + } + } else { + return null; + } + } + + private String getHadoopHomeDirIfAvailable(String[] cmdline) { + for (int i = 0; i < cmdline.length; ++i) { + String cmd = cmdline[i]; + if (cmd.startsWith(HOME_DIR_OPTION)) { + int eqPos = cmd.indexOf('='); + if (eqPos > 0) { + return cmd.substring(eqPos + 1); + } + } + } + + return null; + } +} diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceComponent.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceComponent.java deleted file mode 100644 index 94c1b4a..0000000 --- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceComponent.java +++ /dev/null @@ -1,209 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.hadoop; - -import java.io.File; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.mc4j.ems.connection.EmsConnection; -import org.mc4j.ems.connection.bean.EmsBean; -import org.mc4j.ems.connection.bean.attribute.EmsAttribute; - -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.ConfigurationUpdateStatus; -import org.rhq.core.domain.measurement.AvailabilityType; -import org.rhq.core.domain.measurement.MeasurementDataNumeric; -import org.rhq.core.domain.measurement.MeasurementDataTrait; -import org.rhq.core.domain.measurement.MeasurementReport; -import org.rhq.core.domain.measurement.MeasurementScheduleRequest; -import org.rhq.core.pluginapi.configuration.ConfigurationFacet; -import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport; -import org.rhq.core.pluginapi.event.EventContext; -import org.rhq.core.pluginapi.event.log.Log4JLogEntryProcessor; -import org.rhq.core.pluginapi.event.log.LogFileEventPoller; -import org.rhq.core.pluginapi.inventory.ResourceComponent; -import org.rhq.core.pluginapi.inventory.ResourceContext; -import org.rhq.core.pluginapi.measurement.MeasurementFacet; -import org.rhq.core.pluginapi.operation.OperationFacet; -import org.rhq.core.pluginapi.operation.OperationResult; -import org.rhq.plugins.jmx.JMXComponent; -import org.rhq.plugins.jmx.JMXServerComponent; - -public class HadoopServiceComponent extends JMXServerComponent<ResourceComponent<?>> implements - JMXComponent<ResourceComponent<?>>, MeasurementFacet, OperationFacet, ConfigurationFacet { - - private static final Log LOG = LogFactory.getLog(HadoopServiceComponent.class); - - private static final String LOG_EVENT_TYPE = "logEntry"; - private static final String LOG_POLLING_INTERVAL_PROPERTY = "logPollingInterval"; - - private HadoopServerConfigurationDelegate configurationDelegate; - - private HadoopOperationsDelegate operationsDelegate; - - @Override - @SuppressWarnings({ "rawtypes", "unchecked" }) - public void start(ResourceContext context) throws Exception { - super.start(context); - configurationDelegate = new HadoopServerConfigurationDelegate(context); - this.operationsDelegate = new HadoopOperationsDelegate(context); - - EventContext events = context.getEventContext(); - if (events != null) { - File logFile = determineLogFile(); - int interval = Integer.parseInt(context.getPluginConfiguration().getSimpleValue(LOG_POLLING_INTERVAL_PROPERTY, "60")); - events.registerEventPoller(new LogFileEventPoller(events, LOG_EVENT_TYPE, logFile, new Log4JLogEntryProcessor(LOG_EVENT_TYPE, logFile)), interval); - } - } - - @Override - public void stop() { - EventContext events = getResourceContext().getEventContext(); - if (events != null) { - events.unregisterEventPoller(LOG_EVENT_TYPE); - } - super.stop(); - } - - /** - * Return availability of this resource - * @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability() - */ - @Override - public AvailabilityType getAvailability() { - return getResourceContext().getNativeProcess().isRunning() ? AvailabilityType.UP : AvailabilityType.DOWN; - } - - @Override - public EmsConnection getEmsConnection() { - EmsConnection conn = super.getEmsConnection(); - if (LOG.isTraceEnabled()) { - LOG.trace("EmsConnection is " + conn.toString()); - } - return conn; - - } - - /** - * Gather measurement data - * @see org.rhq.core.pluginapi.measurement.MeasurementFacet#getValues(org.rhq.core.domain.measurement.MeasurementReport, java.util.Set) - */ - public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { - for (MeasurementScheduleRequest request : metrics) { - String name = request.getName(); - int delimIndex = name.lastIndexOf(':'); - String beanName = name.substring(0, delimIndex); - String attributeName = name.substring(delimIndex + 1); - try { - EmsConnection emsConnection = getEmsConnection(); - EmsBean bean = emsConnection.getBean(beanName); - if (bean != null) { - bean.refreshAttributes(); - EmsAttribute attribute = bean.getAttribute(attributeName); - if (attribute != null) { - Object valueObject = attribute.refresh(); - if (valueObject instanceof Number) { - Number value = (Number) valueObject; - report.addData(new MeasurementDataNumeric(request, value.doubleValue())); - } else { - report.addData(new MeasurementDataTrait(request, valueObject.toString())); - } - } else { - LOG.warn("Attribute " + attributeName + " not found"); - } - } else { - LOG.warn("MBean " + beanName + " not found"); - } - } catch (Exception e) { - LOG.error("Failed to obtain measurement [" + name + "]", e); - } - } - } - - public Configuration loadResourceConfiguration() throws Exception { - return configurationDelegate.loadConfiguration(); - } - - public void updateResourceConfiguration(ConfigurationUpdateReport report) { - try { - Configuration updatedConfiguration = report.getConfiguration(); - configurationDelegate.updateConfiguration(updatedConfiguration); - report.setStatus(ConfigurationUpdateStatus.SUCCESS); - } catch (Exception e) { - report.setErrorMessageFromThrowable(e); - report.setStatus(ConfigurationUpdateStatus.FAILURE); - } - } - - /** - * Invokes the passed operation on the managed resource - * @param name Name of the operation - * @param params The method parameters - * @return An operation result - * @see org.rhq.core.pluginapi.operation.OperationFacet - */ - public OperationResult invokeOperation(String name, Configuration params) throws Exception { - HadoopSupportedOperations operation = HadoopSupportedOperations.valueOf(name.toUpperCase()); - return operationsDelegate.invoke(operation, params); - } - - private File determineLogFile() { - String username = getResourceContext().getNativeProcess().getCredentialsName().getUser(); - String hostname = getResourceContext().getSystemInformation().getHostname(); - - String serverType = getServerType(); - - String name = "hadoop-" + username + "-" + serverType + "-" + hostname + ".log"; - - return new File(new File(getHomeDir(), "logs"), name); - } - - private String getServerType() { - String mainClass = getResourceContext().getPluginConfiguration().getSimpleValue("_mainClass"); - int dot = mainClass.lastIndexOf('.'); - String className = mainClass.substring(dot + 1); - - return className.toLowerCase(); - } - - private File getHomeDir() { - File homeDir = - new File(getResourceContext().getPluginConfiguration().getSimpleValue(HadoopServiceDiscovery.HOME_DIR_PROPERTY)); - - if (!homeDir.exists()) { - throw new IllegalArgumentException("The configured home directory of this Hadoop instance (" - + homeDir.getAbsolutePath() + ") no longer exists."); - } - - if (!homeDir.isDirectory()) { - throw new IllegalArgumentException("The configured home directory of this Hadoop instance (" - + homeDir.getAbsolutePath() + ") is not a directory."); - } - - if (!homeDir.canRead()) { - throw new IllegalArgumentException("The configured home directory of this Hadoop instance (" - + homeDir.getAbsolutePath() + ") is not readable."); - } - - return homeDir; - } -} diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceDiscovery.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceDiscovery.java deleted file mode 100644 index e292168..0000000 --- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceDiscovery.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.plugins.hadoop; - -import java.io.File; -import java.io.FilenameFilter; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.mc4j.ems.connection.support.metadata.LocalVMTypeDescriptor; - -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; -import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; -import org.rhq.core.pluginapi.inventory.ProcessScanResult; -import org.rhq.core.pluginapi.inventory.ResourceComponent; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.plugins.jmx.JMXDiscoveryComponent; - -/** - * Discover individual hadoop processes - * @author Heiko W. Rupp - * @author Lukas Krejci - */ -public class HadoopServiceDiscovery implements ResourceDiscoveryComponent<ResourceComponent<?>> { - - private final Log log = LogFactory.getLog(HadoopServiceDiscovery.class); - private static final String HADOOP_VERSION_MATCH = "hadoop-core-([0-9\\.]+)\\.jar"; - private static final Pattern HADOOP_VERSION_PATTERN = Pattern.compile(HADOOP_VERSION_MATCH); - private static final String MAIN_CLASS_PROPERTY = "_mainClass"; - public static final String HOME_DIR_PROPERTY = "hadoop.home.dir"; - private static final String HOME_DIR_OPTION = "-Dhadoop.home.dir"; - - public Set<DiscoveredResourceDetails> discoverResources( - ResourceDiscoveryContext<ResourceComponent<?>> resourceDiscoveryContext) - throws InvalidPluginConfigurationException, Exception { - - Set<DiscoveredResourceDetails> details = new HashSet<DiscoveredResourceDetails>(); - - List<ProcessScanResult> processScans = resourceDiscoveryContext.getAutoDiscoveredProcesses(); - ResourceType resourceType = resourceDiscoveryContext.getResourceType(); - String rtName = resourceType.getName(); - - for (ProcessScanResult psr : processScans) { - - if (psr.getProcessScan().getName().equals(rtName)) { - - String cwd = psr.getProcessInfo().getCurrentWorkingDirectory(); - - String version = getVersion(cwd); - - Configuration pluginConfiguration = resourceDiscoveryContext.getDefaultPluginConfiguration(); - - //TODO is it ok to base the resource key on the current working directory as opposed to - //the configured hadoop.home.dir? How do they differ? - DiscoveredResourceDetails detail = new DiscoveredResourceDetails(resourceType, // ResourceType - rtName + ":" + cwd, // ResourceKey - rtName, // resource name - version, // Version - "Hadoop " + rtName + " ( " + cwd + " )", // description - pluginConfiguration, psr.getProcessInfo() // process info - ); - - /* - * We'll connect to the discovered VM on the local host, so set the jmx connection - * properties accordingly. This may only work on JDK6+, but then JDK5 is deprecated - * anyway. - */ - pluginConfiguration.put(new PropertySimple(JMXDiscoveryComponent.COMMAND_LINE_CONFIG_PROPERTY, - pluginConfiguration.getSimpleValue(MAIN_CLASS_PROPERTY, null))); - pluginConfiguration.put(new PropertySimple(JMXDiscoveryComponent.CONNECTION_TYPE, - LocalVMTypeDescriptor.class.getName())); - - String homeDir = getHadoopHomeDirIfAvailable(psr.getProcessInfo().getCommandLine()); - if (homeDir == null) { - homeDir = cwd; - } - - pluginConfiguration.put(new PropertySimple(HOME_DIR_PROPERTY, homeDir)); - - log.debug("Discovered " + detail); - - details.add(detail); - } - } - - return details; - } - - /** - * Get hadoop version - * from command line by looking at haoop-core-xx-core.jar - * @param commandLine Command line args for the java executable - * @return hdoop version string or null if it can not be determined - */ - private String getVersion(String hadoopHomeDir) { - - File homeDir = new File(hadoopHomeDir); - if (homeDir.isDirectory() && homeDir.canRead()) { - String[] foundCoreJars = homeDir.list(new FilenameFilter() { - public boolean accept(File dir, String name) { - return HADOOP_VERSION_PATTERN.matcher(name).matches(); - } - }); - - if (foundCoreJars == null || foundCoreJars.length == 0) { - return null; - } - - Matcher matcher = HADOOP_VERSION_PATTERN.matcher(foundCoreJars[0]); - if (matcher.matches()) { - return matcher.group(1); - } else { - return null; - } - } else { - return null; - } - } - - private String getHadoopHomeDirIfAvailable(String[] cmdline) { - for(int i = 0; i < cmdline.length; ++i) { - String cmd = cmdline[i]; - if (cmd.startsWith(HOME_DIR_OPTION)) { - int eqPos = cmd.indexOf('='); - if (eqPos > 0) { - return cmd.substring(eqPos + 1); - } - } - } - - return null; - } -} diff --git a/modules/plugins/hadoop/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/hadoop/src/main/resources/META-INF/rhq-plugin.xml index 819d265..1b3a372 100644 --- a/modules/plugins/hadoop/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/hadoop/src/main/resources/META-INF/rhq-plugin.xml @@ -5,7 +5,7 @@ <depends plugin="JMX" useClasses="true"/>  - <server name="NameNode" discovery="HadoopServiceDiscovery" class="HadoopServiceComponent"> + <server name="Hadoop NameNode" discovery="HadoopServerDiscovery" class="HadoopServerComponent"> <plugin-configuration> <c:simple-property name="hadoop.home.dir" displayName="Home Directory"/> <c:simple-property name="_mainClass" displayName="Main Class" readOnly="true" @@ -56,15 +56,15 @@ <event name="logEntry" description="an entry in a log file"/> <resource-configuration> - <c:simple-property name="conf/core-site.xml:fs.default.name" displayName="Namenode URI"/> + <c:simple-property name="conf/core-site.xml:fs.default.name" displayName="Namenode URI" required="false"/> <c:simple-property name="conf/hdfs-site.xml:dfs.name.dir" displayName="Local Namespace and Logs Storage Directory" - description="Path on the local filesystem where the NameNode stores the namespace and transactions logs persistently."/> + description="Path on the local filesystem where the NameNode stores the namespace and transactions logs persistently." required="false"/> <c:simple-property name="conf/hdfs-site.xml:dfs.block.size" displayName="HDFS Block Size" - description="Path on the local filesystem where the NameNode stores the namespace and transactions logs persistently. The value is in bytes."/> + description="The default block size for new files. The value is in bytes." required="false"/> </resource-configuration> </server> - <server name="SecondaryNameNode" discovery="HadoopServiceDiscovery" class="HadoopServiceComponent"> + <server name="Hadoop SecondaryNameNode" discovery="HadoopServerDiscovery" class="HadoopServerComponent"> <plugin-configuration> <c:simple-property name="_mainClass" displayName="Main Class" readOnly="true" default="org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode"/> @@ -73,7 +73,7 @@ </server>  - <server name="DataNode" discovery="HadoopServiceDiscovery" class="HadoopServiceComponent"> + <server name="DataNode" discovery="HadoopServerDiscovery" class="HadoopServerComponent"> <plugin-configuration> <c:simple-property name="_mainClass" displayName="Main Class" readOnly="true" default="org.apache.hadoop.hdfs.server.datanode.DataNode"/> @@ -90,12 +90,12 @@ <resource-configuration> <c:simple-property name="conf/hdfs-site.xml:dfs.data.dir" displayName="Storage Directory" - description="Comma separated list of paths on the local filesystem of a DataNode where it should store its blocks."/> + description="Comma separated list of paths on the local filesystem of a DataNode where it should store its blocks." required="false"/> </resource-configuration> </server>  - <server name="JobTracker" discovery="HadoopServiceDiscovery" class="HadoopServiceComponent"> + <server name="Hadoop JobTracker" discovery="HadoopServerDiscovery" class="HadoopServerComponent"> <plugin-configuration> <c:simple-property name="baseObjectName" defaultValue="hadoop:service=JobTracker"/> <c:simple-property name="_mainClass" displayName="Main Class" readOnly="true" @@ -136,17 +136,17 @@ <metric property="Hadoop:service=JobTracker,name=JobTrackerMetrics:trackers_decommissioned" displayName="Excluded Nodes"/> <resource-configuration> - <c:simple-property name="conf/mapred-site.xml:mapred.job.tracker" displayName="Host And Port" description="Host or IP and port of JobTracker. host:port pair."/> - <c:simple-property name="conf/mapred-site.xml:mapred.system.dir" displayName="System Files Location" description="Path on the HDFS where where the MapReduce framework stores system files e.g. /hadoop/mapred/system/. This is in the default filesystem (HDFS) and must be accessible from both the server and client machines."/> - <c:simple-property name="conf/mapred-site.xml:mapred.local.dir" displayName="Data Files Location" description="Comma-separated list of paths on the local filesystem where temporary MapReduce data is written. Multiple paths help spread disk i/o."/> - <c:simple-property name="conf/mapred-site.xml:mapred.tasktracker.map.tasks.maximum" displayName="Maximum Map Tasks" description="The maximum number of Map tasks, which are run simultaneously on a given TaskTracker, individually. Defaults to 2 (2 maps and 2 reduces), but vary it depending on your hardware."/> - <c:simple-property name="conf/mapred-site.xml:mapred.tasktracker.reduce.tasks.maximum" displayName="Maximum Reduce Tasks" description="The maximum number of Reduce tasks, which are run simultaneously on a given TaskTracker, individually. Defaults to 2 (2 maps and 2 reduces), but vary it depending on your hardware."/> - <c:simple-property name="conf/mapred-site.xml:mapred.queue.names" displayName="Job Queues" description="Comma separated list of queues to which jobs can be submitted. The MapReduce system always supports atleast one queue with the name as default. Hence, this parameter's value should always contain the string default. Some job schedulers supported in Hadoop, like the Capacity Scheduler, support multiple queues. If such a scheduler is being used, the list of configured queue names must be specified here. Once queues are defined, users can submit jobs to a queue using the property name mapred.job.queue.name in the job configuration. There could be a separate configuration file for configuring properties of these queues that is managed by the scheduler. Refer to the documentation of the scheduler for information on the same."/> + <c:simple-property name="conf/mapred-site.xml:mapred.job.tracker" displayName="Host And Port" description="Host or IP and port of JobTracker. host:port pair." required="false"/> + <c:simple-property name="conf/mapred-site.xml:mapred.system.dir" displayName="System Files Location" description="Path on the HDFS where where the MapReduce framework stores system files e.g. /hadoop/mapred/system/. This is in the default filesystem (HDFS) and must be accessible from both the server and client machines." required="false"/> + <c:simple-property name="conf/mapred-site.xml:mapred.local.dir" displayName="Data Files Location" description="Comma-separated list of paths on the local filesystem where temporary MapReduce data is written. Multiple paths help spread disk i/o." required="false"/> + <c:simple-property name="conf/mapred-site.xml:mapred.tasktracker.map.tasks.maximum" displayName="Maximum Map Tasks" description="The maximum number of Map tasks, which are run simultaneously on a given TaskTracker, individually. Defaults to 2 (2 maps and 2 reduces), but vary it depending on your hardware." required="false"/> + <c:simple-property name="conf/mapred-site.xml:mapred.tasktracker.reduce.tasks.maximum" displayName="Maximum Reduce Tasks" description="The maximum number of Reduce tasks, which are run simultaneously on a given TaskTracker, individually. Defaults to 2 (2 maps and 2 reduces), but vary it depending on your hardware." required="false"/> + <c:simple-property name="conf/mapred-site.xml:mapred.queue.names" displayName="Job Queues" description="Comma separated list of queues to which jobs can be submitted. The MapReduce system always supports atleast one queue with the name as default. Hence, this parameter's value should always contain the string default. Some job schedulers supported in Hadoop, like the Capacity Scheduler, support multiple queues. If such a scheduler is being used, the list of configured queue names must be specified here. Once queues are defined, users can submit jobs to a queue using the property name mapred.job.queue.name in the job configuration. There could be a separate configuration file for configuring properties of these queues that is managed by the scheduler. Refer to the documentation of the scheduler for information on the same." required="false"/> </resource-configuration> </server>  - <server name="TaskTracker" discovery="HadoopServiceDiscovery" class="HadoopServiceComponent"> + <server name="Hadoop TaskTracker" discovery="HadoopServerDiscovery" class="HadoopServerComponent"> <plugin-configuration> <c:simple-property name="_mainClass" displayName="Main Class" readOnly="true" default="org.apache.hadoop.mapred.TaskTracker"/>

11 years, 10 months

1
0
0 / 0

[rhq] Branch 'mazz/test-rhq-on-as7' - modules/enterprise

by mazz

modules/enterprise/gui/gwt-installer-war/pom.xml | 407 ------ modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/Address.java | 82 - modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java | 34 modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/FailureException.java | 77 - modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java | 304 ---- modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java | 110 - modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java | 651 ---------- modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/ServerPropertyRecordList.java | 62 modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java | 105 - modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerDetails.java | 115 - modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java | 53 modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/service/ManagementService.java | 100 - modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java | 161 -- modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java | 274 ---- modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/Installer.gwt.xml | 35 modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties | 21 modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/client/ServerPropertiesMessages.properties | 23 modules/enterprise/gui/gwt-installer-war/src/main/webapp/WEB-INF/classes/META-INF/services/org.jboss.msc.service.ServiceActivator | 1 modules/enterprise/gui/gwt-installer-war/src/main/webapp/WEB-INF/web.xml | 9 modules/enterprise/gui/gwt-installer-war/src/main/webapp/index.html | 45 modules/enterprise/gui/installer/pom.xml | 407 ++++++ modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/Address.java | 82 + modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java | 34 modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/FailureException.java | 77 + modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java | 304 ++++ modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java | 110 + modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java | 651 ++++++++++ modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/ServerPropertyRecordList.java | 62 modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java | 105 + modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerDetails.java | 115 + modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java | 53 modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/service/ManagementService.java | 100 + modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java | 161 ++ modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java | 274 ++++ modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/Installer.gwt.xml | 35 modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties | 21 modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/ServerPropertiesMessages.properties | 23 modules/enterprise/gui/installer/src/main/webapp/WEB-INF/classes/META-INF/services/org.jboss.msc.service.ServiceActivator | 1 modules/enterprise/gui/installer/src/main/webapp/WEB-INF/web.xml | 9 modules/enterprise/gui/installer/src/main/webapp/index.html | 45 modules/enterprise/gui/pom.xml | 2 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 8 42 files changed, 2674 insertions(+), 2674 deletions(-) New commits: commit 6f44c23c4d3eec665e4f7d278c76b6ed210f5525 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Aug 1 19:50:07 2012 -0400 rename the installer module and the war itself so it doesn't have the annoying -war.war file ending diff --git a/modules/enterprise/gui/gwt-installer-war/pom.xml b/modules/enterprise/gui/gwt-installer-war/pom.xml deleted file mode 100644 index 3b73c6c..0000000 --- a/modules/enterprise/gui/gwt-installer-war/pom.xml +++ /dev/null @@ -1,407 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.rhq</groupId> - <artifactId>rhq-parent</artifactId> - <version>4.5.0-SNAPSHOT</version> - <relativePath>../../../../pom.xml</relativePath> - </parent> - - <groupId>org.rhq</groupId> - <artifactId>rhq-gwt-installer-war</artifactId> - <packaging>war</packaging> - - <name>RHQ Enterprise GWT Installer GUI</name> - <description>The RHQ Enterprise GWT Installer GUI webapp</description> - - <properties> -  - <gwt.version>2.4.0</gwt.version> - <smartgwt.version>3.0</smartgwt.version> - <jboss.as.version>7.1.1.Final</jboss.as.version>  - <jboss.msc.version>1.0.2.GA</jboss.msc.version>  - <jboss.dmr.version>1.1.1.Final</jboss.dmr.version>  - - <installerGuiParams /> - <installerGuiRunTarget>'http://localhost:7080/rhq-gwt-installer/index.html${installerGuiParams}'</installerGuiRunTarget> - -  - <gwt-plugin.extraJvmArgs>-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=256M</gwt-plugin.extraJvmArgs> - <gwt-plugin.localWorkers>4</gwt-plugin.localWorkers> - - <gwt.userAgent>ie8,ie9,gecko1_8,safari,opera</gwt.userAgent> - <gwt.draftCompile>false</gwt.draftCompile> - <gwt.soyc>false</gwt.soyc> - <gwt.style>PRETTY</gwt.style> -  - <gwt.locale>en</gwt.locale> - <gwt.fallback.locale>en</gwt.fallback.locale> - - <enable-tags>true</enable-tags> - </properties> - - <dependencyManagement> - <dependencies> -  - <dependency> - <groupId>org.jboss.spec</groupId> - <artifactId>jboss-javaee-6.0</artifactId> - <version>3.0.0.Final</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.rhq</groupId> - <artifactId>rhq-core-dbutils</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> - </dependency> - -  - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${gwt.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.smartgwt</groupId> - <artifactId>smartgwt</artifactId> - <version>${smartgwt.version}</version> - </dependency> - -  - <dependency> - <groupId>org.jboss.spec.javax.servlet</groupId> - <artifactId>jboss-servlet-api_3.0_spec</artifactId> - <scope>provided</scope>  - </dependency> - -  - <dependency> - <groupId>org.jboss.msc</groupId> - <artifactId>jboss-msc</artifactId> - <version>${jboss.msc.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-dmr</artifactId> - <version>${jboss.dmr.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-naming</artifactId> - <version>${jboss.as.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-server</artifactId> - <version>${jboss.as.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-controller</artifactId> - <version>${jboss.as.version}</version> - <scope>provided</scope>  - </dependency> - - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-controller-client</artifactId> - <version>${jboss.as.version}</version> - <scope>provided</scope>  - </dependency> - - </dependencies> - - <build> - <finalName>rhq-gwt-installer</finalName> - - <resources> - <resource> - <targetPath>${project.build.directory}/generated-sources/gwt</targetPath> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.gwt.xml</include> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/java</directory> - <includes> - <include>**/*.java</include> - </includes> - </resource> - </resources> - - <plugins> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <version>2.4.0</version> - <configuration> - <noServer>true</noServer> - <inplace>false</inplace> - <logLevel>INFO</logLevel> - <runTarget>${installerGuiRunTarget}</runTarget> - <extraJvmArgs>${gwt-plugin.extraJvmArgs}</extraJvmArgs> - <localWorkers>${gwt-plugin.localWorkers}</localWorkers> - <draftCompile>${gwt.draftCompile}</draftCompile> - <soyc>${gwt.soyc}</soyc> - <buildOutputDirectory>target/gwtclasses</buildOutputDirectory> - <hostedWebapp>target/hostedWar</hostedWebapp> - <debugSuspend>false</debugSuspend> - <servicePattern>**/gwt/*GWTService.java</servicePattern> - <i18nMessagesBundle>org.rhq.enterprise.gui.installer.client.Messages</i18nMessagesBundle> - <i18nConstantsWithLookupBundle>org.rhq.enterprise.gui.installer.client.ServerPropertiesMessages</i18nConstantsWithLookupBundle> - <style>${gwt.style}</style> - <strict>true</strict> -  - <deploy>${project.build.directory}/gwt-deploy</deploy> - </configuration> - - <executions> - <execution> - <id>gwt-goals</id> - <goals> - <goal>compile</goal> - <goal>generateAsync</goal> - <goal>i18n</goal> - </goals> - </execution> - <execution> -  - <id>default-cli</id> - <goals> - <goal>debug</goal> - </goals> - <configuration> - <module>org.rhq.enterprise.gui.installer.Installer</module> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Build-Number>${buildNumber}</Build-Number> - <Dependencies>org.jboss.msc,org.jboss.as.controller-client,org.jboss.as.controller,org.jboss.as.server</Dependencies> - </manifestEntries> - </archive> - <webResources> - <resource> - <filtering>false</filtering> - <directory>${basedir}/src/main/webapp</directory> - </resource> - </webResources> - </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-gwt-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/target/generated-sources/gwt</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - - </build> - - <profiles> - <profile> - <id>dev</id> - - <properties> - <rhq.rootDir>../../../..</rhq.rootDir> - <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir> - <rhq.deploymentName>${project.build.finalName}.war</rhq.deploymentName> - <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/${rhq.deploymentName}</rhq.deploymentDir> - </properties> - - <build> - <plugins> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - - <execution> - <id>deploy-classes</id> - <phase>compile</phase> - <configuration> - <target> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> - <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> - <fileset dir="${basedir}/src/main/webapp" /> - </copy> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>deploy</id> - <phase>package</phase> - <configuration> - <target> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> - <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> - <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> - <fileset dir="${basedir}/target/${project.build.finalName}" /> - </copy> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - <execution> - <id>undeploy</id> - <phase>clean</phase> - <configuration> - <target> - <property name="deployment.dir" location="${rhq.deploymentDir}" /> - <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> - <delete dir="${deployment.dir}" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - - </executions> - </plugin> - - </plugins> - </build> - </profile> - -  - <profile> - <id>windows</id> - <activation> - <os> - <family>Windows</family> - </os> - </activation> - <properties> - <installerGuiRunTarget>http://localhost:7080//rhq-gwt-installer/index.html${installerGuiParams}</installerGuiRunTarget> - </properties> - </profile> - - <profile> - <id>msg</id> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <includes> - <include>org/rhq/enterprise/gui/installer/client/*Messages.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>disable-tags</id> - <activation> - <property> - <name>brew</name> - </property> - </activation> - <properties> - <enable.tags>false</enable.tags> - </properties> - </profile> - - </profiles> - - - <repositories> - <repository> - <id>smartgwt</id> - <name>SmartGWT Releases</name> - <url>http://www.smartclient.com/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - - <repository> - <id>codehaus</id> - <name>Codehaus Releases</name> - <url>http://repository.codehaus.org/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - - </repositories> - -</project> diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/Address.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/Address.java deleted file mode 100644 index 1a54d36..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/Address.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.common.jbossas.client.controller; - -import java.util.Arrays; - -import org.jboss.dmr.ModelNode; - -/** - * Identifies a managed resource. - * - * @author John Mazzitelli - */ -public class Address implements Cloneable { - private ModelNode addressNode; - - public static Address root() { - return new Address(); - } - - public Address() { - addressNode = new ModelNode(); - } - - public Address(String... addressParts) { - this(); - add(addressParts); - } - - public ModelNode getAddressNode() { - return addressNode; - } - - public Address add(String... addressParts) { - if (addressParts != null) { - if ((addressParts.length % 2) != 0) { - throw new IllegalArgumentException("address is incomplete: " + Arrays.toString(addressParts)); - } - - if (addressParts.length > 0) { - for (int i = 0; i < addressParts.length; i += 2) { - addressNode.add(addressParts[i], addressParts[i + 1]); - } - } - } - - return this; - } - - public Address add(String type, String name) { - addressNode.add(type, name); - return this; - } - - @Override - public Address clone() throws CloneNotSupportedException { - Address clone = new Address(); - clone.addressNode = addressNode.clone(); - return clone; - } - - @Override - public String toString() { - return addressNode.asString(); - } -} \ No newline at end of file diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java deleted file mode 100644 index fb3135c..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.common.jbossas.client.controller; - -import org.jboss.as.controller.client.ModelControllerClient; - -/** - * Provides convienence methods associated with datasource management. - * - * @author John Mazzitelli - */ -public class DatasourceJBossASClient extends JBossASClient { - - public DatasourceJBossASClient(ModelControllerClient client) { - super(client); - } - -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/FailureException.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/FailureException.java deleted file mode 100644 index 6dde289..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/FailureException.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.common.jbossas.client.controller; - -import org.jboss.dmr.ModelNode; - -/** - * Indicates a failed client request. - * - * @author John Mazzitelli - */ -public class FailureException extends RuntimeException { - private static final long serialVersionUID = 1L; - - private static final String GENERIC_ERROR = "Failed request"; - - public FailureException(ModelNode failureNode) { - super(buildErrorMessage(GENERIC_ERROR, failureNode)); - } - - public FailureException(ModelNode failureNode, String errMsg) { - super(buildErrorMessage(errMsg, failureNode)); - } - - public FailureException(ModelNode failureNode, Throwable cause) { - super(buildErrorMessage(GENERIC_ERROR, failureNode), cause); - } - - public FailureException(ModelNode failureNode, String errMsg, Throwable cause) { - super(buildErrorMessage(errMsg, failureNode), cause); - } - - public FailureException(String errMsg, Throwable cause) { - super((errMsg != null) ? errMsg : GENERIC_ERROR, cause); - } - - public FailureException(String errMsg) { - super((errMsg != null) ? errMsg : GENERIC_ERROR); - } - - public FailureException(Throwable cause) { - super(GENERIC_ERROR, cause); - } - - public FailureException() { - super(GENERIC_ERROR); - } - - private static final String buildErrorMessage(String errMsg, ModelNode failureNode) { - if (errMsg == null) { - errMsg = GENERIC_ERROR; - } - - String description = JBossASClient.getFailureDescription(failureNode); - if (description != null) { - errMsg += ": " + description; - } - - return errMsg; - } -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java deleted file mode 100644 index c8d040c..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java +++ /dev/null @@ -1,304 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.common.jbossas.client.controller; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.jboss.as.controller.client.ModelControllerClient; -import org.jboss.as.controller.client.OperationMessageHandler; -import org.jboss.dmr.ModelNode; - -/** - * A client that can be used to talk to a JBossAS server via the DMR/ModelControllerClient API. - * - * @author John Mazzitelli - */ -public class JBossASClient { - - // protected to allow subclasses to have a logger, too, without explicitly declaring one themselves - protected final Log log = LogFactory.getLog(this.getClass()); - - public static final String BATCH = "composite"; - public static final String BATCH_STEPS = "steps"; - public static final String OPERATION = "operation"; - public static final String ADDRESS = "address"; - public static final String RESULT = "result"; - public static final String OUTCOME = "outcome"; - public static final String OUTCOME_SUCCESS = "success"; - public static final String SUBSYSTEM = "subsystem"; - public static final String FAILURE_DESCRIPTION = "failure-description"; - public static final String NAME = "name"; - public static final String VALUE = "value"; - public static final String READ_ATTRIBUTE = "read-attribute"; - public static final String READ_RESOURCE = "read-resource"; - public static final String WRITE_ATTRIBUTE = "write-attribute"; - public static final String ADD = "add"; - - private ModelControllerClient client; - - public JBossASClient(ModelControllerClient client) { - this.client = client; - } - - ///////////////////////////////////////////////////////////////// - // Some static methods useful for convienence - - /** - * Convienence method that allows you to create request that reads a single attribute - * value to a resource. - * - * @param attributeName the name of the attribute whose value is to be read - * @param address identifies the resource - * @return the request - */ - public static ModelNode createReadAttributeRequest(String attributeName, Address address) { - return createReadAttributeRequest(false, attributeName, address); - } - - /** - * Convienence method that allows you to create request that reads a single attribute - * value to a resource. - * - * @param runtime if <code>true</code>, the attribute is a runtime attribute - * @param attributeName the name of the attribute whose value is to be read - * @param address identifies the resource - * @return the request - */ - public static ModelNode createReadAttributeRequest(boolean runtime, String attributeName, Address address) { - ModelNode op = createRequest(READ_ATTRIBUTE, address); - op.get("include-runtime").set(runtime); - op.get(NAME).set(attributeName); - return op; - } - - /** - * Convienence method that allows you to create request that writes a single attribute's - * string value to a resource. - * - * @param attributeName the name of the attribute whose value is to be written - * @param attributeValue the attribute value that is to be written - * @param address identifies the resource - * @return the request - */ - public static ModelNode createWriteAttributeRequest(String attributeName, String attributeValue, Address address) { - ModelNode op = createRequest(WRITE_ATTRIBUTE, address); - op.get(NAME).set(attributeName); - op.get(VALUE).set(attributeValue); - return op; - } - - /** - * Convienence method that builds a partial operation request node. - * - * @param operation the operation to be requested - * @param address identifies the target resource - * @return the partial operation request node - caller should fill this in further to complete the node - */ - public static ModelNode createRequest(String operation, Address address) { - final ModelNode request = new ModelNode(); - request.get(OPERATION).set(operation); - request.get(ADDRESS).set(address.getAddressNode()); - return request; - } - - /** - * Creates a batch of operations that can be atomically invoked. - * - * @param steps the different operation steps of the batch - * - * @return the batch operation node - */ - public static ModelNode createBatchRequest(ModelNode... steps) { - final ModelNode composite = new ModelNode(); - composite.get(OPERATION).set(BATCH); - composite.get(ADDRESS).setEmptyList(); - final ModelNode stepsNode = composite.get(BATCH_STEPS); - for (ModelNode step : steps) { - stepsNode.add(step); - } - return composite; - } - - /** - * If the given node has a result list, that list will be returned - * with the values as Strings. Otherwise, an empty list is returned. - * - * @param operationResult the node to examine - * @return the result list as Strings if there is a list, empty otherwise - */ - public static List<String> getResultListAsStrings(ModelNode operationResult) { - if (!operationResult.hasDefined(RESULT)) { - return Collections.emptyList(); - } - - List<ModelNode> nodeList = operationResult.get(RESULT).asList(); - if (nodeList.isEmpty()) { - return Collections.emptyList(); - } - - List<String> list = new ArrayList<String>(nodeList.size()); - for (ModelNode node : nodeList) { - list.add(node.asString()); - } - - return list; - } - - /** - * If the given node has results, those results are returned in a ModelNode. - * Otherwise, an empty node is returned. - * - * @param operationResult the node to examine - * @return the results as a ModelNode - */ - public static ModelNode getResults(ModelNode operationResult) { - if (!operationResult.hasDefined(RESULT)) { - return new ModelNode(); - } - - return operationResult.get(RESULT); - } - - /** - * Examines the given node's result list and if the item is found, returns true. - * - * @param operationResult the node to examine - * @param item the item to look for in the node's result list - * @return true if the node has a result list and it contains the item; false otherwise - */ - public static boolean listContains(ModelNode operationResult, String item) { - if (!operationResult.hasDefined(RESULT)) { - return false; - } - - List<ModelNode> nodeList = operationResult.get(RESULT).asList(); - if (nodeList.isEmpty()) { - return false; - } - - for (ModelNode node : nodeList) { - if (node.asString().equals(item)) { - return true; - } - } - - return false; - } - - /** - * Returns <code>true</code> if the operation was a success; <code>false</code> otherwise. - * - * @param operationResult the operation result to test - * @return the success or failure flag of the result - */ - public static boolean isSuccess(ModelNode operationResult) { - if (operationResult != null) { - return operationResult.hasDefined(OUTCOME) - && operationResult.get(OUTCOME).asString().equals(OUTCOME_SUCCESS); - } - return false; - } - - /** - * If the operation result was a failure, this returns the failure description if there is one. - * A generic failure message will be returned if the operation was a failure but has no failure - * description. A <code>null</code> is returned if the operation was a success. - * - * @param operationResult the operation whose failure description is to be returned - * @return the failure description of <code>null</code> if the operation was a success - */ - public static String getFailureDescription(ModelNode operationResult) { - if (isSuccess(operationResult)) { - return null; - } - if (operationResult != null) { - ModelNode descr = operationResult.get(FAILURE_DESCRIPTION); - if (descr != null) { - return descr.asString(); - } - } - return "Unknown failure"; - } - - ///////////////////////////////////////////////////////////////// - // Non-static methods that need the client - - public ModelControllerClient getModelControllerClient() { - return client; - } - - /** - * Convienence method that executes the request. - * - * @param request - * @return results - * @throws Exception - */ - public ModelNode execute(ModelNode request) throws Exception { - try { - return getModelControllerClient().execute(request, OperationMessageHandler.logging); - } catch (Exception e) { - log.error("Failed to execute request", e); - throw e; - } - } - - /** - * Convienence method that allows you to obtain a single attribute's string value from - * a resource. - * - * @param attributeName the attribute whose value is to be returned - * @param address identifies the resource - * @return the attribute value - * - * @throws Exception if failed to obtain the attribute value - */ - public String getStringAttribute(String attributeName, Address address) throws Exception { - return getStringAttribute(false, attributeName, address); - } - - /** - * Convienence method that allows you to obtain a single attribute's string value from - * a resource. - * - * @param runtime if <code>true</code>, the attribute to be retrieved is a runtime attribute - * @param attributeName the attribute whose value is to be returned - * @param address identifies the resource - * @return the attribute value - * - * @throws Exception if failed to obtain the attribute value - */ - public String getStringAttribute(boolean runtime, String attributeName, Address address) throws Exception { - ModelNode op = createReadAttributeRequest(runtime, attributeName, address); - ModelNode results = execute(op); - if (isSuccess(results)) { - ModelNode version = getResults(results); - String attributeValue = version.asString(); - return attributeValue; - } else { - throw new FailureException(results, "Failed to get attribute [" + attributeName + "] from [" + address - + "]"); - } - } -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java deleted file mode 100644 index a73ba79..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.common.jbossas.client.controller; - -import java.util.List; - -import org.jboss.as.controller.client.ModelControllerClient; -import org.jboss.dmr.ModelNode; - -/** - * Provides convienence methods associated with security domain management. - * - * @author John Mazzitelli - */ -public class SecurityDomainJBossASClient extends JBossASClient { - - public static final String SUBSYSTEM_SECURITY = "security"; - public static final String SECURITY_DOMAIN = "security-domain"; - public static final String CACHE_TYPE = "cache-type"; - public static final String AUTHENTICATION = "authentication"; - public static final String LOGIN_MODULES = "login-modules"; - public static final String CLASSIC = "classic"; - public static final String CODE = "code"; - public static final String FLAG = "flag"; - public static final String MODULE_OPTIONS = "module-options"; - public static final String USERNAME = "username"; - public static final String PASSWORD = "password"; - - public SecurityDomainJBossASClient(ModelControllerClient client) { - super(client); - } - - /** - * Checks to see if there is already a security domain with the given name. - * - * @param securityDomainName the name to check - * @return true if there is a security domain with the given name already in existence - */ - public boolean isSecurityDomain(String securityDomainName) throws Exception { - Address addr = Address.root().add(SUBSYSTEM, SUBSYSTEM_SECURITY); - ModelNode queryNode = createRequest(READ_RESOURCE, addr); - ModelNode results = execute(queryNode); - if (isSuccess(results)) { - ModelNode domains = getResults(results).get(SECURITY_DOMAIN); - List<ModelNode> list = domains.asList(); - for (ModelNode domain : list) { - if (domain.has(securityDomainName)) { - return true; - } - } - return false; - } else { - throw new FailureException(results, "Failed to get security domains"); - } - } - - /** - * Convienence method that builds a request which can create a new security-domain - * using the SecureIdentity authentication method. This is used when you want - * to obfuscate a database password in the configuration. - * - * @param securityDomainName the name of the new security domain - * @param username the username associated with the security domain - * @param password the value of the password to store in the configuration (e.g. the obfuscated password itself) - * - * @throws Exception if failed to create security domain - */ - public void createNewSecureIdentitySecurityDomainRequest(String securityDomainName, String username, String password) - throws Exception { - - Address addr = Address.root().add(SUBSYSTEM, SUBSYSTEM_SECURITY, SECURITY_DOMAIN, securityDomainName); - ModelNode addTopNode = createRequest(ADD, addr); - addTopNode.get(CACHE_TYPE).set("default"); - - ModelNode addAuthNode = createRequest(ADD, addr.clone().add(AUTHENTICATION, CLASSIC)); - ModelNode loginModulesNode = addAuthNode.get(LOGIN_MODULES); - ModelNode loginModule = new ModelNode(); - loginModule.get(CODE).set("SecureIdentity"); - loginModule.get(FLAG).set("required"); - ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS); - moduleOptions.setEmptyList(); - moduleOptions.add(USERNAME, username); - moduleOptions.add(PASSWORD, password); - loginModulesNode.add(loginModule); - - ModelNode batch = createBatchRequest(addTopNode, addAuthNode); - ModelNode results = execute(batch); - if (!isSuccess(results)) { - throw new FailureException(results, "Failed to create security domain [" + securityDomainName + "]"); - } - - return; - } -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java deleted file mode 100644 index 0fc0215..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java +++ /dev/null @@ -1,651 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.installer.client; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; - -import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.Element; -import com.google.gwt.user.client.DOM; -import com.google.gwt.user.client.rpc.AsyncCallback; -import com.smartgwt.client.types.Alignment; -import com.smartgwt.client.types.Side; -import com.smartgwt.client.types.VerticalAlignment; -import com.smartgwt.client.util.SC; -import com.smartgwt.client.widgets.Button; -import com.smartgwt.client.widgets.Canvas; -import com.smartgwt.client.widgets.IButton; -import com.smartgwt.client.widgets.Label; -import com.smartgwt.client.widgets.events.ClickEvent; -import com.smartgwt.client.widgets.events.ClickHandler; -import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.fields.ButtonItem; -import com.smartgwt.client.widgets.form.fields.FormItem; -import com.smartgwt.client.widgets.form.fields.FormItemIcon; -import com.smartgwt.client.widgets.form.fields.PasswordItem; -import com.smartgwt.client.widgets.form.fields.SelectItem; -import com.smartgwt.client.widgets.form.fields.SpacerItem; -import com.smartgwt.client.widgets.form.fields.SpinnerItem; -import com.smartgwt.client.widgets.form.fields.TextItem; -import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; -import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; -import com.smartgwt.client.widgets.form.fields.events.IconClickEvent; -import com.smartgwt.client.widgets.form.fields.events.IconClickHandler; -import com.smartgwt.client.widgets.grid.ListGrid; -import com.smartgwt.client.widgets.grid.ListGridField; -import com.smartgwt.client.widgets.grid.events.EditCompleteEvent; -import com.smartgwt.client.widgets.grid.events.EditCompleteHandler; -import com.smartgwt.client.widgets.layout.VLayout; -import com.smartgwt.client.widgets.tab.Tab; -import com.smartgwt.client.widgets.tab.TabSet; -import com.smartgwt.client.widgets.toolbar.ToolStrip; - -import org.rhq.enterprise.gui.installer.client.gwt.InstallerGWTServiceAsync; -import org.rhq.enterprise.gui.installer.client.shared.ServerDetails; -import org.rhq.enterprise.gui.installer.client.shared.ServerProperties; - -/** - * The GWT {@link EntryPoint entry point} to the RHQ Installer GUI. - * - * @author John Mazzitelli - */ -public class Installer implements EntryPoint { - - // This must come first to ensure proper I18N class loading for dev mode - public static final Messages MSG = GWT.create(Messages.class); - public static final ServerPropertiesMessages PROPS_MSG = GWT.create(ServerPropertiesMessages.class); - - private static final String NEW_SERVER_TO_REGISTER = "*new*"; - - private final InstallerGWTServiceAsync installerService = InstallerGWTServiceAsync.Util.getInstance(); - private final ServerPropertyRecordList serverProperties = new ServerPropertyRecordList(); - private final HashMap<String, String> originalProperties = new HashMap<String, String>(); - private final LinkedHashMap<String, String> registeredServerNames = new LinkedHashMap<String, String>(); - - private ListGrid advancedPropertyItemGrid; - private Button mainInstallButton; - private TextItem dbConnectionUrl; - private TextItem dbUsername; - private PasswordItem dbPassword; - private SelectItem dbExistingSchemaOption; - private ButtonItem testConnectionButton; - private SelectItem dbType; - private TextItem serverSettingServerName; - private TextItem serverSettingPublicAddress; - private SpinnerItem serverSettingWebHttpPort; - private SpinnerItem serverSettingWebSecureHttpPort; - private SelectItem registeredServersSelection; - private TextItem serverSettingEmailSMTPHostname; - private TextItem serverSettingEmailFromAddress; - - public void onModuleLoad() { - Canvas header = createHeader(); - mainInstallButton = createMainInstallButton(); - Canvas tabSet = createTabSet(); - - VLayout layout = new VLayout(); - layout.setWidth100(); - layout.setHeight100(); - layout.setLayoutMargin(10); - layout.setMembersMargin(5); - layout.setDefaultLayoutAlign(Alignment.CENTER); - layout.addMember(header); - layout.addMember(mainInstallButton); - layout.addMember(tabSet); - layout.draw(); - - // Remove loading image in case we don't completely cover it - Element loadingPanel = DOM.getElementById("Loading-Panel"); - loadingPanel.removeFromParent(); - - // get the server properties from the server - loadServerProperties(); - - } - - private void updateServerProperty(String name, Object value) { - serverProperties.putServerProperty(name, value == null ? "" : value.toString()); - refreshAdvancedView(); - } - - private void loadServerProperties() { - // load the initial server properties - installerService.getServerProperties(new AsyncCallback<HashMap<String, String>>() { - public void onSuccess(HashMap<String, String> result) { - if (result.size() == 0) { - SC.say("Initial server properties are missing."); - } - serverProperties.replaceServerProperties(result); - - // remember these original properties in case the user wants to reset them back - originalProperties.clear(); - originalProperties.putAll(result); - - // refresh the simple view with the new data - refreshSimpleView(); - - // refresh the advanced view with the new data - refreshAdvancedView(); - } - - public void onFailure(Throwable caught) { - SC.say("Cannot load properties: " + caught); - } - }); - } - - private void refreshSimpleView() { - Map<String, String> props = serverProperties.getMap(); - - // DB SETTINGS - dbType.setValue(props.get(ServerProperties.PROP_DATABASE_TYPE)); - dbConnectionUrl.setValue(props.get(ServerProperties.PROP_DATABASE_CONNECTION_URL)); - dbUsername.setValue(props.get(ServerProperties.PROP_DATABASE_USERNAME)); - // do not prefill the database password - force the user to know it and type it in for security purposes - - // SERVER SETTINGS - serverSettingServerName.setValue(props.get(ServerProperties.PROP_HIGH_AVAILABILITY_NAME)); - serverSettingWebHttpPort.setValue(props.get(ServerProperties.PROP_WEB_HTTP_PORT)); - serverSettingWebSecureHttpPort.setValue(props.get(ServerProperties.PROP_WEB_HTTPS_PORT)); - serverSettingEmailSMTPHostname.setValue(props.get(ServerProperties.PROP_EMAIL_SMTP_HOST)); - serverSettingEmailFromAddress.setValue(props.get(ServerProperties.PROP_EMAIL_FROM_ADDRESS)); - - forceAnotherTestConnection(); - } - - private void refreshAdvancedView() { - advancedPropertyItemGrid.markForRedraw(); - } - - private Canvas createHeader() { - ToolStrip strip = new ToolStrip(); - strip.setWidth100(); - strip.setAlign(Alignment.CENTER); - - Label title = new Label(); - title.setWidth100(); - title.setHeight100(); - title.setWrap(false); - title.setValign(VerticalAlignment.CENTER); - title.setAlign(Alignment.CENTER); - title.setContents("<span style=\"font-size:16pt;font-weight:bold;\">" + MSG.welcome_title() + "</span>"); - strip.addMember(title); - return strip; - } - - private Button createMainInstallButton() { - Button installButton = new Button(MSG.button_startInstallation()); - installButton.setWrap(false); - installButton.setAutoFit(true); - installButton.setDisabled(true); // we can't allow the user to install yet - installButton.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - SC.say("TODO: this should start the install"); - } - }); - - return installButton; - } - - private TabSet createTabSet() { - final TabSet topTabSet = new TabSet(); - topTabSet.setTabBarPosition(Side.TOP); - topTabSet.setTabBarAlign(Side.LEFT); - topTabSet.setWidth("90%"); - - final Tab welcomeTab = new Tab(MSG.tab_welcome()); - Label welcomeLabel = new Label(MSG.tab_welcome_content()); - welcomeTab.setPane(welcomeLabel); - - final Tab simpleViewTab = new Tab(MSG.tab_simpleView()); - Canvas simpleForm = createSimpleForm(); - simpleViewTab.setPane(simpleForm); - - final Tab advancedViewTab = new Tab(MSG.tab_advancedView()); - Canvas advancedView = createAdvancedView(); - advancedViewTab.setPane(advancedView); - - topTabSet.addTab(welcomeTab); - topTabSet.addTab(simpleViewTab); - topTabSet.addTab(advancedViewTab); - - return topTabSet; - } - - private Canvas createAdvancedView() { - VLayout layout = new VLayout(); - - ToolStrip strip = new ToolStrip(); - strip.setWidth100(); - - IButton saveButton = new IButton(MSG.button_save()); - saveButton.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - installerService.saveServerProperties(serverProperties.getMap(), new AsyncCallback<Void>() { - public void onSuccess(Void result) { - originalProperties.clear(); - originalProperties.putAll(serverProperties.getMap()); - SC.say("Properties saved to server"); - } - - public void onFailure(Throwable caught) { - SC.say("Failed to save properties to server"); - } - }); - } - }); - IButton resetButton = new IButton(MSG.button_reset()); - resetButton.addClickHandler(new ClickHandler() { - public void onClick(ClickEvent event) { - serverProperties.replaceServerProperties(originalProperties); - refreshAdvancedView(); - } - }); - strip.addMember(saveButton); - strip.addMember(resetButton); - layout.addMember(strip); - - advancedPropertyItemGrid = new ListGrid(); - advancedPropertyItemGrid.setWidth100(); - advancedPropertyItemGrid.setHeight100(); - advancedPropertyItemGrid.setData(serverProperties); - - ListGridField nameField = new ListGridField(ServerPropertyRecordList.PROPERTY_NAME, MSG.property_name_label()); - nameField.setCanEdit(false); - - ListGridField valueField = new ListGridField(ServerPropertyRecordList.PROPERTY_VALUE, - MSG.property_value_label()); - valueField.setCanEdit(true); - - advancedPropertyItemGrid.setFields(nameField, valueField); - advancedPropertyItemGrid.setSortField(ServerPropertyRecordList.PROPERTY_NAME); - - advancedPropertyItemGrid.addEditCompleteHandler(new EditCompleteHandler() { - public void onEditComplete(EditCompleteEvent event) { - String newValue = (String) event.getNewValues().values().iterator().next().toString(); - String changedProperty = event.getOldRecord().getAttribute(ServerPropertyRecordList.PROPERTY_NAME); - serverProperties.getMap().put(changedProperty, newValue); // we need this to be reflected in the internal map - refreshSimpleView(); - } - }); - - layout.addMember(advancedPropertyItemGrid); - - return layout; - } - - private Canvas createSimpleForm() { - - final int fieldWidth = 300; - - //////////////////////////////////////////////////////// - // The Database form - - final DynamicForm databaseForm = new DynamicForm(); - databaseForm.setAutoWidth(); - databaseForm.setPadding(5); - databaseForm.setCellPadding(5); - databaseForm.setWrapItemTitles(false); - databaseForm.setIsGroup(true); - databaseForm.setGroupTitle(MSG.tab_simpleView_database()); - - dbConnectionUrl = new TextItem(ServerProperties.PROP_DATABASE_CONNECTION_URL, - PROPS_MSG.rhq_server_database_connection_url()); - dbConnectionUrl.setWidth(fieldWidth); - dbConnectionUrl.setValue("jdbc:postgresql://127.0.0.1:5432/rhq"); - dbConnectionUrl.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - updateServerProperty(ServerProperties.PROP_DATABASE_CONNECTION_URL, String.valueOf(event.getValue())); - forceAnotherTestConnection(); - } - }); - - dbUsername = new TextItem(ServerProperties.PROP_DATABASE_USERNAME, - PROPS_MSG.rhq_server_database_user_name()); - dbUsername.setWidth(fieldWidth); - dbUsername.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - updateServerProperty(ServerProperties.PROP_DATABASE_USERNAME, String.valueOf(event.getValue())); - forceAnotherTestConnection(); - } - }); - - dbPassword = new PasswordItem(ServerProperties.PROP_DATABASE_PASSWORD, - PROPS_MSG.rhq_server_database_password()); - dbPassword.setWidth(fieldWidth); - dbPassword.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - updateServerProperty(ServerProperties.PROP_DATABASE_PASSWORD, String.valueOf(event.getValue())); - forceAnotherTestConnection(); - } - }); - - dbExistingSchemaOption = new SelectItem("existingSchemaOption", MSG.schema_update_question()); - final LinkedHashMap<String, String> schemaOpt = new LinkedHashMap<String, String>(); - schemaOpt.put("keep", MSG.schema_update_keep()); - schemaOpt.put("overwrite", MSG.schema_update_overwrite()); - schemaOpt.put("skip", MSG.schema_update_skip()); - dbExistingSchemaOption.setValueMap(schemaOpt); - dbExistingSchemaOption.setDefaultToFirstOption(true); - dbExistingSchemaOption.setVisible(false); - dbExistingSchemaOption.setWidth(fieldWidth); - dbExistingSchemaOption.setWrapTitle(true); - dbExistingSchemaOption.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - if (registeredServersSelection != null) { - String selected = event.getValue().toString(); - if ("overwrite".equals(selected)) { - registeredServersSelection.setValue((String) null); - registeredServersSelection.disable(); - } else { - registeredServersSelection.enable(); - } - } - } - }); - - testConnectionButton = new ButtonItem("testConnectionButton", MSG.button_testConnection()); - testConnectionButton.addClickHandler(new com.smartgwt.client.widgets.form.fields.events.ClickHandler() { - public void onClick(com.smartgwt.client.widgets.form.fields.events.ClickEvent event) { - final Conn conn = new Conn(); - installerService.testConnection(conn.url(), conn.username(), conn.password(), - new AsyncCallback<String>() { - public void onSuccess(String result) { - if (result != null) { - forceAnotherTestConnection(); - testConnectionButton.setIcon("[SKIN]/actions/exclamation.png"); - SC.say("Could not connect to the database: " + result); - } else { - connectedToDatabase(); - } - } - - public void onFailure(Throwable caught) { - forceAnotherTestConnection(); - testConnectionButton.setIcon("[SKIN]/actions/exclamation.png"); - SC.say("Failed to test connection: " + caught.toString()); - } - }); - - } - }); - - dbType = new SelectItem(ServerProperties.PROP_DATABASE_TYPE, - PROPS_MSG.rhq_server_database_type_mapping()); - final LinkedHashMap<String, String> dbs = new LinkedHashMap<String, String>(); - dbs.put("PostgreSQL", "PostgreSQL"); - dbs.put("Oracle", "Oracle"); - dbType.setValueMap(dbs); - dbType.setDefaultToFirstOption(true); - dbType.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - forceAnotherTestConnection(); - - String newDBType = (String) event.getValue(); - String newURL = ""; - String dialect = ""; - String quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.StdJDBCDelegate"; - String quartzSelectWithLockSQL = "SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE"; - String quartzLockHandlerClass = "org.quartz.impl.jdbcjobstore.StdRowLockSemaphore"; - - if ("PostgreSQL".equalsIgnoreCase(newDBType)) { - newURL = "jdbc:postgresql://127.0.0.1:5432/rhq"; - dialect = "org.hibernate.dialect.PostgreSQLDialect"; - quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate"; - } else if ("Oracle".equalsIgnoreCase(newDBType)) { - newURL = "jdbc:oracle:thin:@127.0.0.1:1521:rhq"; - dialect = "org.hibernate.dialect.Oracle10gDialect"; - quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.oracle.OracleDelegate"; - } - dbConnectionUrl.setValue(newURL); - - updateServerProperty(ServerProperties.PROP_DATABASE_CONNECTION_URL, newURL); - updateServerProperty(ServerProperties.PROP_DATABASE_HIBERNATE_DIALECT, dialect); - updateServerProperty(ServerProperties.PROP_QUARTZ_DRIVER_DELEGATE_CLASS, quartzDriverDelegateClass); - updateServerProperty(ServerProperties.PROP_QUARTZ_SELECT_WITH_LOCK_SQL, quartzSelectWithLockSQL); - updateServerProperty(ServerProperties.PROP_QUARTZ_LOCK_HANDLER_CLASS, quartzLockHandlerClass); - updateServerProperty(ServerProperties.PROP_DATABASE_TYPE, newDBType); // this refreshes the advanced view, too - } - }); - - // use this to move the button over to the second column - it looks better this way - SpacerItem buttonSpacer = new SpacerItem(); - buttonSpacer.setEndRow(false); - testConnectionButton.setStartRow(false); - - databaseForm.setFields(dbType, dbConnectionUrl, dbUsername, dbPassword, buttonSpacer, testConnectionButton, - dbExistingSchemaOption); - - //////////////////////////////////////////////////////// - // The Server Settings form - - final DynamicForm serverSettingsForm = new DynamicForm(); - serverSettingsForm.setPadding(5); - serverSettingsForm.setCellPadding(5); - serverSettingsForm.setAutoWidth(); - serverSettingsForm.setIsGroup(true); - serverSettingsForm.setWrapItemTitles(false); - serverSettingsForm.setGroupTitle(MSG.tab_simpleView_serverSettings()); - - serverSettingServerName = new TextItem(ServerProperties.PROP_HIGH_AVAILABILITY_NAME, - PROPS_MSG.rhq_server_high_availability_name()); - serverSettingServerName.setWidth(fieldWidth); - serverSettingServerName.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - updateServerProperty(ServerProperties.PROP_HIGH_AVAILABILITY_NAME, String.valueOf(event.getValue())); - if (registeredServersSelection != null) { - registeredServersSelection.setValue((String) null); // flip it back to *new* since the server name changed - } - } - }); - - serverSettingPublicAddress = new TextItem("serverPublicAddress", - MSG.tab_simpleView_serverSettings_publicAddress()); - serverSettingPublicAddress.setWidth(fieldWidth); - - serverSettingWebHttpPort = new SpinnerItem(ServerProperties.PROP_WEB_HTTP_PORT, - PROPS_MSG.rhq_server_startup_web_http_port()); - serverSettingWebHttpPort.setWidth(fieldWidth); - serverSettingWebHttpPort.setMin(1); - serverSettingWebHttpPort.setMax(65535); - serverSettingWebHttpPort.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - updateServerProperty(ServerProperties.PROP_WEB_HTTP_PORT, String.valueOf(event.getValue())); - } - }); - - serverSettingWebSecureHttpPort = new SpinnerItem(ServerProperties.PROP_WEB_HTTPS_PORT, - PROPS_MSG.rhq_server_startup_web_https_port()); - serverSettingWebSecureHttpPort.setWidth(fieldWidth); - serverSettingWebSecureHttpPort.setMin(1); - serverSettingWebSecureHttpPort.setMax(65535); - serverSettingWebSecureHttpPort.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - updateServerProperty(ServerProperties.PROP_WEB_HTTPS_PORT, String.valueOf(event.getValue())); - } - }); - - registeredServersSelection = new SelectItem("registeredServersSelectItem", - MSG.tab_simpleView_serverSettings_registeredServers()); - registeredServersSelection.setWidth(fieldWidth); - addContextualHelp(registeredServersSelection, MSG.help_registeredServers()); - registeredServerNames.put(NEW_SERVER_TO_REGISTER, - MSG.tab_simpleView_serverSettings_registeredServers_newServer()); - registeredServersSelection.setValueMap(registeredServerNames); - registeredServersSelection.setDefaultToFirstOption(true); - registeredServersSelection.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - final String selectedServerName = String.valueOf(event.getValue()); - final boolean newServer = NEW_SERVER_TO_REGISTER.equals(selectedServerName); - if (newServer) { - serverSettingServerName.setValue(""); - serverSettingPublicAddress.setValue(""); - updateServerProperty(ServerProperties.PROP_HIGH_AVAILABILITY_NAME, ""); - } else { - final Conn conn = new Conn(); - installerService.getServerDetails(conn.url(), conn.username(), conn.password(), selectedServerName, - new AsyncCallback<ServerDetails>() { - public void onSuccess(ServerDetails details) { - serverSettingServerName.setValue(details.getName()); - serverSettingPublicAddress.setValue(details.getEndpointAddress()); - serverSettingWebHttpPort.setValue(details.getEndpointPortString()); - serverSettingWebSecureHttpPort.setValue(details.getEndpointSecurePortString()); - updateServerProperty(ServerProperties.PROP_HIGH_AVAILABILITY_NAME, details.getName()); - updateServerProperty(ServerProperties.PROP_WEB_HTTP_PORT, - details.getEndpointPortString()); - updateServerProperty(ServerProperties.PROP_WEB_HTTPS_PORT, - details.getEndpointSecurePortString()); - } - - public void onFailure(Throwable caught) { - SC.say("Failed to get details on selected server [" + selectedServerName + "]"); - } - }); - } - } - }); - - serverSettingEmailSMTPHostname = new TextItem(ServerProperties.PROP_EMAIL_SMTP_HOST, - PROPS_MSG.rhq_server_email_smtp_host()); - serverSettingEmailSMTPHostname.setWidth(fieldWidth); - serverSettingEmailSMTPHostname.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - updateServerProperty(ServerProperties.PROP_EMAIL_SMTP_HOST, String.valueOf(event.getValue())); - } - }); - - serverSettingEmailFromAddress = new TextItem(ServerProperties.PROP_EMAIL_FROM_ADDRESS, - PROPS_MSG.rhq_server_email_from_address()); - serverSettingEmailFromAddress.setWidth(fieldWidth); - serverSettingEmailFromAddress.addChangedHandler(new ChangedHandler() { - public void onChanged(ChangedEvent event) { - updateServerProperty(ServerProperties.PROP_EMAIL_FROM_ADDRESS, String.valueOf(event.getValue())); - } - }); - - serverSettingsForm.setItems(registeredServersSelection, serverSettingServerName, serverSettingPublicAddress, - serverSettingWebHttpPort, serverSettingWebSecureHttpPort, serverSettingEmailSMTPHostname, - serverSettingEmailFromAddress); - - //////////////////////////////////////////////////////// - // The layout holding the forms in the simple view tab - - VLayout simpleForm = new VLayout(); - simpleForm.setLayoutMargin(5); - simpleForm.setMembersMargin(5); - simpleForm.setWidth100(); - simpleForm.setHeight100(); - simpleForm.setDefaultLayoutAlign(Alignment.CENTER); - simpleForm.addMember(databaseForm); - simpleForm.addMember(serverSettingsForm); - - return simpleForm; - } - - private void connectedToDatabase() { - final Conn conn = new Conn(); - testConnectionButton.setIcon("[SKIN]/actions/ok.png"); - installerService.isDatabaseSchemaExist(conn.url(), conn.username(), conn.password(), - new AsyncCallback<Boolean>() { - public void onSuccess(Boolean schemaExists) { - if (schemaExists) { - dbExistingSchemaOption.show(); - registeredServersSelection.enable(); - - installerService.getServerNames(conn.url(), conn.username(), conn.password(), - new AsyncCallback<ArrayList<String>>() { - public void onSuccess(ArrayList<String> servers) { - registeredServerNames.clear(); - registeredServerNames.put(NEW_SERVER_TO_REGISTER, - MSG.tab_simpleView_serverSettings_registeredServers_newServer()); - for (String server : servers) { - registeredServerNames.put(server, server); - } - registeredServersSelection.setValueMap(registeredServerNames); - } - - public void onFailure(Throwable caught) { - SC.say("Cannot get the registered server names"); - } - }); - } else { - dbExistingSchemaOption.hide(); - registeredServersSelection.setValue((String) null); - registeredServersSelection.disable(); - } - mainInstallButton.enable(); - } - - public void onFailure(Throwable caught) { - SC.say("Cannot determine the status of the database schema: " + caught); - } - }); - } - - private void addContextualHelp(final FormItem item, final String helpText) { - final FormItemIcon helpIcon = new FormItemIcon(); - helpIcon.setSrc("[SKIN]/actions/help.png"); - helpIcon.setNeverDisable(true); - item.setIcons(helpIcon); - - item.addIconClickHandler(new IconClickHandler() { - public void onIconClick(IconClickEvent event) { - if (event.getIcon().equals(helpIcon)) { - SC.say(helpText); - } - } - }); - } - - /** - * Call this when the user changed something (like connection URL or password) that renders - * the old connection test invalid. This will ensure the user is forced to re-test the connection. - */ - private void forceAnotherTestConnection() { - mainInstallButton.disable(); - testConnectionButton.setIcon(null); - dbExistingSchemaOption.hide(); - - if (registeredServerNames.size() > 1) { - registeredServerNames.clear(); - registeredServerNames.put(NEW_SERVER_TO_REGISTER, MSG.tab_simpleView_serverSettings_registeredServers_newServer()); - } - registeredServersSelection.setValue((String) null); - registeredServersSelection.setValueMap(registeredServerNames); - } - - // for convienence, so we can get the conn url, user, pass in one object - private class Conn { - public String url() { - return Installer.this.dbConnectionUrl.getValueAsString(); - } - - public String username() { - return Installer.this.dbUsername.getValueAsString(); - } - - public String password() { - return Installer.this.dbPassword.getValueAsString(); - } - } -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/ServerPropertyRecordList.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/ServerPropertyRecordList.java deleted file mode 100644 index 654e3cf..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/ServerPropertyRecordList.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.rhq.enterprise.gui.installer.client; - -import java.util.HashMap; -import java.util.Map; - -import com.smartgwt.client.data.Record; -import com.smartgwt.client.data.RecordList; - -/** - * This provides a RecordList that is really a map underneath (each record is nothing more - * than a name/value pair; that is, each record has two attributes: name and value). - * - * We use this because this RecordList will be the list backing the Advanced View grid. - * So changing this list will be automatically reflected in that grid. - * - * @author John Mazzitelli - */ -public class ServerPropertyRecordList extends RecordList { - - public static final String PROPERTY_NAME = "n"; - public static final String PROPERTY_VALUE = "v"; - - // this map is kept in sync with the record list - private HashMap<String, String> map = new HashMap<String, String>(); - - public HashMap<String, String> getMap() { - return map; - } - - public String getServerProperty(String name) { - String value = map.get(name); - return (value == null) ? "" : value; - } - - public void putServerProperty(String name, String value) { - // fill in the internal map - map.put(name, value); - - // now update the record list - Record found = find(PROPERTY_NAME, name); - if (found == null) { - Record record = new Record(); - record.setAttribute(PROPERTY_NAME, name); - record.setAttribute(PROPERTY_VALUE, value); - add(record); - } else { - found.setAttribute(PROPERTY_VALUE, value); - } - } - - public void replaceServerProperties(Map<String, String> newMap) { - // first update the internal map - map.clear(); - map.putAll(newMap); - - // now update the record list - setLength(0); - for (Map.Entry<String, String> entry : newMap.entrySet()) { - putServerProperty(entry.getKey(), entry.getValue()); - } - } -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java deleted file mode 100644 index c37d923..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.installer.client.gwt; - -import java.util.ArrayList; -import java.util.HashMap; - -import com.google.gwt.user.client.rpc.RemoteService; - -import org.rhq.enterprise.gui.installer.client.shared.ServerDetails; - -/** - * @author John Mazzitelli - */ -public interface InstallerGWTService extends RemoteService { - - /** - * Returns a list of all registered servers in the database. - * - * @param connectionUrl - * @param username - * @param password - * @return list of all existing servers registered in the database. - * @throws Exception - */ - ArrayList<String> getServerNames(String connectionUrl, String username, String password) throws Exception; - - /** - * Returns details on a specific server that is registered in the database. - * - * @param connectionUrl - * @param username - * @param password - * @param serverName the name of the server whose details are to be retrieved - * @return the details of the server or null if the server does not exist - * @throws Exception - */ - ServerDetails getServerDetails(String connectionUrl, String username, String password, String serverName) - throws Exception; - - /** - * Tests to see if there is already a schema installed. - * - * @param connectionUrl - * @param username - * @param password - * @return <code>true</code> if there appears to be a schema installed in the database already. - * @throws Exception - */ - boolean isDatabaseSchemaExist(String connectionUrl, String username, String password) throws Exception; - - /** - * Tests that the database can be connected to with the given URL and credentials. - * @param connectionUrl - * @param username - * @param password - * @return <code>null</code> if the connection succeeded; this will be an error message if failed - * @throws Exception - */ - String testConnection(String connectionUrl, String username, String password) throws Exception; - - /** - * Returns the rhq-server.properties values in a map. - * @return server properties - * @throws Exception - */ - HashMap<String, String> getServerProperties() throws Exception; - - /** - * Saves the rhq-server.properties with the given values. - * @param serverProperties - * @throws Exception - */ - void saveServerProperties(HashMap<String, String> serverProperties) throws Exception; - - /** - * Returns the version string for the app server itself (e.g. "7.1.2.Final"). - * @return version string of app server - * @throws Exception - */ - String getAppServerVersion() throws Exception; - - /** - * Returns the general type of operating system the server is running on (e.g. "Linux"). - * @return os type name - * @throws Exception - */ - String getOperatingSystem() throws Exception; -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerDetails.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerDetails.java deleted file mode 100644 index b54e380..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerDetails.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.installer.client.shared; - -import java.io.Serializable; - -public class ServerDetails implements Serializable { - private static final long serialVersionUID = 1L; - - public static final String DEFAULT_AFFINITY_GROUP = ""; - public static final int DEFAULT_ENDPOINT_PORT = 7080; - public static final int DEFAULT_ENDPOINT_SECURE_PORT = 7443; - - private String name; - private String endpointAddress; - private int endpointPort; - private int endpointSecurePort; - private String affinityGroup; - - protected ServerDetails() { - // for GWT - } - - public ServerDetails(String name, String endpointAddress, int port, int securePort, String affinityGroup) { - this.name = name; - this.endpointAddress = endpointAddress; - this.endpointPort = port; - this.endpointSecurePort = securePort; - this.affinityGroup = affinityGroup; - } - - public String getName() { - return name; - } - - public void setName(String name) { - if ((null != name) && (!"".equals(name.trim()))) { - this.name = name; - } - } - - public String getEndpointAddress() { - return endpointAddress; - } - - public void setEndpointAddress(String endpointAddress) { - if ((null != endpointAddress) && (!"".equals(endpointAddress.trim()))) { - this.endpointAddress = endpointAddress; - } - } - - public int getEndpointPort() { - return endpointPort; - } - - public void setEndpointPort(int endpointPort) { - this.endpointPort = endpointPort; - } - - public String getEndpointPortString() { - return (String.valueOf(endpointPort)); - } - - public void setEndpointPortString(String endpointPort) { - this.endpointPort = Integer.valueOf(endpointPort).intValue(); - } - - public int getEndpointSecurePort() { - return endpointSecurePort; - } - - public void setEndpointSecurePort(int endpointSecurePort) { - this.endpointSecurePort = endpointSecurePort; - } - - public String getEndpointSecurePortString() { - return (String.valueOf(endpointSecurePort)); - } - - public void setEndpointSecurePortString(String endpointSecurePort) { - this.endpointSecurePort = Integer.valueOf(endpointSecurePort).intValue(); - } - - public String getAffinityGroup() { - return affinityGroup; - } - - public void setAffinityGroup(String affinityGroup) { - if ((null != affinityGroup) && (!"".equals(affinityGroup.trim()))) { - this.affinityGroup = affinityGroup; - } - } - - @Override - public String toString() { - return "[name=" + name + " address=" + endpointAddress + " port=" + endpointPort + " secureport=" - + endpointSecurePort + " affinitygroup=" + affinityGroup + "]"; - } -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java deleted file mode 100644 index d92d4ce..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2008 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.installer.client.shared; - -/** - * Settings found in the rhq-server.properties file that controls the startup configuration of the server. - * - * @author John Mazzitelli - */ -public class ServerProperties { - public static final String PREFIX_PROP_DATABASE = "rhq.server.database."; - public static final String PROP_DATABASE_TYPE = PREFIX_PROP_DATABASE + "type-mapping"; - public static final String PROP_DATABASE_CONNECTION_URL = PREFIX_PROP_DATABASE + "connection-url"; - public static final String PROP_DATABASE_USERNAME = PREFIX_PROP_DATABASE + "user-name"; - public static final String PROP_DATABASE_PASSWORD = PREFIX_PROP_DATABASE + "password"; - public static final String PROP_DATABASE_SERVER_NAME = PREFIX_PROP_DATABASE + "server-name"; - public static final String PROP_DATABASE_PORT = PREFIX_PROP_DATABASE + "port"; - public static final String PROP_DATABASE_DB_NAME = PREFIX_PROP_DATABASE + "db-name"; - public static final String PROP_DATABASE_HIBERNATE_DIALECT = "hibernate.dialect"; - public static final String PROP_QUARTZ_DRIVER_DELEGATE_CLASS = "rhq.server.quartz.driverDelegateClass"; - public static final String PROP_QUARTZ_SELECT_WITH_LOCK_SQL = "rhq.server.quartz.selectWithLockSQL"; - public static final String PROP_QUARTZ_LOCK_HANDLER_CLASS = "rhq.server.quartz.lockHandlerClass"; - - public static final String PREFIX_PROP_WEB = "rhq.server.startup.web."; - public static final String PROP_WEB_HTTP_PORT = PREFIX_PROP_WEB + "http.port"; - public static final String PROP_WEB_HTTPS_PORT = PREFIX_PROP_WEB + "https.port"; - - public static final String PREFIX_PROP_EMBEDDED_AGENT = "rhq.server.embedded-agent."; - public static final String PROP_EMBEDDED_AGENT_ENABLED = PREFIX_PROP_EMBEDDED_AGENT + "enabled"; - - public static final String PREFIX_PROP_EMAIL = "rhq.server.email."; - public static final String PROP_EMAIL_SMTP_HOST = PREFIX_PROP_EMAIL + "smtp-host"; - public static final String PROP_EMAIL_FROM_ADDRESS = PREFIX_PROP_EMAIL + "from-address"; - - public static final String PROP_HIGH_AVAILABILITY_NAME = "rhq.server.high-availability.name"; - public static final String PROP_MM_AT_START = "rhq.server.maintenance-mode-at-startup"; -} \ No newline at end of file diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/service/ManagementService.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/service/ManagementService.java deleted file mode 100644 index add78a6..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/service/ManagementService.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.installer.server.service; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; - -import org.jboss.as.controller.ModelController; -import org.jboss.as.controller.client.ModelControllerClient; -import org.jboss.as.server.Services; -import org.jboss.msc.service.Service; -import org.jboss.msc.service.ServiceActivator; -import org.jboss.msc.service.ServiceActivatorContext; -import org.jboss.msc.service.ServiceName; -import org.jboss.msc.service.ServiceRegistryException; -import org.jboss.msc.service.StartContext; -import org.jboss.msc.service.StartException; -import org.jboss.msc.service.StopContext; -import org.jboss.msc.value.InjectedValue; - -/** - * This will provide our co-located management service. - * This is useful because it helps us avoid performing any management - * over a remote connector. Since we know we are running co-located - * in the same app server container that we want to manage, this - * service will provide us with a management client that does not go - * over a remote connector to talk to our app server container. - * - * @author John Mazzitelli - */ -public class ManagementService implements ServiceActivator { - - private static volatile ModelController controller; - private static volatile ExecutorService executor; - - public static ModelControllerClient getClient() { - return controller.createClient(executor); - } - - @Override - public void activate(ServiceActivatorContext context) throws ServiceRegistryException { - final GetModelControllerService service = new GetModelControllerService(); - context - .getServiceTarget() - .addService(ServiceName.of("rhq", "installer", "management", "client", "getter"), service) - .addDependency(Services.JBOSS_SERVER_CONTROLLER, ModelController.class, service.modelControllerValue) - .install(); - } - - private class GetModelControllerService implements Service<Void> { - private InjectedValue<ModelController> modelControllerValue = new InjectedValue<ModelController>(); - - @Override - public Void getValue() throws IllegalStateException, IllegalArgumentException { - return null; - } - - @Override - public void start(StartContext context) throws StartException { - ManagementService.executor = Executors.newFixedThreadPool(5, new ThreadFactory() { - @Override - public Thread newThread(Runnable r) { - Thread t = new Thread(r); - t.setDaemon(true); - t.setName("ManagementServiceModelControllerClientThread"); - return t; - } - }); - ManagementService.controller = modelControllerValue.getValue(); - } - - @Override - public void stop(StopContext context) { - try { - ManagementService.executor.shutdownNow(); - } finally { - ManagementService.executor = null; - ManagementService.controller = null; - } - } - - } -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java deleted file mode 100644 index 6247168..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.installer.server.servlet; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import javax.servlet.annotation.WebServlet; - -import com.google.gwt.user.server.rpc.RemoteServiceServlet; - -import org.jboss.as.controller.client.ModelControllerClient; - -import org.rhq.common.jbossas.client.controller.Address; -import org.rhq.common.jbossas.client.controller.JBossASClient; -import org.rhq.common.jbossas.client.controller.SecurityDomainJBossASClient; -import org.rhq.core.util.PropertiesFileUpdate; -import org.rhq.enterprise.gui.installer.client.gwt.InstallerGWTService; -import org.rhq.enterprise.gui.installer.client.shared.ServerDetails; -import org.rhq.enterprise.gui.installer.server.service.ManagementService; - -/** - * @author John Mazzitelli - */ -@WebServlet(value = "/org.rhq.enterprise.gui.installer.Installer/InstallerGWTService") -public class InstallerGWTServiceImpl extends RemoteServiceServlet implements InstallerGWTService { - - private static final long serialVersionUID = 1L; - - private static final String RHQ_SECURITY_DOMAIN = "RHQDSSecurityDomain"; - - @Override - public ArrayList<String> getServerNames(String connectionUrl, String username, String password) throws Exception { - try { - return ServerInstallUtil.getServerNames(connectionUrl, username, password); - } catch (Exception e) { - log("Could not get the list of registered server names", e); - return null; - } - } - - @Override - public ServerDetails getServerDetails(String connectionUrl, String username, String password, String serverName) - throws Exception { - try { - return ServerInstallUtil.getServerDetails(connectionUrl, username, password, serverName); - } catch (Exception e) { - log("Could not get server details for [" + serverName + "]", e); - return null; - } - } - - @Override - public boolean isDatabaseSchemaExist(String connectionUrl, String username, String password) throws Exception { - try { - return ServerInstallUtil.isDatabaseSchemaExist(connectionUrl, username, password); - } catch (Exception e) { - log("Could not determine database existence", e); - return false; - } - } - - @Override - public String testConnection(String connectionUrl, String username, String password) throws Exception { - String results = ServerInstallUtil.testConnection(connectionUrl, username, password); - return results; - } - - @Override - public HashMap<String, String> getServerProperties() throws Exception { - File serverPropertiesFile = getServerPropertiesFile(); - PropertiesFileUpdate propsFile = new PropertiesFileUpdate(serverPropertiesFile.getAbsolutePath()); - Properties props = propsFile.loadExistingProperties(); - - // GWT can't handle Properties - convert to HashMap - HashMap<String, String> map = new HashMap<String, String>(props.size()); - for (Object property : props.keySet()) { - map.put(property.toString(), props.getProperty(property.toString())); - } - return map; - } - - @Override - public void saveServerProperties(HashMap<String, String> serverProperties) throws Exception { - File serverPropertiesFile = getServerPropertiesFile(); - PropertiesFileUpdate propsFile = new PropertiesFileUpdate(serverPropertiesFile.getAbsolutePath()); - - // GWT can't handle Properties - convert from HashMap - Properties props = new Properties(); - for (Map.Entry<String, String> entry : serverProperties.entrySet()) { - props.setProperty(entry.getKey(), entry.getValue()); - } - - propsFile.update(props); - - return; - } - - @Override - public String getAppServerVersion() throws Exception { - JBossASClient client = new JBossASClient(getClient()); - String version = client.getStringAttribute("release-version", Address.root()); - return version; - } - - @Override - public String getOperatingSystem() throws Exception { - JBossASClient client = new JBossASClient(getClient()); - String[] address = { "core-service", "platform-mbean", "type", "operating-system" }; - String osName = client.getStringAttribute("name", Address.root().add(address)); - return osName; - } - - private String getAppServerHomeDir() throws Exception { - JBossASClient client = new JBossASClient(getClient()); - String[] address = { "core-service", "server-environment" }; - String dir = client.getStringAttribute(true, "home-dir", Address.root().add(address)); - return dir; - } - - private File getServerPropertiesFile() throws Exception { - File appServerHomeDir = new File(getAppServerHomeDir()); - File serverPropertiesFile = new File(appServerHomeDir, "../bin/rhq-server.properties"); - return serverPropertiesFile; - } - - private ModelControllerClient getClient() { - ModelControllerClient client = ManagementService.getClient(); - return client; - } - - private void createDatasourceSecurityDomain(String username, String password) throws Exception { - final SecurityDomainJBossASClient client = new SecurityDomainJBossASClient(getClient()); - final String securityDomain = RHQ_SECURITY_DOMAIN; - if (!client.isSecurityDomain(securityDomain)) { - client.createNewSecureIdentitySecurityDomainRequest(securityDomain, username, password); - log("Security domain [" + securityDomain + "] created"); - } else { - log("Security domain [" + securityDomain + "] already exists, skipping the creation request"); - } - } -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java b/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java deleted file mode 100644 index 4577789..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java +++ /dev/null @@ -1,274 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.installer.server.servlet; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.rhq.core.db.DatabaseType; -import org.rhq.core.db.DatabaseTypeFactory; -import org.rhq.core.db.DbUtil; -import org.rhq.core.util.exception.ThrowableUtil; -import org.rhq.enterprise.gui.installer.client.shared.ServerDetails; - -/** - * Provides utility methods necessary to complete the server installation. - * - * @author John Mazzitelli - */ -public class ServerInstallUtil { - private static final Log LOG = LogFactory.getLog(ServerInstallUtil.class); - - public enum ExistingSchemaOption { - OVERWRITE, KEEP, SKIP - }; - - public static boolean isKeepExistingSchema(ExistingSchemaOption existingSchemaOption) { - return ExistingSchemaOption.KEEP.name().equals(existingSchemaOption) - || ExistingSchemaOption.SKIP.name().equals(existingSchemaOption); - } - - /** - * Returns <code>true</code> if the database already has the database schema created for it. It will not be known - * what version of schema or if its the latest, all this method tells you is that some RHQ database schema exists. - * - * @param connectionUrl - * @param username - * @param password - * @return <code>true</code> if the database can be connected to - * - * @throws Exception if failed to communicate with the database - */ - public static boolean isDatabaseSchemaExist(String connectionUrl, String username, String password) - throws Exception { - - Connection conn = getDatabaseConnection(connectionUrl, username, password); - DatabaseType db = DatabaseTypeFactory.getDatabaseType(conn); - - try { - return db.checkTableExists(conn, "RHQ_PRINCIPAL"); - } catch (IllegalStateException e) { - return false; - } finally { - db.closeConnection(conn); - } - } - - /** - * Get the list of existing servers from an existing schema. - * - * @param connectionUrl - * @param username - * @param password - * @return List of server names registered in the database. Empty list if the table does not exist or there are no entries in the table. - * - * @throws Exception if failed to communicate with the database - */ - public static ArrayList<String> getServerNames(String connectionUrl, String username, String password) - throws Exception { - DatabaseType db = null; - Connection conn = null; - Statement stm = null; - ResultSet rs = null; - ArrayList<String> result = new ArrayList<String>(); - - try { - conn = getDatabaseConnection(connectionUrl, username, password); - db = DatabaseTypeFactory.getDatabaseType(conn); - - if (db.checkTableExists(conn, "rhq_server")) { - - stm = conn.createStatement(); - rs = stm.executeQuery("SELECT name FROM rhq_server ORDER BY name asc"); - - while (rs.next()) { - result.add(rs.getString(1)); - } - } - } catch (IllegalStateException e) { - // table does not exist - } catch (SQLException e) { - LOG.info("Unable to fetch existing server info: " + e.getMessage()); - } finally { - if (null != db) { - db.closeJDBCObjects(conn, stm, rs); - } - } - - return result; - } - - /** - * Returns information on the server as found in the database (port numbers, affinity group, etc). - * - * @param connectionUrl - * @param username - * @param password - * @param serverName the server whose details are to be returned - * @return the information on the named server - */ - public static ServerDetails getServerDetails(String connectionUrl, String username, String password, - String serverName) { - - DatabaseType db = null; - Connection conn = null; - ServerDetails result = null; - - try { - conn = getDatabaseConnection(connectionUrl, username, password); - db = DatabaseTypeFactory.getDatabaseType(conn); - - result = getServerDetails(db, conn, serverName); - - } catch (Exception e) { - LOG.info("Unable to get server detail: " + e.getMessage()); - } finally { - if (null != db) { - db.closeConnection(conn); - } - } - - return result; - } - - private static ServerDetails getServerDetails(DatabaseType db, Connection conn, String serverName) { - PreparedStatement stm = null; - ResultSet rs = null; - ServerDetails result = null; - - if (null == serverName) { - return result; - } - - try { - stm = conn.prepareStatement("" // - + "SELECT s.address, s.port, s.secure_port, ag.name " // - + " FROM rhq_server s LEFT JOIN rhq_affinity_group ag ON ag.id = s.affinity_group_id " // - + " WHERE s.name = ?"); - stm.setString(1, serverName.trim()); - - rs = stm.executeQuery(); - - if (rs.next()) { - result = new ServerDetails(serverName, rs.getString(1), rs.getInt(2), rs.getInt(3), rs.getString(4)); - } - - } catch (SQLException e) { - LOG.info("Unable to get affinity group name for server: " + e.getMessage()); - } finally { - if (null != db) { - db.closeResultSet(rs); - db.closeStatement(stm); - } - } - - return result; - } - - /** - * Tests to make sure the server can be connected to with the given settings. - * If the test is successful, <code>null</code>. If the test fails, the returned string - * will be the error message to indicate the problem. - * - * @param connectionUrl - * @param username - * @param password - * @return error message if test failed; <code>null</code> if test succeeded - */ - public static String testConnection(String connectionUrl, String username, String password) { - - // its possible the JDBC URL was changed, clear the factory cache in case the DB version is different now - DatabaseTypeFactory.clearDatabaseTypeCache(); - - try { - ensureDatabaseIsSupported(connectionUrl, username, password); - return null; - } catch (Exception e) { - LOG.warn("Installer failed to test connection", e); - return ThrowableUtil.getAllMessages(e); - } - } - - /** - * Call this when you need to confirm that the database is supported. - * - * @param connectionUrl - * @param username - * @param password - * - * @throws Exception if the database is not supported - */ - public static void ensureDatabaseIsSupported(String connectionUrl, String username, String password) - throws Exception { - Connection conn = null; - DatabaseType db = null; - - try { - conn = getDatabaseConnection(connectionUrl, username, password); - db = DatabaseTypeFactory.getDatabaseType(conn); - - String version = db.getVersion(); - - if (DatabaseTypeFactory.isPostgres(db)) { - if (version.startsWith("7") || version.equals("8") || version.startsWith("8.0") - || version.startsWith("8.1")) { - throw new Exception("Unsupported PostgreSQL [" + db + "]"); - } - } else if (DatabaseTypeFactory.isOracle(db)) { - if (version.startsWith("8") || version.startsWith("9")) { - throw new Exception("Unsupported Oracle [" + db + "]"); - } - } else { - throw new Exception("Unsupported DB [" + db + "]"); - } - - LOG.info("Database is supported: " + db); - } finally { - if (db != null) { - db.closeConnection(conn); - } - } - - return; - } - - /** - * Returns a database connection with the given set of properties providing the settings that allow for a successful - * database connection. If <code>props</code> is <code>null</code>, it will use the server properties from - * {@link #getServerProperties()}. - * - * @param connectionUrl - * @param userName - * @param password - * @return the database connection - * - * @throws SQLException if cannot successfully connect to the database - */ - public static Connection getDatabaseConnection(String connectionUrl, String userName, String password) - throws SQLException { - return DbUtil.getConnection(connectionUrl, userName, password); - } -} diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/Installer.gwt.xml b/modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/Installer.gwt.xml deleted file mode 100644 index 164e94a..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/Installer.gwt.xml +++ /dev/null @@ -1,35 +0,0 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.4.0//EN" - "http://google-web-toolkit.googlecode.com/svn/tags/2.4.0/distro-source/cor..."> - -<module> - - <inherits name='com.google.gwt.user.User'/> - <inherits name='com.google.gwt.i18n.I18N'/> - <inherits name="com.google.gwt.logging.Logging"/> - - <inherits name='com.smartgwt.SmartGwt' /> - <inherits name="com.smartgwt.tools.SmartGwtTools"/> - -  - <set-property name="gwt.logging.enabled" value="TRUE"/> -  - <set-property name="gwt.logging.logLevel" value="FINE"/> - <set-property name="gwt.logging.consoleHandler" value="ENABLED" /> - <set-property name="gwt.logging.developmentModeHandler" value="ENABLED" /> - <set-property name="gwt.logging.firebugHandler" value="ENABLED" /> - <set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED" /> - <set-property name="gwt.logging.popupHandler" value="DISABLED" /> - <set-property name="gwt.logging.systemHandler" value="ENABLED" /> - <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" /> - - <set-property name="user.agent" value="${gwt.userAgent}"/> - <extend-property name="locale" values="${gwt.locale}" /> - - <set-configuration-property name="locale.usemeta" value="Y"/> - <set-configuration-property name="locale.useragent" value="Y"/> - <set-configuration-property name="locale.searchorder" value="queryparam,meta,useragent,cookie"/> - <set-property-fallback name="locale" value="${gwt.fallback.locale}"/> - - <entry-point class='org.rhq.enterprise.gui.installer.client.Installer'/> - -</module> diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties b/modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties deleted file mode 100644 index 5915f40..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties +++ /dev/null @@ -1,21 +0,0 @@ -button_reset = Reset -button_save = Save -button_startInstallation = Press To Start The Installation Now -button_testConnection = Test Connection -help_registeredServers = If you are performing an upgrade or a re-installation then you should select a server from this list of registered servers. If you want to install a new server into the system, select the *New Server* option. (Note that if you are going to overwrite your existing schema, you cannot select an existing registered server since they will be deleted when the overwrite is performed.) -property_name_label = Property -property_value_label = Value -schema_update_keep = Keep (Maintain Existing Data) -schema_update_overwrite = Overwrite (Lose Existing Data!) -schema_update_question = A database schema already exists. What do you want to do? -schema_update_skip = Skip (Leave Database As-Is) -tab_advancedView = Advanced View -tab_simpleView = Simple View -tab_simpleView_database = Database Settings -tab_simpleView_serverSettings = Server Settings -tab_simpleView_serverSettings_publicAddress = Server Public Address -tab_simpleView_serverSettings_registeredServers = Registered Server Names -tab_simpleView_serverSettings_registeredServers_newServer = *New Server* -tab_welcome = Welcome -tab_welcome_content = <h1>Welcome to the new GWT Installer</h1>\nThis is the <b>new</b> installer.\nAny HTML can go in here. -welcome_title = Installing the Server diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/client/ServerPropertiesMessages.properties b/modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/client/ServerPropertiesMessages.properties deleted file mode 100644 index 6c53445..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/resources/org/rhq/enterprise/gui/installer/client/ServerPropertiesMessages.properties +++ /dev/null @@ -1,23 +0,0 @@ -### RHQ Server Configuration Properties -### These should match the actual property names in rhq-server.properties. - -# Database -rhq.server.database.connection-url=Database Connection URL -rhq.server.database.user-name=Database Username -rhq.server.database.password=Database Password -rhq.server.database.type-mapping=Database Type - -# High Availability (HA) -rhq.server.high-availability.name=Server Name -rhq.server.maintenance-mode-at-startup=Maintenance Mode At Startup - -# General Properties -rhq.server.startup.web.http.port=HTTP Port -rhq.server.startup.web.https.port=Secure HTTP Port - -# Embedded RHQ Agent -rhq.server.embedded-agent.enabled=Embedded Agent Enabled - -# Email -rhq.server.email.smtp-host=Email SMTP Host -rhq.server.email.from-address=Email From Address \ No newline at end of file diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/webapp/WEB-INF/classes/META-INF/services/org.jboss.msc.service.ServiceActivator b/modules/enterprise/gui/gwt-installer-war/src/main/webapp/WEB-INF/classes/META-INF/services/org.jboss.msc.service.ServiceActivator deleted file mode 100644 index c64cc21..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/webapp/WEB-INF/classes/META-INF/services/org.jboss.msc.service.ServiceActivator +++ /dev/null @@ -1 +0,0 @@ -org.rhq.enterprise.gui.installer.server.service.ManagementService \ No newline at end of file diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/gwt-installer-war/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index b970eb3..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,9 +0,0 @@ -<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - -</web-app> diff --git a/modules/enterprise/gui/gwt-installer-war/src/main/webapp/index.html b/modules/enterprise/gui/gwt-installer-war/src/main/webapp/index.html deleted file mode 100644 index cb9016e..0000000 --- a/modules/enterprise/gui/gwt-installer-war/src/main/webapp/index.html +++ /dev/null @@ -1,45 +0,0 @@ -<html> -<head> -  - <meta http-equiv="X-UA-Compatible" content="IE=8" /> - -  - <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" /> - - <script> - var search = location.search; - // only do this if you have not specified locale as query param - if(search.indexOf("locale") == -1){ - // IE uses browserLanguage - var lang = navigator.language!=null ? navigator.language : navigator.browserLanguage; - var lang = lang.replace("-", "_"); - document.write("<meta name='gwt:property' content='locale="+lang +"'>"); - } - </script> - - <title>RHQ Installer</title> - - <script type="text/javascript"> - var isomorphicDir = "org.rhq.enterprise.gui.installer.Installer/sc/"; - </script> - -</head> -<body> - - <script type="text/javascript" language="javascript" - src="org.rhq.enterprise.gui.installer.Installer/org.rhq.enterprise.gui.installer.Installer.nocache.js"></script> - - <div id="Loading-Panel" style="width: 214px; height: 90px; margin-top: 300px; margin-left: 40%; margin-right: 40%;"> - <div style="text-align: center; border: 3px solid lightgray;"> - Loading Installer... - </div> - </div> - - <iframe src="javascript:''" id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe> - -</body> -</html> diff --git a/modules/enterprise/gui/installer/pom.xml b/modules/enterprise/gui/installer/pom.xml new file mode 100644 index 0000000..2c0193c --- /dev/null +++ b/modules/enterprise/gui/installer/pom.xml @@ -0,0 +1,407 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.rhq</groupId> + <artifactId>rhq-parent</artifactId> + <version>4.5.0-SNAPSHOT</version> + <relativePath>../../../../pom.xml</relativePath> + </parent> + + <groupId>org.rhq</groupId> + <artifactId>rhq-installer</artifactId> + <packaging>war</packaging> + + <name>RHQ Enterprise GWT Installer GUI</name> + <description>The RHQ Enterprise GWT Installer GUI webapp</description> + + <properties> +  + <gwt.version>2.4.0</gwt.version> + <smartgwt.version>3.0</smartgwt.version> + <jboss.as.version>7.1.1.Final</jboss.as.version>  + <jboss.msc.version>1.0.2.GA</jboss.msc.version>  + <jboss.dmr.version>1.1.1.Final</jboss.dmr.version>  + + <installerGuiParams /> + <installerGuiRunTarget>'http://localhost:7080/rhq-installer/index.html${installerGuiParams}'</installerGuiRunTarget> + +  + <gwt-plugin.extraJvmArgs>-Xms512M -Xmx512M -XX:PermSize=128M -XX:MaxPermSize=256M</gwt-plugin.extraJvmArgs> + <gwt-plugin.localWorkers>4</gwt-plugin.localWorkers> + + <gwt.userAgent>ie8,ie9,gecko1_8,safari,opera</gwt.userAgent> + <gwt.draftCompile>false</gwt.draftCompile> + <gwt.soyc>false</gwt.soyc> + <gwt.style>PRETTY</gwt.style> +  + <gwt.locale>en</gwt.locale> + <gwt.fallback.locale>en</gwt.fallback.locale> + + <enable-tags>true</enable-tags> + </properties> + + <dependencyManagement> + <dependencies> +  + <dependency> + <groupId>org.jboss.spec</groupId> + <artifactId>jboss-javaee-6.0</artifactId> + <version>3.0.0.Final</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>rhq-core-dbutils</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwt.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${gwt.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>com.smartgwt</groupId> + <artifactId>smartgwt</artifactId> + <version>${smartgwt.version}</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope>  + </dependency> + +  + <dependency> + <groupId>org.jboss.msc</groupId> + <artifactId>jboss-msc</artifactId> + <version>${jboss.msc.version}</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-dmr</artifactId> + <version>${jboss.dmr.version}</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-naming</artifactId> + <version>${jboss.as.version}</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-server</artifactId> + <version>${jboss.as.version}</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-controller</artifactId> + <version>${jboss.as.version}</version> + <scope>provided</scope>  + </dependency> + + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-controller-client</artifactId> + <version>${jboss.as.version}</version> + <scope>provided</scope>  + </dependency> + + </dependencies> + + <build> + <finalName>rhq-installer</finalName> + + <resources> + <resource> + <targetPath>${project.build.directory}/generated-sources/gwt</targetPath> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.gwt.xml</include> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*.java</include> + </includes> + </resource> + </resources> + + <plugins> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>2.4.0</version> + <configuration> + <noServer>true</noServer> + <inplace>false</inplace> + <logLevel>INFO</logLevel> + <runTarget>${installerGuiRunTarget}</runTarget> + <extraJvmArgs>${gwt-plugin.extraJvmArgs}</extraJvmArgs> + <localWorkers>${gwt-plugin.localWorkers}</localWorkers> + <draftCompile>${gwt.draftCompile}</draftCompile> + <soyc>${gwt.soyc}</soyc> + <buildOutputDirectory>target/gwtclasses</buildOutputDirectory> + <hostedWebapp>target/hostedWar</hostedWebapp> + <debugSuspend>false</debugSuspend> + <servicePattern>**/gwt/*GWTService.java</servicePattern> + <i18nMessagesBundle>org.rhq.enterprise.gui.installer.client.Messages</i18nMessagesBundle> + <i18nConstantsWithLookupBundle>org.rhq.enterprise.gui.installer.client.ServerPropertiesMessages</i18nConstantsWithLookupBundle> + <style>${gwt.style}</style> + <strict>true</strict> +  + <deploy>${project.build.directory}/gwt-deploy</deploy> + </configuration> + + <executions> + <execution> + <id>gwt-goals</id> + <goals> + <goal>compile</goal> + <goal>generateAsync</goal> + <goal>i18n</goal> + </goals> + </execution> + <execution> +  + <id>default-cli</id> + <goals> + <goal>debug</goal> + </goals> + <configuration> + <module>org.rhq.enterprise.gui.installer.Installer</module> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Build-Number>${buildNumber}</Build-Number> + <Dependencies>org.jboss.msc,org.jboss.as.controller-client,org.jboss.as.controller,org.jboss.as.server</Dependencies> + </manifestEntries> + </archive> + <webResources> + <resource> + <filtering>false</filtering> + <directory>${basedir}/src/main/webapp</directory> + </resource> + </webResources> + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-gwt-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>${basedir}/target/generated-sources/gwt</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + + </build> + + <profiles> + <profile> + <id>dev</id> + + <properties> + <rhq.rootDir>../../../..</rhq.rootDir> + <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir> + <rhq.deploymentName>${project.build.finalName}.war</rhq.deploymentName> + <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/${rhq.deploymentName}</rhq.deploymentDir> + </properties> + + <build> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + + <execution> + <id>deploy-classes</id> + <phase>compile</phase> + <configuration> + <target> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} to ${deployment.dir}${file.separator}...</echo> + <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> + <fileset dir="${basedir}/src/main/webapp" /> + </copy> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>deploy</id> + <phase>package</phase> + <configuration> + <target> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo> + <copy todir="${deployment.dir}" verbose="${rhq.verbose}"> + <fileset dir="${basedir}/target/${project.build.finalName}" /> + </copy> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>undeploy</id> + <phase>clean</phase> + <configuration> + <target> + <property name="deployment.dir" location="${rhq.deploymentDir}" /> + <echo>*** Deleting ${deployment.dir}${file.separator}...</echo> + <delete dir="${deployment.dir}" /> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + + </plugins> + </build> + </profile> + +  + <profile> + <id>windows</id> + <activation> + <os> + <family>Windows</family> + </os> + </activation> + <properties> + <installerGuiRunTarget>http://localhost:7080//rhq-installer/index.html${installerGuiParams}</installerGuiRunTarget> + </properties> + </profile> + + <profile> + <id>msg</id> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <includes> + <include>org/rhq/enterprise/gui/installer/client/*Messages.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>disable-tags</id> + <activation> + <property> + <name>brew</name> + </property> + </activation> + <properties> + <enable.tags>false</enable.tags> + </properties> + </profile> + + </profiles> + + + <repositories> + <repository> + <id>smartgwt</id> + <name>SmartGWT Releases</name> + <url>http://www.smartclient.com/maven2/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + + <repository> + <id>codehaus</id> + <name>Codehaus Releases</name> + <url>http://repository.codehaus.org/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + + </repositories> + +</project> diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/Address.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/Address.java new file mode 100644 index 0000000..1a54d36 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/Address.java @@ -0,0 +1,82 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.common.jbossas.client.controller; + +import java.util.Arrays; + +import org.jboss.dmr.ModelNode; + +/** + * Identifies a managed resource. + * + * @author John Mazzitelli + */ +public class Address implements Cloneable { + private ModelNode addressNode; + + public static Address root() { + return new Address(); + } + + public Address() { + addressNode = new ModelNode(); + } + + public Address(String... addressParts) { + this(); + add(addressParts); + } + + public ModelNode getAddressNode() { + return addressNode; + } + + public Address add(String... addressParts) { + if (addressParts != null) { + if ((addressParts.length % 2) != 0) { + throw new IllegalArgumentException("address is incomplete: " + Arrays.toString(addressParts)); + } + + if (addressParts.length > 0) { + for (int i = 0; i < addressParts.length; i += 2) { + addressNode.add(addressParts[i], addressParts[i + 1]); + } + } + } + + return this; + } + + public Address add(String type, String name) { + addressNode.add(type, name); + return this; + } + + @Override + public Address clone() throws CloneNotSupportedException { + Address clone = new Address(); + clone.addressNode = addressNode.clone(); + return clone; + } + + @Override + public String toString() { + return addressNode.asString(); + } +} \ No newline at end of file diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java new file mode 100644 index 0000000..fb3135c --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java @@ -0,0 +1,34 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.common.jbossas.client.controller; + +import org.jboss.as.controller.client.ModelControllerClient; + +/** + * Provides convienence methods associated with datasource management. + * + * @author John Mazzitelli + */ +public class DatasourceJBossASClient extends JBossASClient { + + public DatasourceJBossASClient(ModelControllerClient client) { + super(client); + } + +} diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/FailureException.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/FailureException.java new file mode 100644 index 0000000..6dde289 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/FailureException.java @@ -0,0 +1,77 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.common.jbossas.client.controller; + +import org.jboss.dmr.ModelNode; + +/** + * Indicates a failed client request. + * + * @author John Mazzitelli + */ +public class FailureException extends RuntimeException { + private static final long serialVersionUID = 1L; + + private static final String GENERIC_ERROR = "Failed request"; + + public FailureException(ModelNode failureNode) { + super(buildErrorMessage(GENERIC_ERROR, failureNode)); + } + + public FailureException(ModelNode failureNode, String errMsg) { + super(buildErrorMessage(errMsg, failureNode)); + } + + public FailureException(ModelNode failureNode, Throwable cause) { + super(buildErrorMessage(GENERIC_ERROR, failureNode), cause); + } + + public FailureException(ModelNode failureNode, String errMsg, Throwable cause) { + super(buildErrorMessage(errMsg, failureNode), cause); + } + + public FailureException(String errMsg, Throwable cause) { + super((errMsg != null) ? errMsg : GENERIC_ERROR, cause); + } + + public FailureException(String errMsg) { + super((errMsg != null) ? errMsg : GENERIC_ERROR); + } + + public FailureException(Throwable cause) { + super(GENERIC_ERROR, cause); + } + + public FailureException() { + super(GENERIC_ERROR); + } + + private static final String buildErrorMessage(String errMsg, ModelNode failureNode) { + if (errMsg == null) { + errMsg = GENERIC_ERROR; + } + + String description = JBossASClient.getFailureDescription(failureNode); + if (description != null) { + errMsg += ": " + description; + } + + return errMsg; + } +} diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java new file mode 100644 index 0000000..c8d040c --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java @@ -0,0 +1,304 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.common.jbossas.client.controller; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.jboss.as.controller.client.ModelControllerClient; +import org.jboss.as.controller.client.OperationMessageHandler; +import org.jboss.dmr.ModelNode; + +/** + * A client that can be used to talk to a JBossAS server via the DMR/ModelControllerClient API. + * + * @author John Mazzitelli + */ +public class JBossASClient { + + // protected to allow subclasses to have a logger, too, without explicitly declaring one themselves + protected final Log log = LogFactory.getLog(this.getClass()); + + public static final String BATCH = "composite"; + public static final String BATCH_STEPS = "steps"; + public static final String OPERATION = "operation"; + public static final String ADDRESS = "address"; + public static final String RESULT = "result"; + public static final String OUTCOME = "outcome"; + public static final String OUTCOME_SUCCESS = "success"; + public static final String SUBSYSTEM = "subsystem"; + public static final String FAILURE_DESCRIPTION = "failure-description"; + public static final String NAME = "name"; + public static final String VALUE = "value"; + public static final String READ_ATTRIBUTE = "read-attribute"; + public static final String READ_RESOURCE = "read-resource"; + public static final String WRITE_ATTRIBUTE = "write-attribute"; + public static final String ADD = "add"; + + private ModelControllerClient client; + + public JBossASClient(ModelControllerClient client) { + this.client = client; + } + + ///////////////////////////////////////////////////////////////// + // Some static methods useful for convienence + + /** + * Convienence method that allows you to create request that reads a single attribute + * value to a resource. + * + * @param attributeName the name of the attribute whose value is to be read + * @param address identifies the resource + * @return the request + */ + public static ModelNode createReadAttributeRequest(String attributeName, Address address) { + return createReadAttributeRequest(false, attributeName, address); + } + + /** + * Convienence method that allows you to create request that reads a single attribute + * value to a resource. + * + * @param runtime if <code>true</code>, the attribute is a runtime attribute + * @param attributeName the name of the attribute whose value is to be read + * @param address identifies the resource + * @return the request + */ + public static ModelNode createReadAttributeRequest(boolean runtime, String attributeName, Address address) { + ModelNode op = createRequest(READ_ATTRIBUTE, address); + op.get("include-runtime").set(runtime); + op.get(NAME).set(attributeName); + return op; + } + + /** + * Convienence method that allows you to create request that writes a single attribute's + * string value to a resource. + * + * @param attributeName the name of the attribute whose value is to be written + * @param attributeValue the attribute value that is to be written + * @param address identifies the resource + * @return the request + */ + public static ModelNode createWriteAttributeRequest(String attributeName, String attributeValue, Address address) { + ModelNode op = createRequest(WRITE_ATTRIBUTE, address); + op.get(NAME).set(attributeName); + op.get(VALUE).set(attributeValue); + return op; + } + + /** + * Convienence method that builds a partial operation request node. + * + * @param operation the operation to be requested + * @param address identifies the target resource + * @return the partial operation request node - caller should fill this in further to complete the node + */ + public static ModelNode createRequest(String operation, Address address) { + final ModelNode request = new ModelNode(); + request.get(OPERATION).set(operation); + request.get(ADDRESS).set(address.getAddressNode()); + return request; + } + + /** + * Creates a batch of operations that can be atomically invoked. + * + * @param steps the different operation steps of the batch + * + * @return the batch operation node + */ + public static ModelNode createBatchRequest(ModelNode... steps) { + final ModelNode composite = new ModelNode(); + composite.get(OPERATION).set(BATCH); + composite.get(ADDRESS).setEmptyList(); + final ModelNode stepsNode = composite.get(BATCH_STEPS); + for (ModelNode step : steps) { + stepsNode.add(step); + } + return composite; + } + + /** + * If the given node has a result list, that list will be returned + * with the values as Strings. Otherwise, an empty list is returned. + * + * @param operationResult the node to examine + * @return the result list as Strings if there is a list, empty otherwise + */ + public static List<String> getResultListAsStrings(ModelNode operationResult) { + if (!operationResult.hasDefined(RESULT)) { + return Collections.emptyList(); + } + + List<ModelNode> nodeList = operationResult.get(RESULT).asList(); + if (nodeList.isEmpty()) { + return Collections.emptyList(); + } + + List<String> list = new ArrayList<String>(nodeList.size()); + for (ModelNode node : nodeList) { + list.add(node.asString()); + } + + return list; + } + + /** + * If the given node has results, those results are returned in a ModelNode. + * Otherwise, an empty node is returned. + * + * @param operationResult the node to examine + * @return the results as a ModelNode + */ + public static ModelNode getResults(ModelNode operationResult) { + if (!operationResult.hasDefined(RESULT)) { + return new ModelNode(); + } + + return operationResult.get(RESULT); + } + + /** + * Examines the given node's result list and if the item is found, returns true. + * + * @param operationResult the node to examine + * @param item the item to look for in the node's result list + * @return true if the node has a result list and it contains the item; false otherwise + */ + public static boolean listContains(ModelNode operationResult, String item) { + if (!operationResult.hasDefined(RESULT)) { + return false; + } + + List<ModelNode> nodeList = operationResult.get(RESULT).asList(); + if (nodeList.isEmpty()) { + return false; + } + + for (ModelNode node : nodeList) { + if (node.asString().equals(item)) { + return true; + } + } + + return false; + } + + /** + * Returns <code>true</code> if the operation was a success; <code>false</code> otherwise. + * + * @param operationResult the operation result to test + * @return the success or failure flag of the result + */ + public static boolean isSuccess(ModelNode operationResult) { + if (operationResult != null) { + return operationResult.hasDefined(OUTCOME) + && operationResult.get(OUTCOME).asString().equals(OUTCOME_SUCCESS); + } + return false; + } + + /** + * If the operation result was a failure, this returns the failure description if there is one. + * A generic failure message will be returned if the operation was a failure but has no failure + * description. A <code>null</code> is returned if the operation was a success. + * + * @param operationResult the operation whose failure description is to be returned + * @return the failure description of <code>null</code> if the operation was a success + */ + public static String getFailureDescription(ModelNode operationResult) { + if (isSuccess(operationResult)) { + return null; + } + if (operationResult != null) { + ModelNode descr = operationResult.get(FAILURE_DESCRIPTION); + if (descr != null) { + return descr.asString(); + } + } + return "Unknown failure"; + } + + ///////////////////////////////////////////////////////////////// + // Non-static methods that need the client + + public ModelControllerClient getModelControllerClient() { + return client; + } + + /** + * Convienence method that executes the request. + * + * @param request + * @return results + * @throws Exception + */ + public ModelNode execute(ModelNode request) throws Exception { + try { + return getModelControllerClient().execute(request, OperationMessageHandler.logging); + } catch (Exception e) { + log.error("Failed to execute request", e); + throw e; + } + } + + /** + * Convienence method that allows you to obtain a single attribute's string value from + * a resource. + * + * @param attributeName the attribute whose value is to be returned + * @param address identifies the resource + * @return the attribute value + * + * @throws Exception if failed to obtain the attribute value + */ + public String getStringAttribute(String attributeName, Address address) throws Exception { + return getStringAttribute(false, attributeName, address); + } + + /** + * Convienence method that allows you to obtain a single attribute's string value from + * a resource. + * + * @param runtime if <code>true</code>, the attribute to be retrieved is a runtime attribute + * @param attributeName the attribute whose value is to be returned + * @param address identifies the resource + * @return the attribute value + * + * @throws Exception if failed to obtain the attribute value + */ + public String getStringAttribute(boolean runtime, String attributeName, Address address) throws Exception { + ModelNode op = createReadAttributeRequest(runtime, attributeName, address); + ModelNode results = execute(op); + if (isSuccess(results)) { + ModelNode version = getResults(results); + String attributeValue = version.asString(); + return attributeValue; + } else { + throw new FailureException(results, "Failed to get attribute [" + attributeName + "] from [" + address + + "]"); + } + } +} diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java new file mode 100644 index 0000000..a73ba79 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/common/jbossas/client/controller/SecurityDomainJBossASClient.java @@ -0,0 +1,110 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.common.jbossas.client.controller; + +import java.util.List; + +import org.jboss.as.controller.client.ModelControllerClient; +import org.jboss.dmr.ModelNode; + +/** + * Provides convienence methods associated with security domain management. + * + * @author John Mazzitelli + */ +public class SecurityDomainJBossASClient extends JBossASClient { + + public static final String SUBSYSTEM_SECURITY = "security"; + public static final String SECURITY_DOMAIN = "security-domain"; + public static final String CACHE_TYPE = "cache-type"; + public static final String AUTHENTICATION = "authentication"; + public static final String LOGIN_MODULES = "login-modules"; + public static final String CLASSIC = "classic"; + public static final String CODE = "code"; + public static final String FLAG = "flag"; + public static final String MODULE_OPTIONS = "module-options"; + public static final String USERNAME = "username"; + public static final String PASSWORD = "password"; + + public SecurityDomainJBossASClient(ModelControllerClient client) { + super(client); + } + + /** + * Checks to see if there is already a security domain with the given name. + * + * @param securityDomainName the name to check + * @return true if there is a security domain with the given name already in existence + */ + public boolean isSecurityDomain(String securityDomainName) throws Exception { + Address addr = Address.root().add(SUBSYSTEM, SUBSYSTEM_SECURITY); + ModelNode queryNode = createRequest(READ_RESOURCE, addr); + ModelNode results = execute(queryNode); + if (isSuccess(results)) { + ModelNode domains = getResults(results).get(SECURITY_DOMAIN); + List<ModelNode> list = domains.asList(); + for (ModelNode domain : list) { + if (domain.has(securityDomainName)) { + return true; + } + } + return false; + } else { + throw new FailureException(results, "Failed to get security domains"); + } + } + + /** + * Convienence method that builds a request which can create a new security-domain + * using the SecureIdentity authentication method. This is used when you want + * to obfuscate a database password in the configuration. + * + * @param securityDomainName the name of the new security domain + * @param username the username associated with the security domain + * @param password the value of the password to store in the configuration (e.g. the obfuscated password itself) + * + * @throws Exception if failed to create security domain + */ + public void createNewSecureIdentitySecurityDomainRequest(String securityDomainName, String username, String password) + throws Exception { + + Address addr = Address.root().add(SUBSYSTEM, SUBSYSTEM_SECURITY, SECURITY_DOMAIN, securityDomainName); + ModelNode addTopNode = createRequest(ADD, addr); + addTopNode.get(CACHE_TYPE).set("default"); + + ModelNode addAuthNode = createRequest(ADD, addr.clone().add(AUTHENTICATION, CLASSIC)); + ModelNode loginModulesNode = addAuthNode.get(LOGIN_MODULES); + ModelNode loginModule = new ModelNode(); + loginModule.get(CODE).set("SecureIdentity"); + loginModule.get(FLAG).set("required"); + ModelNode moduleOptions = loginModule.get(MODULE_OPTIONS); + moduleOptions.setEmptyList(); + moduleOptions.add(USERNAME, username); + moduleOptions.add(PASSWORD, password); + loginModulesNode.add(loginModule); + + ModelNode batch = createBatchRequest(addTopNode, addAuthNode); + ModelNode results = execute(batch); + if (!isSuccess(results)) { + throw new FailureException(results, "Failed to create security domain [" + securityDomainName + "]"); + } + + return; + } +} diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java new file mode 100644 index 0000000..0fc0215 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java @@ -0,0 +1,651 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.installer.client; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; + +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.Element; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.types.Alignment; +import com.smartgwt.client.types.Side; +import com.smartgwt.client.types.VerticalAlignment; +import com.smartgwt.client.util.SC; +import com.smartgwt.client.widgets.Button; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.IButton; +import com.smartgwt.client.widgets.Label; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; +import com.smartgwt.client.widgets.form.DynamicForm; +import com.smartgwt.client.widgets.form.fields.ButtonItem; +import com.smartgwt.client.widgets.form.fields.FormItem; +import com.smartgwt.client.widgets.form.fields.FormItemIcon; +import com.smartgwt.client.widgets.form.fields.PasswordItem; +import com.smartgwt.client.widgets.form.fields.SelectItem; +import com.smartgwt.client.widgets.form.fields.SpacerItem; +import com.smartgwt.client.widgets.form.fields.SpinnerItem; +import com.smartgwt.client.widgets.form.fields.TextItem; +import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; +import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; +import com.smartgwt.client.widgets.form.fields.events.IconClickEvent; +import com.smartgwt.client.widgets.form.fields.events.IconClickHandler; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.events.EditCompleteEvent; +import com.smartgwt.client.widgets.grid.events.EditCompleteHandler; +import com.smartgwt.client.widgets.layout.VLayout; +import com.smartgwt.client.widgets.tab.Tab; +import com.smartgwt.client.widgets.tab.TabSet; +import com.smartgwt.client.widgets.toolbar.ToolStrip; + +import org.rhq.enterprise.gui.installer.client.gwt.InstallerGWTServiceAsync; +import org.rhq.enterprise.gui.installer.client.shared.ServerDetails; +import org.rhq.enterprise.gui.installer.client.shared.ServerProperties; + +/** + * The GWT {@link EntryPoint entry point} to the RHQ Installer GUI. + * + * @author John Mazzitelli + */ +public class Installer implements EntryPoint { + + // This must come first to ensure proper I18N class loading for dev mode + public static final Messages MSG = GWT.create(Messages.class); + public static final ServerPropertiesMessages PROPS_MSG = GWT.create(ServerPropertiesMessages.class); + + private static final String NEW_SERVER_TO_REGISTER = "*new*"; + + private final InstallerGWTServiceAsync installerService = InstallerGWTServiceAsync.Util.getInstance(); + private final ServerPropertyRecordList serverProperties = new ServerPropertyRecordList(); + private final HashMap<String, String> originalProperties = new HashMap<String, String>(); + private final LinkedHashMap<String, String> registeredServerNames = new LinkedHashMap<String, String>(); + + private ListGrid advancedPropertyItemGrid; + private Button mainInstallButton; + private TextItem dbConnectionUrl; + private TextItem dbUsername; + private PasswordItem dbPassword; + private SelectItem dbExistingSchemaOption; + private ButtonItem testConnectionButton; + private SelectItem dbType; + private TextItem serverSettingServerName; + private TextItem serverSettingPublicAddress; + private SpinnerItem serverSettingWebHttpPort; + private SpinnerItem serverSettingWebSecureHttpPort; + private SelectItem registeredServersSelection; + private TextItem serverSettingEmailSMTPHostname; + private TextItem serverSettingEmailFromAddress; + + public void onModuleLoad() { + Canvas header = createHeader(); + mainInstallButton = createMainInstallButton(); + Canvas tabSet = createTabSet(); + + VLayout layout = new VLayout(); + layout.setWidth100(); + layout.setHeight100(); + layout.setLayoutMargin(10); + layout.setMembersMargin(5); + layout.setDefaultLayoutAlign(Alignment.CENTER); + layout.addMember(header); + layout.addMember(mainInstallButton); + layout.addMember(tabSet); + layout.draw(); + + // Remove loading image in case we don't completely cover it + Element loadingPanel = DOM.getElementById("Loading-Panel"); + loadingPanel.removeFromParent(); + + // get the server properties from the server + loadServerProperties(); + + } + + private void updateServerProperty(String name, Object value) { + serverProperties.putServerProperty(name, value == null ? "" : value.toString()); + refreshAdvancedView(); + } + + private void loadServerProperties() { + // load the initial server properties + installerService.getServerProperties(new AsyncCallback<HashMap<String, String>>() { + public void onSuccess(HashMap<String, String> result) { + if (result.size() == 0) { + SC.say("Initial server properties are missing."); + } + serverProperties.replaceServerProperties(result); + + // remember these original properties in case the user wants to reset them back + originalProperties.clear(); + originalProperties.putAll(result); + + // refresh the simple view with the new data + refreshSimpleView(); + + // refresh the advanced view with the new data + refreshAdvancedView(); + } + + public void onFailure(Throwable caught) { + SC.say("Cannot load properties: " + caught); + } + }); + } + + private void refreshSimpleView() { + Map<String, String> props = serverProperties.getMap(); + + // DB SETTINGS + dbType.setValue(props.get(ServerProperties.PROP_DATABASE_TYPE)); + dbConnectionUrl.setValue(props.get(ServerProperties.PROP_DATABASE_CONNECTION_URL)); + dbUsername.setValue(props.get(ServerProperties.PROP_DATABASE_USERNAME)); + // do not prefill the database password - force the user to know it and type it in for security purposes + + // SERVER SETTINGS + serverSettingServerName.setValue(props.get(ServerProperties.PROP_HIGH_AVAILABILITY_NAME)); + serverSettingWebHttpPort.setValue(props.get(ServerProperties.PROP_WEB_HTTP_PORT)); + serverSettingWebSecureHttpPort.setValue(props.get(ServerProperties.PROP_WEB_HTTPS_PORT)); + serverSettingEmailSMTPHostname.setValue(props.get(ServerProperties.PROP_EMAIL_SMTP_HOST)); + serverSettingEmailFromAddress.setValue(props.get(ServerProperties.PROP_EMAIL_FROM_ADDRESS)); + + forceAnotherTestConnection(); + } + + private void refreshAdvancedView() { + advancedPropertyItemGrid.markForRedraw(); + } + + private Canvas createHeader() { + ToolStrip strip = new ToolStrip(); + strip.setWidth100(); + strip.setAlign(Alignment.CENTER); + + Label title = new Label(); + title.setWidth100(); + title.setHeight100(); + title.setWrap(false); + title.setValign(VerticalAlignment.CENTER); + title.setAlign(Alignment.CENTER); + title.setContents("<span style=\"font-size:16pt;font-weight:bold;\">" + MSG.welcome_title() + "</span>"); + strip.addMember(title); + return strip; + } + + private Button createMainInstallButton() { + Button installButton = new Button(MSG.button_startInstallation()); + installButton.setWrap(false); + installButton.setAutoFit(true); + installButton.setDisabled(true); // we can't allow the user to install yet + installButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent event) { + SC.say("TODO: this should start the install"); + } + }); + + return installButton; + } + + private TabSet createTabSet() { + final TabSet topTabSet = new TabSet(); + topTabSet.setTabBarPosition(Side.TOP); + topTabSet.setTabBarAlign(Side.LEFT); + topTabSet.setWidth("90%"); + + final Tab welcomeTab = new Tab(MSG.tab_welcome()); + Label welcomeLabel = new Label(MSG.tab_welcome_content()); + welcomeTab.setPane(welcomeLabel); + + final Tab simpleViewTab = new Tab(MSG.tab_simpleView()); + Canvas simpleForm = createSimpleForm(); + simpleViewTab.setPane(simpleForm); + + final Tab advancedViewTab = new Tab(MSG.tab_advancedView()); + Canvas advancedView = createAdvancedView(); + advancedViewTab.setPane(advancedView); + + topTabSet.addTab(welcomeTab); + topTabSet.addTab(simpleViewTab); + topTabSet.addTab(advancedViewTab); + + return topTabSet; + } + + private Canvas createAdvancedView() { + VLayout layout = new VLayout(); + + ToolStrip strip = new ToolStrip(); + strip.setWidth100(); + + IButton saveButton = new IButton(MSG.button_save()); + saveButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent event) { + installerService.saveServerProperties(serverProperties.getMap(), new AsyncCallback<Void>() { + public void onSuccess(Void result) { + originalProperties.clear(); + originalProperties.putAll(serverProperties.getMap()); + SC.say("Properties saved to server"); + } + + public void onFailure(Throwable caught) { + SC.say("Failed to save properties to server"); + } + }); + } + }); + IButton resetButton = new IButton(MSG.button_reset()); + resetButton.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent event) { + serverProperties.replaceServerProperties(originalProperties); + refreshAdvancedView(); + } + }); + strip.addMember(saveButton); + strip.addMember(resetButton); + layout.addMember(strip); + + advancedPropertyItemGrid = new ListGrid(); + advancedPropertyItemGrid.setWidth100(); + advancedPropertyItemGrid.setHeight100(); + advancedPropertyItemGrid.setData(serverProperties); + + ListGridField nameField = new ListGridField(ServerPropertyRecordList.PROPERTY_NAME, MSG.property_name_label()); + nameField.setCanEdit(false); + + ListGridField valueField = new ListGridField(ServerPropertyRecordList.PROPERTY_VALUE, + MSG.property_value_label()); + valueField.setCanEdit(true); + + advancedPropertyItemGrid.setFields(nameField, valueField); + advancedPropertyItemGrid.setSortField(ServerPropertyRecordList.PROPERTY_NAME); + + advancedPropertyItemGrid.addEditCompleteHandler(new EditCompleteHandler() { + public void onEditComplete(EditCompleteEvent event) { + String newValue = (String) event.getNewValues().values().iterator().next().toString(); + String changedProperty = event.getOldRecord().getAttribute(ServerPropertyRecordList.PROPERTY_NAME); + serverProperties.getMap().put(changedProperty, newValue); // we need this to be reflected in the internal map + refreshSimpleView(); + } + }); + + layout.addMember(advancedPropertyItemGrid); + + return layout; + } + + private Canvas createSimpleForm() { + + final int fieldWidth = 300; + + //////////////////////////////////////////////////////// + // The Database form + + final DynamicForm databaseForm = new DynamicForm(); + databaseForm.setAutoWidth(); + databaseForm.setPadding(5); + databaseForm.setCellPadding(5); + databaseForm.setWrapItemTitles(false); + databaseForm.setIsGroup(true); + databaseForm.setGroupTitle(MSG.tab_simpleView_database()); + + dbConnectionUrl = new TextItem(ServerProperties.PROP_DATABASE_CONNECTION_URL, + PROPS_MSG.rhq_server_database_connection_url()); + dbConnectionUrl.setWidth(fieldWidth); + dbConnectionUrl.setValue("jdbc:postgresql://127.0.0.1:5432/rhq"); + dbConnectionUrl.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + updateServerProperty(ServerProperties.PROP_DATABASE_CONNECTION_URL, String.valueOf(event.getValue())); + forceAnotherTestConnection(); + } + }); + + dbUsername = new TextItem(ServerProperties.PROP_DATABASE_USERNAME, + PROPS_MSG.rhq_server_database_user_name()); + dbUsername.setWidth(fieldWidth); + dbUsername.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + updateServerProperty(ServerProperties.PROP_DATABASE_USERNAME, String.valueOf(event.getValue())); + forceAnotherTestConnection(); + } + }); + + dbPassword = new PasswordItem(ServerProperties.PROP_DATABASE_PASSWORD, + PROPS_MSG.rhq_server_database_password()); + dbPassword.setWidth(fieldWidth); + dbPassword.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + updateServerProperty(ServerProperties.PROP_DATABASE_PASSWORD, String.valueOf(event.getValue())); + forceAnotherTestConnection(); + } + }); + + dbExistingSchemaOption = new SelectItem("existingSchemaOption", MSG.schema_update_question()); + final LinkedHashMap<String, String> schemaOpt = new LinkedHashMap<String, String>(); + schemaOpt.put("keep", MSG.schema_update_keep()); + schemaOpt.put("overwrite", MSG.schema_update_overwrite()); + schemaOpt.put("skip", MSG.schema_update_skip()); + dbExistingSchemaOption.setValueMap(schemaOpt); + dbExistingSchemaOption.setDefaultToFirstOption(true); + dbExistingSchemaOption.setVisible(false); + dbExistingSchemaOption.setWidth(fieldWidth); + dbExistingSchemaOption.setWrapTitle(true); + dbExistingSchemaOption.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + if (registeredServersSelection != null) { + String selected = event.getValue().toString(); + if ("overwrite".equals(selected)) { + registeredServersSelection.setValue((String) null); + registeredServersSelection.disable(); + } else { + registeredServersSelection.enable(); + } + } + } + }); + + testConnectionButton = new ButtonItem("testConnectionButton", MSG.button_testConnection()); + testConnectionButton.addClickHandler(new com.smartgwt.client.widgets.form.fields.events.ClickHandler() { + public void onClick(com.smartgwt.client.widgets.form.fields.events.ClickEvent event) { + final Conn conn = new Conn(); + installerService.testConnection(conn.url(), conn.username(), conn.password(), + new AsyncCallback<String>() { + public void onSuccess(String result) { + if (result != null) { + forceAnotherTestConnection(); + testConnectionButton.setIcon("[SKIN]/actions/exclamation.png"); + SC.say("Could not connect to the database: " + result); + } else { + connectedToDatabase(); + } + } + + public void onFailure(Throwable caught) { + forceAnotherTestConnection(); + testConnectionButton.setIcon("[SKIN]/actions/exclamation.png"); + SC.say("Failed to test connection: " + caught.toString()); + } + }); + + } + }); + + dbType = new SelectItem(ServerProperties.PROP_DATABASE_TYPE, + PROPS_MSG.rhq_server_database_type_mapping()); + final LinkedHashMap<String, String> dbs = new LinkedHashMap<String, String>(); + dbs.put("PostgreSQL", "PostgreSQL"); + dbs.put("Oracle", "Oracle"); + dbType.setValueMap(dbs); + dbType.setDefaultToFirstOption(true); + dbType.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + forceAnotherTestConnection(); + + String newDBType = (String) event.getValue(); + String newURL = ""; + String dialect = ""; + String quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.StdJDBCDelegate"; + String quartzSelectWithLockSQL = "SELECT * FROM {0}LOCKS ROWLOCK WHERE LOCK_NAME = ? FOR UPDATE"; + String quartzLockHandlerClass = "org.quartz.impl.jdbcjobstore.StdRowLockSemaphore"; + + if ("PostgreSQL".equalsIgnoreCase(newDBType)) { + newURL = "jdbc:postgresql://127.0.0.1:5432/rhq"; + dialect = "org.hibernate.dialect.PostgreSQLDialect"; + quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.PostgreSQLDelegate"; + } else if ("Oracle".equalsIgnoreCase(newDBType)) { + newURL = "jdbc:oracle:thin:@127.0.0.1:1521:rhq"; + dialect = "org.hibernate.dialect.Oracle10gDialect"; + quartzDriverDelegateClass = "org.quartz.impl.jdbcjobstore.oracle.OracleDelegate"; + } + dbConnectionUrl.setValue(newURL); + + updateServerProperty(ServerProperties.PROP_DATABASE_CONNECTION_URL, newURL); + updateServerProperty(ServerProperties.PROP_DATABASE_HIBERNATE_DIALECT, dialect); + updateServerProperty(ServerProperties.PROP_QUARTZ_DRIVER_DELEGATE_CLASS, quartzDriverDelegateClass); + updateServerProperty(ServerProperties.PROP_QUARTZ_SELECT_WITH_LOCK_SQL, quartzSelectWithLockSQL); + updateServerProperty(ServerProperties.PROP_QUARTZ_LOCK_HANDLER_CLASS, quartzLockHandlerClass); + updateServerProperty(ServerProperties.PROP_DATABASE_TYPE, newDBType); // this refreshes the advanced view, too + } + }); + + // use this to move the button over to the second column - it looks better this way + SpacerItem buttonSpacer = new SpacerItem(); + buttonSpacer.setEndRow(false); + testConnectionButton.setStartRow(false); + + databaseForm.setFields(dbType, dbConnectionUrl, dbUsername, dbPassword, buttonSpacer, testConnectionButton, + dbExistingSchemaOption); + + //////////////////////////////////////////////////////// + // The Server Settings form + + final DynamicForm serverSettingsForm = new DynamicForm(); + serverSettingsForm.setPadding(5); + serverSettingsForm.setCellPadding(5); + serverSettingsForm.setAutoWidth(); + serverSettingsForm.setIsGroup(true); + serverSettingsForm.setWrapItemTitles(false); + serverSettingsForm.setGroupTitle(MSG.tab_simpleView_serverSettings()); + + serverSettingServerName = new TextItem(ServerProperties.PROP_HIGH_AVAILABILITY_NAME, + PROPS_MSG.rhq_server_high_availability_name()); + serverSettingServerName.setWidth(fieldWidth); + serverSettingServerName.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + updateServerProperty(ServerProperties.PROP_HIGH_AVAILABILITY_NAME, String.valueOf(event.getValue())); + if (registeredServersSelection != null) { + registeredServersSelection.setValue((String) null); // flip it back to *new* since the server name changed + } + } + }); + + serverSettingPublicAddress = new TextItem("serverPublicAddress", + MSG.tab_simpleView_serverSettings_publicAddress()); + serverSettingPublicAddress.setWidth(fieldWidth); + + serverSettingWebHttpPort = new SpinnerItem(ServerProperties.PROP_WEB_HTTP_PORT, + PROPS_MSG.rhq_server_startup_web_http_port()); + serverSettingWebHttpPort.setWidth(fieldWidth); + serverSettingWebHttpPort.setMin(1); + serverSettingWebHttpPort.setMax(65535); + serverSettingWebHttpPort.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + updateServerProperty(ServerProperties.PROP_WEB_HTTP_PORT, String.valueOf(event.getValue())); + } + }); + + serverSettingWebSecureHttpPort = new SpinnerItem(ServerProperties.PROP_WEB_HTTPS_PORT, + PROPS_MSG.rhq_server_startup_web_https_port()); + serverSettingWebSecureHttpPort.setWidth(fieldWidth); + serverSettingWebSecureHttpPort.setMin(1); + serverSettingWebSecureHttpPort.setMax(65535); + serverSettingWebSecureHttpPort.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + updateServerProperty(ServerProperties.PROP_WEB_HTTPS_PORT, String.valueOf(event.getValue())); + } + }); + + registeredServersSelection = new SelectItem("registeredServersSelectItem", + MSG.tab_simpleView_serverSettings_registeredServers()); + registeredServersSelection.setWidth(fieldWidth); + addContextualHelp(registeredServersSelection, MSG.help_registeredServers()); + registeredServerNames.put(NEW_SERVER_TO_REGISTER, + MSG.tab_simpleView_serverSettings_registeredServers_newServer()); + registeredServersSelection.setValueMap(registeredServerNames); + registeredServersSelection.setDefaultToFirstOption(true); + registeredServersSelection.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + final String selectedServerName = String.valueOf(event.getValue()); + final boolean newServer = NEW_SERVER_TO_REGISTER.equals(selectedServerName); + if (newServer) { + serverSettingServerName.setValue(""); + serverSettingPublicAddress.setValue(""); + updateServerProperty(ServerProperties.PROP_HIGH_AVAILABILITY_NAME, ""); + } else { + final Conn conn = new Conn(); + installerService.getServerDetails(conn.url(), conn.username(), conn.password(), selectedServerName, + new AsyncCallback<ServerDetails>() { + public void onSuccess(ServerDetails details) { + serverSettingServerName.setValue(details.getName()); + serverSettingPublicAddress.setValue(details.getEndpointAddress()); + serverSettingWebHttpPort.setValue(details.getEndpointPortString()); + serverSettingWebSecureHttpPort.setValue(details.getEndpointSecurePortString()); + updateServerProperty(ServerProperties.PROP_HIGH_AVAILABILITY_NAME, details.getName()); + updateServerProperty(ServerProperties.PROP_WEB_HTTP_PORT, + details.getEndpointPortString()); + updateServerProperty(ServerProperties.PROP_WEB_HTTPS_PORT, + details.getEndpointSecurePortString()); + } + + public void onFailure(Throwable caught) { + SC.say("Failed to get details on selected server [" + selectedServerName + "]"); + } + }); + } + } + }); + + serverSettingEmailSMTPHostname = new TextItem(ServerProperties.PROP_EMAIL_SMTP_HOST, + PROPS_MSG.rhq_server_email_smtp_host()); + serverSettingEmailSMTPHostname.setWidth(fieldWidth); + serverSettingEmailSMTPHostname.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + updateServerProperty(ServerProperties.PROP_EMAIL_SMTP_HOST, String.valueOf(event.getValue())); + } + }); + + serverSettingEmailFromAddress = new TextItem(ServerProperties.PROP_EMAIL_FROM_ADDRESS, + PROPS_MSG.rhq_server_email_from_address()); + serverSettingEmailFromAddress.setWidth(fieldWidth); + serverSettingEmailFromAddress.addChangedHandler(new ChangedHandler() { + public void onChanged(ChangedEvent event) { + updateServerProperty(ServerProperties.PROP_EMAIL_FROM_ADDRESS, String.valueOf(event.getValue())); + } + }); + + serverSettingsForm.setItems(registeredServersSelection, serverSettingServerName, serverSettingPublicAddress, + serverSettingWebHttpPort, serverSettingWebSecureHttpPort, serverSettingEmailSMTPHostname, + serverSettingEmailFromAddress); + + //////////////////////////////////////////////////////// + // The layout holding the forms in the simple view tab + + VLayout simpleForm = new VLayout(); + simpleForm.setLayoutMargin(5); + simpleForm.setMembersMargin(5); + simpleForm.setWidth100(); + simpleForm.setHeight100(); + simpleForm.setDefaultLayoutAlign(Alignment.CENTER); + simpleForm.addMember(databaseForm); + simpleForm.addMember(serverSettingsForm); + + return simpleForm; + } + + private void connectedToDatabase() { + final Conn conn = new Conn(); + testConnectionButton.setIcon("[SKIN]/actions/ok.png"); + installerService.isDatabaseSchemaExist(conn.url(), conn.username(), conn.password(), + new AsyncCallback<Boolean>() { + public void onSuccess(Boolean schemaExists) { + if (schemaExists) { + dbExistingSchemaOption.show(); + registeredServersSelection.enable(); + + installerService.getServerNames(conn.url(), conn.username(), conn.password(), + new AsyncCallback<ArrayList<String>>() { + public void onSuccess(ArrayList<String> servers) { + registeredServerNames.clear(); + registeredServerNames.put(NEW_SERVER_TO_REGISTER, + MSG.tab_simpleView_serverSettings_registeredServers_newServer()); + for (String server : servers) { + registeredServerNames.put(server, server); + } + registeredServersSelection.setValueMap(registeredServerNames); + } + + public void onFailure(Throwable caught) { + SC.say("Cannot get the registered server names"); + } + }); + } else { + dbExistingSchemaOption.hide(); + registeredServersSelection.setValue((String) null); + registeredServersSelection.disable(); + } + mainInstallButton.enable(); + } + + public void onFailure(Throwable caught) { + SC.say("Cannot determine the status of the database schema: " + caught); + } + }); + } + + private void addContextualHelp(final FormItem item, final String helpText) { + final FormItemIcon helpIcon = new FormItemIcon(); + helpIcon.setSrc("[SKIN]/actions/help.png"); + helpIcon.setNeverDisable(true); + item.setIcons(helpIcon); + + item.addIconClickHandler(new IconClickHandler() { + public void onIconClick(IconClickEvent event) { + if (event.getIcon().equals(helpIcon)) { + SC.say(helpText); + } + } + }); + } + + /** + * Call this when the user changed something (like connection URL or password) that renders + * the old connection test invalid. This will ensure the user is forced to re-test the connection. + */ + private void forceAnotherTestConnection() { + mainInstallButton.disable(); + testConnectionButton.setIcon(null); + dbExistingSchemaOption.hide(); + + if (registeredServerNames.size() > 1) { + registeredServerNames.clear(); + registeredServerNames.put(NEW_SERVER_TO_REGISTER, MSG.tab_simpleView_serverSettings_registeredServers_newServer()); + } + registeredServersSelection.setValue((String) null); + registeredServersSelection.setValueMap(registeredServerNames); + } + + // for convienence, so we can get the conn url, user, pass in one object + private class Conn { + public String url() { + return Installer.this.dbConnectionUrl.getValueAsString(); + } + + public String username() { + return Installer.this.dbUsername.getValueAsString(); + } + + public String password() { + return Installer.this.dbPassword.getValueAsString(); + } + } +} diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/ServerPropertyRecordList.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/ServerPropertyRecordList.java new file mode 100644 index 0000000..654e3cf --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/ServerPropertyRecordList.java @@ -0,0 +1,62 @@ +package org.rhq.enterprise.gui.installer.client; + +import java.util.HashMap; +import java.util.Map; + +import com.smartgwt.client.data.Record; +import com.smartgwt.client.data.RecordList; + +/** + * This provides a RecordList that is really a map underneath (each record is nothing more + * than a name/value pair; that is, each record has two attributes: name and value). + * + * We use this because this RecordList will be the list backing the Advanced View grid. + * So changing this list will be automatically reflected in that grid. + * + * @author John Mazzitelli + */ +public class ServerPropertyRecordList extends RecordList { + + public static final String PROPERTY_NAME = "n"; + public static final String PROPERTY_VALUE = "v"; + + // this map is kept in sync with the record list + private HashMap<String, String> map = new HashMap<String, String>(); + + public HashMap<String, String> getMap() { + return map; + } + + public String getServerProperty(String name) { + String value = map.get(name); + return (value == null) ? "" : value; + } + + public void putServerProperty(String name, String value) { + // fill in the internal map + map.put(name, value); + + // now update the record list + Record found = find(PROPERTY_NAME, name); + if (found == null) { + Record record = new Record(); + record.setAttribute(PROPERTY_NAME, name); + record.setAttribute(PROPERTY_VALUE, value); + add(record); + } else { + found.setAttribute(PROPERTY_VALUE, value); + } + } + + public void replaceServerProperties(Map<String, String> newMap) { + // first update the internal map + map.clear(); + map.putAll(newMap); + + // now update the record list + setLength(0); + for (Map.Entry<String, String> entry : newMap.entrySet()) { + putServerProperty(entry.getKey(), entry.getValue()); + } + } +} diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java new file mode 100644 index 0000000..c37d923 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java @@ -0,0 +1,105 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.installer.client.gwt; + +import java.util.ArrayList; +import java.util.HashMap; + +import com.google.gwt.user.client.rpc.RemoteService; + +import org.rhq.enterprise.gui.installer.client.shared.ServerDetails; + +/** + * @author John Mazzitelli + */ +public interface InstallerGWTService extends RemoteService { + + /** + * Returns a list of all registered servers in the database. + * + * @param connectionUrl + * @param username + * @param password + * @return list of all existing servers registered in the database. + * @throws Exception + */ + ArrayList<String> getServerNames(String connectionUrl, String username, String password) throws Exception; + + /** + * Returns details on a specific server that is registered in the database. + * + * @param connectionUrl + * @param username + * @param password + * @param serverName the name of the server whose details are to be retrieved + * @return the details of the server or null if the server does not exist + * @throws Exception + */ + ServerDetails getServerDetails(String connectionUrl, String username, String password, String serverName) + throws Exception; + + /** + * Tests to see if there is already a schema installed. + * + * @param connectionUrl + * @param username + * @param password + * @return <code>true</code> if there appears to be a schema installed in the database already. + * @throws Exception + */ + boolean isDatabaseSchemaExist(String connectionUrl, String username, String password) throws Exception; + + /** + * Tests that the database can be connected to with the given URL and credentials. + * @param connectionUrl + * @param username + * @param password + * @return <code>null</code> if the connection succeeded; this will be an error message if failed + * @throws Exception + */ + String testConnection(String connectionUrl, String username, String password) throws Exception; + + /** + * Returns the rhq-server.properties values in a map. + * @return server properties + * @throws Exception + */ + HashMap<String, String> getServerProperties() throws Exception; + + /** + * Saves the rhq-server.properties with the given values. + * @param serverProperties + * @throws Exception + */ + void saveServerProperties(HashMap<String, String> serverProperties) throws Exception; + + /** + * Returns the version string for the app server itself (e.g. "7.1.2.Final"). + * @return version string of app server + * @throws Exception + */ + String getAppServerVersion() throws Exception; + + /** + * Returns the general type of operating system the server is running on (e.g. "Linux"). + * @return os type name + * @throws Exception + */ + String getOperatingSystem() throws Exception; +} diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerDetails.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerDetails.java new file mode 100644 index 0000000..b54e380 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerDetails.java @@ -0,0 +1,115 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.installer.client.shared; + +import java.io.Serializable; + +public class ServerDetails implements Serializable { + private static final long serialVersionUID = 1L; + + public static final String DEFAULT_AFFINITY_GROUP = ""; + public static final int DEFAULT_ENDPOINT_PORT = 7080; + public static final int DEFAULT_ENDPOINT_SECURE_PORT = 7443; + + private String name; + private String endpointAddress; + private int endpointPort; + private int endpointSecurePort; + private String affinityGroup; + + protected ServerDetails() { + // for GWT + } + + public ServerDetails(String name, String endpointAddress, int port, int securePort, String affinityGroup) { + this.name = name; + this.endpointAddress = endpointAddress; + this.endpointPort = port; + this.endpointSecurePort = securePort; + this.affinityGroup = affinityGroup; + } + + public String getName() { + return name; + } + + public void setName(String name) { + if ((null != name) && (!"".equals(name.trim()))) { + this.name = name; + } + } + + public String getEndpointAddress() { + return endpointAddress; + } + + public void setEndpointAddress(String endpointAddress) { + if ((null != endpointAddress) && (!"".equals(endpointAddress.trim()))) { + this.endpointAddress = endpointAddress; + } + } + + public int getEndpointPort() { + return endpointPort; + } + + public void setEndpointPort(int endpointPort) { + this.endpointPort = endpointPort; + } + + public String getEndpointPortString() { + return (String.valueOf(endpointPort)); + } + + public void setEndpointPortString(String endpointPort) { + this.endpointPort = Integer.valueOf(endpointPort).intValue(); + } + + public int getEndpointSecurePort() { + return endpointSecurePort; + } + + public void setEndpointSecurePort(int endpointSecurePort) { + this.endpointSecurePort = endpointSecurePort; + } + + public String getEndpointSecurePortString() { + return (String.valueOf(endpointSecurePort)); + } + + public void setEndpointSecurePortString(String endpointSecurePort) { + this.endpointSecurePort = Integer.valueOf(endpointSecurePort).intValue(); + } + + public String getAffinityGroup() { + return affinityGroup; + } + + public void setAffinityGroup(String affinityGroup) { + if ((null != affinityGroup) && (!"".equals(affinityGroup.trim()))) { + this.affinityGroup = affinityGroup; + } + } + + @Override + public String toString() { + return "[name=" + name + " address=" + endpointAddress + " port=" + endpointPort + " secureport=" + + endpointSecurePort + " affinitygroup=" + affinityGroup + "]"; + } +} diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java new file mode 100644 index 0000000..d92d4ce --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java @@ -0,0 +1,53 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2008 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.installer.client.shared; + +/** + * Settings found in the rhq-server.properties file that controls the startup configuration of the server. + * + * @author John Mazzitelli + */ +public class ServerProperties { + public static final String PREFIX_PROP_DATABASE = "rhq.server.database."; + public static final String PROP_DATABASE_TYPE = PREFIX_PROP_DATABASE + "type-mapping"; + public static final String PROP_DATABASE_CONNECTION_URL = PREFIX_PROP_DATABASE + "connection-url"; + public static final String PROP_DATABASE_USERNAME = PREFIX_PROP_DATABASE + "user-name"; + public static final String PROP_DATABASE_PASSWORD = PREFIX_PROP_DATABASE + "password"; + public static final String PROP_DATABASE_SERVER_NAME = PREFIX_PROP_DATABASE + "server-name"; + public static final String PROP_DATABASE_PORT = PREFIX_PROP_DATABASE + "port"; + public static final String PROP_DATABASE_DB_NAME = PREFIX_PROP_DATABASE + "db-name"; + public static final String PROP_DATABASE_HIBERNATE_DIALECT = "hibernate.dialect"; + public static final String PROP_QUARTZ_DRIVER_DELEGATE_CLASS = "rhq.server.quartz.driverDelegateClass"; + public static final String PROP_QUARTZ_SELECT_WITH_LOCK_SQL = "rhq.server.quartz.selectWithLockSQL"; + public static final String PROP_QUARTZ_LOCK_HANDLER_CLASS = "rhq.server.quartz.lockHandlerClass"; + + public static final String PREFIX_PROP_WEB = "rhq.server.startup.web."; + public static final String PROP_WEB_HTTP_PORT = PREFIX_PROP_WEB + "http.port"; + public static final String PROP_WEB_HTTPS_PORT = PREFIX_PROP_WEB + "https.port"; + + public static final String PREFIX_PROP_EMBEDDED_AGENT = "rhq.server.embedded-agent."; + public static final String PROP_EMBEDDED_AGENT_ENABLED = PREFIX_PROP_EMBEDDED_AGENT + "enabled"; + + public static final String PREFIX_PROP_EMAIL = "rhq.server.email."; + public static final String PROP_EMAIL_SMTP_HOST = PREFIX_PROP_EMAIL + "smtp-host"; + public static final String PROP_EMAIL_FROM_ADDRESS = PREFIX_PROP_EMAIL + "from-address"; + + public static final String PROP_HIGH_AVAILABILITY_NAME = "rhq.server.high-availability.name"; + public static final String PROP_MM_AT_START = "rhq.server.maintenance-mode-at-startup"; +} \ No newline at end of file diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/service/ManagementService.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/service/ManagementService.java new file mode 100644 index 0000000..add78a6 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/service/ManagementService.java @@ -0,0 +1,100 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.installer.server.service; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadFactory; + +import org.jboss.as.controller.ModelController; +import org.jboss.as.controller.client.ModelControllerClient; +import org.jboss.as.server.Services; +import org.jboss.msc.service.Service; +import org.jboss.msc.service.ServiceActivator; +import org.jboss.msc.service.ServiceActivatorContext; +import org.jboss.msc.service.ServiceName; +import org.jboss.msc.service.ServiceRegistryException; +import org.jboss.msc.service.StartContext; +import org.jboss.msc.service.StartException; +import org.jboss.msc.service.StopContext; +import org.jboss.msc.value.InjectedValue; + +/** + * This will provide our co-located management service. + * This is useful because it helps us avoid performing any management + * over a remote connector. Since we know we are running co-located + * in the same app server container that we want to manage, this + * service will provide us with a management client that does not go + * over a remote connector to talk to our app server container. + * + * @author John Mazzitelli + */ +public class ManagementService implements ServiceActivator { + + private static volatile ModelController controller; + private static volatile ExecutorService executor; + + public static ModelControllerClient getClient() { + return controller.createClient(executor); + } + + @Override + public void activate(ServiceActivatorContext context) throws ServiceRegistryException { + final GetModelControllerService service = new GetModelControllerService(); + context + .getServiceTarget() + .addService(ServiceName.of("rhq", "installer", "management", "client", "getter"), service) + .addDependency(Services.JBOSS_SERVER_CONTROLLER, ModelController.class, service.modelControllerValue) + .install(); + } + + private class GetModelControllerService implements Service<Void> { + private InjectedValue<ModelController> modelControllerValue = new InjectedValue<ModelController>(); + + @Override + public Void getValue() throws IllegalStateException, IllegalArgumentException { + return null; + } + + @Override + public void start(StartContext context) throws StartException { + ManagementService.executor = Executors.newFixedThreadPool(5, new ThreadFactory() { + @Override + public Thread newThread(Runnable r) { + Thread t = new Thread(r); + t.setDaemon(true); + t.setName("ManagementServiceModelControllerClientThread"); + return t; + } + }); + ManagementService.controller = modelControllerValue.getValue(); + } + + @Override + public void stop(StopContext context) { + try { + ManagementService.executor.shutdownNow(); + } finally { + ManagementService.executor = null; + ManagementService.controller = null; + } + } + + } +} diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java new file mode 100644 index 0000000..6247168 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java @@ -0,0 +1,161 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.installer.server.servlet; + +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import javax.servlet.annotation.WebServlet; + +import com.google.gwt.user.server.rpc.RemoteServiceServlet; + +import org.jboss.as.controller.client.ModelControllerClient; + +import org.rhq.common.jbossas.client.controller.Address; +import org.rhq.common.jbossas.client.controller.JBossASClient; +import org.rhq.common.jbossas.client.controller.SecurityDomainJBossASClient; +import org.rhq.core.util.PropertiesFileUpdate; +import org.rhq.enterprise.gui.installer.client.gwt.InstallerGWTService; +import org.rhq.enterprise.gui.installer.client.shared.ServerDetails; +import org.rhq.enterprise.gui.installer.server.service.ManagementService; + +/** + * @author John Mazzitelli + */ +@WebServlet(value = "/org.rhq.enterprise.gui.installer.Installer/InstallerGWTService") +public class InstallerGWTServiceImpl extends RemoteServiceServlet implements InstallerGWTService { + + private static final long serialVersionUID = 1L; + + private static final String RHQ_SECURITY_DOMAIN = "RHQDSSecurityDomain"; + + @Override + public ArrayList<String> getServerNames(String connectionUrl, String username, String password) throws Exception { + try { + return ServerInstallUtil.getServerNames(connectionUrl, username, password); + } catch (Exception e) { + log("Could not get the list of registered server names", e); + return null; + } + } + + @Override + public ServerDetails getServerDetails(String connectionUrl, String username, String password, String serverName) + throws Exception { + try { + return ServerInstallUtil.getServerDetails(connectionUrl, username, password, serverName); + } catch (Exception e) { + log("Could not get server details for [" + serverName + "]", e); + return null; + } + } + + @Override + public boolean isDatabaseSchemaExist(String connectionUrl, String username, String password) throws Exception { + try { + return ServerInstallUtil.isDatabaseSchemaExist(connectionUrl, username, password); + } catch (Exception e) { + log("Could not determine database existence", e); + return false; + } + } + + @Override + public String testConnection(String connectionUrl, String username, String password) throws Exception { + String results = ServerInstallUtil.testConnection(connectionUrl, username, password); + return results; + } + + @Override + public HashMap<String, String> getServerProperties() throws Exception { + File serverPropertiesFile = getServerPropertiesFile(); + PropertiesFileUpdate propsFile = new PropertiesFileUpdate(serverPropertiesFile.getAbsolutePath()); + Properties props = propsFile.loadExistingProperties(); + + // GWT can't handle Properties - convert to HashMap + HashMap<String, String> map = new HashMap<String, String>(props.size()); + for (Object property : props.keySet()) { + map.put(property.toString(), props.getProperty(property.toString())); + } + return map; + } + + @Override + public void saveServerProperties(HashMap<String, String> serverProperties) throws Exception { + File serverPropertiesFile = getServerPropertiesFile(); + PropertiesFileUpdate propsFile = new PropertiesFileUpdate(serverPropertiesFile.getAbsolutePath()); + + // GWT can't handle Properties - convert from HashMap + Properties props = new Properties(); + for (Map.Entry<String, String> entry : serverProperties.entrySet()) { + props.setProperty(entry.getKey(), entry.getValue()); + } + + propsFile.update(props); + + return; + } + + @Override + public String getAppServerVersion() throws Exception { + JBossASClient client = new JBossASClient(getClient()); + String version = client.getStringAttribute("release-version", Address.root()); + return version; + } + + @Override + public String getOperatingSystem() throws Exception { + JBossASClient client = new JBossASClient(getClient()); + String[] address = { "core-service", "platform-mbean", "type", "operating-system" }; + String osName = client.getStringAttribute("name", Address.root().add(address)); + return osName; + } + + private String getAppServerHomeDir() throws Exception { + JBossASClient client = new JBossASClient(getClient()); + String[] address = { "core-service", "server-environment" }; + String dir = client.getStringAttribute(true, "home-dir", Address.root().add(address)); + return dir; + } + + private File getServerPropertiesFile() throws Exception { + File appServerHomeDir = new File(getAppServerHomeDir()); + File serverPropertiesFile = new File(appServerHomeDir, "../bin/rhq-server.properties"); + return serverPropertiesFile; + } + + private ModelControllerClient getClient() { + ModelControllerClient client = ManagementService.getClient(); + return client; + } + + private void createDatasourceSecurityDomain(String username, String password) throws Exception { + final SecurityDomainJBossASClient client = new SecurityDomainJBossASClient(getClient()); + final String securityDomain = RHQ_SECURITY_DOMAIN; + if (!client.isSecurityDomain(securityDomain)) { + client.createNewSecureIdentitySecurityDomainRequest(securityDomain, username, password); + log("Security domain [" + securityDomain + "] created"); + } else { + log("Security domain [" + securityDomain + "] already exists, skipping the creation request"); + } + } +} diff --git a/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java new file mode 100644 index 0000000..4577789 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java @@ -0,0 +1,274 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.enterprise.gui.installer.server.servlet; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.db.DatabaseType; +import org.rhq.core.db.DatabaseTypeFactory; +import org.rhq.core.db.DbUtil; +import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.enterprise.gui.installer.client.shared.ServerDetails; + +/** + * Provides utility methods necessary to complete the server installation. + * + * @author John Mazzitelli + */ +public class ServerInstallUtil { + private static final Log LOG = LogFactory.getLog(ServerInstallUtil.class); + + public enum ExistingSchemaOption { + OVERWRITE, KEEP, SKIP + }; + + public static boolean isKeepExistingSchema(ExistingSchemaOption existingSchemaOption) { + return ExistingSchemaOption.KEEP.name().equals(existingSchemaOption) + || ExistingSchemaOption.SKIP.name().equals(existingSchemaOption); + } + + /** + * Returns <code>true</code> if the database already has the database schema created for it. It will not be known + * what version of schema or if its the latest, all this method tells you is that some RHQ database schema exists. + * + * @param connectionUrl + * @param username + * @param password + * @return <code>true</code> if the database can be connected to + * + * @throws Exception if failed to communicate with the database + */ + public static boolean isDatabaseSchemaExist(String connectionUrl, String username, String password) + throws Exception { + + Connection conn = getDatabaseConnection(connectionUrl, username, password); + DatabaseType db = DatabaseTypeFactory.getDatabaseType(conn); + + try { + return db.checkTableExists(conn, "RHQ_PRINCIPAL"); + } catch (IllegalStateException e) { + return false; + } finally { + db.closeConnection(conn); + } + } + + /** + * Get the list of existing servers from an existing schema. + * + * @param connectionUrl + * @param username + * @param password + * @return List of server names registered in the database. Empty list if the table does not exist or there are no entries in the table. + * + * @throws Exception if failed to communicate with the database + */ + public static ArrayList<String> getServerNames(String connectionUrl, String username, String password) + throws Exception { + DatabaseType db = null; + Connection conn = null; + Statement stm = null; + ResultSet rs = null; + ArrayList<String> result = new ArrayList<String>(); + + try { + conn = getDatabaseConnection(connectionUrl, username, password); + db = DatabaseTypeFactory.getDatabaseType(conn); + + if (db.checkTableExists(conn, "rhq_server")) { + + stm = conn.createStatement(); + rs = stm.executeQuery("SELECT name FROM rhq_server ORDER BY name asc"); + + while (rs.next()) { + result.add(rs.getString(1)); + } + } + } catch (IllegalStateException e) { + // table does not exist + } catch (SQLException e) { + LOG.info("Unable to fetch existing server info: " + e.getMessage()); + } finally { + if (null != db) { + db.closeJDBCObjects(conn, stm, rs); + } + } + + return result; + } + + /** + * Returns information on the server as found in the database (port numbers, affinity group, etc). + * + * @param connectionUrl + * @param username + * @param password + * @param serverName the server whose details are to be returned + * @return the information on the named server + */ + public static ServerDetails getServerDetails(String connectionUrl, String username, String password, + String serverName) { + + DatabaseType db = null; + Connection conn = null; + ServerDetails result = null; + + try { + conn = getDatabaseConnection(connectionUrl, username, password); + db = DatabaseTypeFactory.getDatabaseType(conn); + + result = getServerDetails(db, conn, serverName); + + } catch (Exception e) { + LOG.info("Unable to get server detail: " + e.getMessage()); + } finally { + if (null != db) { + db.closeConnection(conn); + } + } + + return result; + } + + private static ServerDetails getServerDetails(DatabaseType db, Connection conn, String serverName) { + PreparedStatement stm = null; + ResultSet rs = null; + ServerDetails result = null; + + if (null == serverName) { + return result; + } + + try { + stm = conn.prepareStatement("" // + + "SELECT s.address, s.port, s.secure_port, ag.name " // + + " FROM rhq_server s LEFT JOIN rhq_affinity_group ag ON ag.id = s.affinity_group_id " // + + " WHERE s.name = ?"); + stm.setString(1, serverName.trim()); + + rs = stm.executeQuery(); + + if (rs.next()) { + result = new ServerDetails(serverName, rs.getString(1), rs.getInt(2), rs.getInt(3), rs.getString(4)); + } + + } catch (SQLException e) { + LOG.info("Unable to get affinity group name for server: " + e.getMessage()); + } finally { + if (null != db) { + db.closeResultSet(rs); + db.closeStatement(stm); + } + } + + return result; + } + + /** + * Tests to make sure the server can be connected to with the given settings. + * If the test is successful, <code>null</code>. If the test fails, the returned string + * will be the error message to indicate the problem. + * + * @param connectionUrl + * @param username + * @param password + * @return error message if test failed; <code>null</code> if test succeeded + */ + public static String testConnection(String connectionUrl, String username, String password) { + + // its possible the JDBC URL was changed, clear the factory cache in case the DB version is different now + DatabaseTypeFactory.clearDatabaseTypeCache(); + + try { + ensureDatabaseIsSupported(connectionUrl, username, password); + return null; + } catch (Exception e) { + LOG.warn("Installer failed to test connection", e); + return ThrowableUtil.getAllMessages(e); + } + } + + /** + * Call this when you need to confirm that the database is supported. + * + * @param connectionUrl + * @param username + * @param password + * + * @throws Exception if the database is not supported + */ + public static void ensureDatabaseIsSupported(String connectionUrl, String username, String password) + throws Exception { + Connection conn = null; + DatabaseType db = null; + + try { + conn = getDatabaseConnection(connectionUrl, username, password); + db = DatabaseTypeFactory.getDatabaseType(conn); + + String version = db.getVersion(); + + if (DatabaseTypeFactory.isPostgres(db)) { + if (version.startsWith("7") || version.equals("8") || version.startsWith("8.0") + || version.startsWith("8.1")) { + throw new Exception("Unsupported PostgreSQL [" + db + "]"); + } + } else if (DatabaseTypeFactory.isOracle(db)) { + if (version.startsWith("8") || version.startsWith("9")) { + throw new Exception("Unsupported Oracle [" + db + "]"); + } + } else { + throw new Exception("Unsupported DB [" + db + "]"); + } + + LOG.info("Database is supported: " + db); + } finally { + if (db != null) { + db.closeConnection(conn); + } + } + + return; + } + + /** + * Returns a database connection with the given set of properties providing the settings that allow for a successful + * database connection. If <code>props</code> is <code>null</code>, it will use the server properties from + * {@link #getServerProperties()}. + * + * @param connectionUrl + * @param userName + * @param password + * @return the database connection + * + * @throws SQLException if cannot successfully connect to the database + */ + public static Connection getDatabaseConnection(String connectionUrl, String userName, String password) + throws SQLException { + return DbUtil.getConnection(connectionUrl, userName, password); + } +} diff --git a/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/Installer.gwt.xml b/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/Installer.gwt.xml new file mode 100644 index 0000000..164e94a --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/Installer.gwt.xml @@ -0,0 +1,35 @@ +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.4.0//EN" + "http://google-web-toolkit.googlecode.com/svn/tags/2.4.0/distro-source/cor..."> + +<module> + + <inherits name='com.google.gwt.user.User'/> + <inherits name='com.google.gwt.i18n.I18N'/> + <inherits name="com.google.gwt.logging.Logging"/> + + <inherits name='com.smartgwt.SmartGwt' /> + <inherits name="com.smartgwt.tools.SmartGwtTools"/> + +  + <set-property name="gwt.logging.enabled" value="TRUE"/> +  + <set-property name="gwt.logging.logLevel" value="FINE"/> + <set-property name="gwt.logging.consoleHandler" value="ENABLED" /> + <set-property name="gwt.logging.developmentModeHandler" value="ENABLED" /> + <set-property name="gwt.logging.firebugHandler" value="ENABLED" /> + <set-property name="gwt.logging.hasWidgetsHandler" value="DISABLED" /> + <set-property name="gwt.logging.popupHandler" value="DISABLED" /> + <set-property name="gwt.logging.systemHandler" value="ENABLED" /> + <set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" /> + + <set-property name="user.agent" value="${gwt.userAgent}"/> + <extend-property name="locale" values="${gwt.locale}" /> + + <set-configuration-property name="locale.usemeta" value="Y"/> + <set-configuration-property name="locale.useragent" value="Y"/> + <set-configuration-property name="locale.searchorder" value="queryparam,meta,useragent,cookie"/> + <set-property-fallback name="locale" value="${gwt.fallback.locale}"/> + + <entry-point class='org.rhq.enterprise.gui.installer.client.Installer'/> + +</module> diff --git a/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties b/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties new file mode 100644 index 0000000..5915f40 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties @@ -0,0 +1,21 @@ +button_reset = Reset +button_save = Save +button_startInstallation = Press To Start The Installation Now +button_testConnection = Test Connection +help_registeredServers = If you are performing an upgrade or a re-installation then you should select a server from this list of registered servers. If you want to install a new server into the system, select the *New Server* option. (Note that if you are going to overwrite your existing schema, you cannot select an existing registered server since they will be deleted when the overwrite is performed.) +property_name_label = Property +property_value_label = Value +schema_update_keep = Keep (Maintain Existing Data) +schema_update_overwrite = Overwrite (Lose Existing Data!) +schema_update_question = A database schema already exists. What do you want to do? +schema_update_skip = Skip (Leave Database As-Is) +tab_advancedView = Advanced View +tab_simpleView = Simple View +tab_simpleView_database = Database Settings +tab_simpleView_serverSettings = Server Settings +tab_simpleView_serverSettings_publicAddress = Server Public Address +tab_simpleView_serverSettings_registeredServers = Registered Server Names +tab_simpleView_serverSettings_registeredServers_newServer = *New Server* +tab_welcome = Welcome +tab_welcome_content = <h1>Welcome to the new GWT Installer</h1>\nThis is the <b>new</b> installer.\nAny HTML can go in here. +welcome_title = Installing the Server diff --git a/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/ServerPropertiesMessages.properties b/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/ServerPropertiesMessages.properties new file mode 100644 index 0000000..6c53445 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/ServerPropertiesMessages.properties @@ -0,0 +1,23 @@ +### RHQ Server Configuration Properties +### These should match the actual property names in rhq-server.properties. + +# Database +rhq.server.database.connection-url=Database Connection URL +rhq.server.database.user-name=Database Username +rhq.server.database.password=Database Password +rhq.server.database.type-mapping=Database Type + +# High Availability (HA) +rhq.server.high-availability.name=Server Name +rhq.server.maintenance-mode-at-startup=Maintenance Mode At Startup + +# General Properties +rhq.server.startup.web.http.port=HTTP Port +rhq.server.startup.web.https.port=Secure HTTP Port + +# Embedded RHQ Agent +rhq.server.embedded-agent.enabled=Embedded Agent Enabled + +# Email +rhq.server.email.smtp-host=Email SMTP Host +rhq.server.email.from-address=Email From Address \ No newline at end of file diff --git a/modules/enterprise/gui/installer/src/main/webapp/WEB-INF/classes/META-INF/services/org.jboss.msc.service.ServiceActivator b/modules/enterprise/gui/installer/src/main/webapp/WEB-INF/classes/META-INF/services/org.jboss.msc.service.ServiceActivator new file mode 100644 index 0000000..c64cc21 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/webapp/WEB-INF/classes/META-INF/services/org.jboss.msc.service.ServiceActivator @@ -0,0 +1 @@ +org.rhq.enterprise.gui.installer.server.service.ManagementService \ No newline at end of file diff --git a/modules/enterprise/gui/installer/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/installer/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..b970eb3 --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,9 @@ +<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> + + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> diff --git a/modules/enterprise/gui/installer/src/main/webapp/index.html b/modules/enterprise/gui/installer/src/main/webapp/index.html new file mode 100644 index 0000000..cb9016e --- /dev/null +++ b/modules/enterprise/gui/installer/src/main/webapp/index.html @@ -0,0 +1,45 @@ +<html> +<head> +  + <meta http-equiv="X-UA-Compatible" content="IE=8" /> + +  + <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" /> + + <script> + var search = location.search; + // only do this if you have not specified locale as query param + if(search.indexOf("locale") == -1){ + // IE uses browserLanguage + var lang = navigator.language!=null ? navigator.language : navigator.browserLanguage; + var lang = lang.replace("-", "_"); + document.write("<meta name='gwt:property' content='locale="+lang +"'>"); + } + </script> + + <title>RHQ Installer</title> + + <script type="text/javascript"> + var isomorphicDir = "org.rhq.enterprise.gui.installer.Installer/sc/"; + </script> + +</head> +<body> + + <script type="text/javascript" language="javascript" + src="org.rhq.enterprise.gui.installer.Installer/org.rhq.enterprise.gui.installer.Installer.nocache.js"></script> + + <div id="Loading-Panel" style="width: 214px; height: 90px; margin-top: 300px; margin-left: 40%; margin-right: 40%;"> + <div style="text-align: center; border: 3px solid lightgray;"> + Loading Installer... + </div> + </div> + + <iframe src="javascript:''" id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe> + +</body> +</html> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index ae67384..b9ca5f5 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -28,7 +28,7 @@ </activation> <modules> <module>portal-war</module> - <module>installer-war</module> + <module>installer</module> <module>base-perspective-jar</module> <module>base-perspective-war</module>  diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 5cb56a5..50566a2 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -237,10 +237,10 @@ <touch file="${jboss.deploy.dir}/${rhq.earName}.skipdeploy" /> <echo>Deploying installer webapp ...</echo> - <mkdir dir="${jboss.deploy.dir}/rhq-gwt-installer-war.war" /> - <unwar src="${settings.localRepository}/org/rhq/rhq-gwt-installer-war/${rhq.version}/rhq-gwt-installer-war-${rhq.version}.war" - dest="${jboss.deploy.dir}/rhq-gwt-installer-war.war" /> - <touch file="${jboss.deploy.dir}/rhq-gwt-installer-war.war.dodeploy" /> + <mkdir dir="${jboss.deploy.dir}/rhq-installer.war" /> + <unwar src="${settings.localRepository}/org/rhq/rhq-installer/${rhq.version}/rhq-installer-${rhq.version}.war" + dest="${jboss.deploy.dir}/rhq-installer.war" /> + <touch file="${jboss.deploy.dir}/rhq-installer.war.dodeploy" />  <!--

11 years, 10 months

1
0
0 / 0

[rhq] Branch 'mazz/test-rhq-on-as7' - modules/enterprise

by mazz

modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf | 52 +++++----- modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc | 6 - 2 files changed, 30 insertions(+), 28 deletions(-) New commits: commit be685b67e304e357a4135be4a1594ee2f8ab3ac0 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Aug 1 19:15:38 2012 -0400 get the rhq server on as7 running on windows using the java service wrapper - i tested this successfully on win xp, both in console mode and installed as a service diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf index 9fef419..bf75086 100644 --- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf @@ -42,23 +42,23 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp # Java Classpath (include wrapper.jar). Add classpath elements starting at 1 (quotes not needed) wrapper.java.classpath.1=%RHQ_SERVER_HOME%/bin/wrapper/%RHQ_SERVER_OS_PLATFORM%/wrapper.jar +wrapper.java.classpath.2=%RHQ_SERVER_HOME%/jbossas/jboss-modules.jar # Java Library Path (location of wrapper.dll/libwrapper.so and other JNI libs) (quotes not needed) wrapper.java.library.path.1=%RHQ_SERVER_HOME%/bin/wrapper/%RHQ_SERVER_OS_PLATFORM% # The RHQ Server starts the JBossAS container -wrapper.app.parameter.1=-jar -wrapper.app.parameter.2="%RHQ_SERVER_HOME%/jbossas/jboss-modules.jar" +wrapper.app.parameter.1=org.jboss.modules.Main # Additional command line arguments to be passed to the RHQ Server/JBossAS container (quotes ARE needed) -wrapper.app.parameter.3=-mp -wrapper.app.parameter.4="%RHQ_SERVER_HOME%/jbossas/modules" -wrapper.app.parameter.5=-jaxpmodule -wrapper.app.parameter.6=javax.xml.jaxp-provider -wrapper.app.parameter.7=org.jboss.as.standalone -wrapper.app.parameter.8="-Djboss.home.dir=%RHQ_SERVER_HOME%/jbossas" -wrapper.app.parameter.9=-P -wrapper.app.parameter.10="%RHQ_SERVER_HOME%/bin/rhq-server.properties" +wrapper.app.parameter.2=-mp +wrapper.app.parameter.3="%RHQ_SERVER_HOME%/jbossas/modules" +wrapper.app.parameter.4=-jaxpmodule +wrapper.app.parameter.5=javax.xml.jaxp-provider +wrapper.app.parameter.6=org.jboss.as.standalone +wrapper.app.parameter.7="-Djboss.home.dir=%RHQ_SERVER_HOME%/jbossas" +wrapper.app.parameter.8=-P +wrapper.app.parameter.9="%RHQ_SERVER_HOME%/bin/rhq-server.properties" # Additional JVM parameters (quotes ARE needed) wrapper.java.additional.1="-D[Standalone]" @@ -68,23 +68,25 @@ wrapper.java.additional.4=-Xms1024M wrapper.java.additional.5=-Xmx1024M wrapper.java.additional.6=-XX:PermSize=256M wrapper.java.additional.7=-XX:MaxPermSize=256M -wrapper.java.additional.8=-XX:+TieredCompilation -wrapper.java.additional.9=-XX:+UseCompressedOops -wrapper.java.additional.10=-Djava.net.preferIPv4Stack=true -wrapper.java.additional.11=-Dorg.jboss.resolver.warning=true -wrapper.java.additional.12=-Dsun.rmi.dgc.client.gcInterval=3600000 -wrapper.java.additional.13=-Dsun.rmi.dgc.server.gcInterval=3600000 -wrapper.java.additional.14=-Djboss.modules.system.pkgs=org.jboss.byteman -wrapper.java.additional.15=-Djava.awt.headless=true -wrapper.java.additional.16=-Djboss.server.default.config=standalone.xml -wrapper.java.additional.17="-Dorg.jboss.boot.log.file=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%/jbossas-boot.log" -wrapper.java.additional.18="-Dlogging.configuration=file:%RHQ_SERVER_HOME%/jbossas/standalone/configuration/logging.properties" -wrapper.java.additional.19=-Dsun.lang.ClassLoader.allowArraySyntax=true -wrapper.java.additional.20=-Djava.security.manager +wrapper.java.additional.8=-Djava.net.preferIPv4Stack=true +wrapper.java.additional.9=-Dorg.jboss.resolver.warning=true +wrapper.java.additional.10=-Dsun.rmi.dgc.client.gcInterval=3600000 +wrapper.java.additional.11=-Dsun.rmi.dgc.server.gcInterval=3600000 +wrapper.java.additional.12=-Djboss.modules.system.pkgs=org.jboss.byteman +wrapper.java.additional.13=-Djava.awt.headless=true +wrapper.java.additional.14=-Djboss.server.default.config=standalone.xml +wrapper.java.additional.15="-Dorg.jboss.boot.log.file=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%/jbossas-boot.log" +wrapper.java.additional.16="-Djboss.server.log.dir=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" +wrapper.java.additional.17="-Dlogging.configuration=file:%RHQ_SERVER_HOME%/jbossas/standalone/configuration/logging.properties" +wrapper.java.additional.18=-Dsun.lang.ClassLoader.allowArraySyntax=true +wrapper.java.additional.19=-Djava.security.manager # the double equals for the policy file specification IS INTENTIONAL -wrapper.java.additional.21="-Djava.security.policy==%RHQ_SERVER_HOME%/bin/rhq-server.security-policy" +wrapper.java.additional.20="-Djava.security.policy==%RHQ_SERVER_HOME%/bin/rhq-server.security-policy" +# use these if your JVM supports it +#wrapper.java.additional.21=-XX:+TieredCompilation +#wrapper.java.additional.22=-XX:+UseCompressedOops # Don't need these now, but this is commented out in case we need to add an endorsed dir in the future -#wrapper.java.additional.22="-Djava.endorsed.dirs=%RHQ_SERVER_HOME%/jbossas/lib/endorsed" +#wrapper.java.additional.23="-Djava.endorsed.dirs=%RHQ_SERVER_HOME%/jbossas/lib/endorsed" # We want to make sure the Server starts in the JBossAS bin directory wrapper.working.dir=%RHQ_SERVER_HOME%/jbossas/bin diff --git a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc index 060f39c..e4dcf2c 100644 --- a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc +++ b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc @@ -3,12 +3,12 @@ # # enable remote debugging -wrapper.java.additional.22=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n +wrapper.java.additional.21=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n # enable jprofiler #set.PATH=%PATH%;<jprofiler-install-dir>\bin\windows -#wrapper.java.additional.23=-agentlib:jprofilerti=port=8849 -#wrapper.java.additional.24=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar +#wrapper.java.additional.22=-agentlib:jprofilerti=port=8849 +#wrapper.java.additional.23=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar # disable JVM startup timeout wrapper.startup.timeout=0

11 years, 10 months

1
0
0 / 0

[rhq] Branch 'mazz/test-rhq-on-as7' - modules/enterprise

by mazz

modules/enterprise/server/appserver/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js | 484 ++++++++++ modules/enterprise/server/appserver/src/main/downloadable-resources/connectors/README.txt | 22 modules/enterprise/server/appserver/src/main/resources/alert-scripts/README.txt | 2 modules/enterprise/server/appserver/src/main/resources/alert-scripts/example.rb | 16 modules/enterprise/server/appserver/src/main/resources/etc/RHQ-mib.txt | 135 ++ modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/WEB-INF/jboss-web.xml | 5 modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/WEB-INF/web.xml | 20 modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/index.html | 17 modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/start.jsf | 13 modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/welcome.jsf | 13 modules/enterprise/server/appserver/src/main/resources/plugins/README.txt | 7 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 35 12 files changed, 762 insertions(+), 7 deletions(-) New commits: commit e19c29ad30125b9ab30cb6db47a445137fbf3420 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Aug 1 17:39:17 2012 -0400 more container build stuff diff --git a/modules/enterprise/server/appserver/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js b/modules/enterprise/server/appserver/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js new file mode 100644 index 0000000..5dba002 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js @@ -0,0 +1,484 @@ +/** + * Using this script one can automatically reset a bundle deployment to a specified version. + * + * This script consists of several utility methods originally included in standalone files + * in the samples of the CLI distribution, which have been included in this file so that it + * is usable on its own even in the server environment. + * + * The configuration of the bundle and its version to reset to is located at the top of this file. + * Please provide the values to the variables as instructed to make this script work in + * a concrete situation. + */ + +//----------------------------- script configuration + +/** + * Replace the "null" with the ID of the bundle destination you want to reset. + * + * The ID of the destination can be determined from the URL. If you navigate to + * some destination of a bundle, the destination ID is the number at the very + * end of the URL in the address bar of your browser. + * + * It can also be determined programmatically using the remote API of the RHQ + * server but that is beyond the scope of this comment. + */ +var destinationId = null; + +/** + * Replace the "null" with the ID of the bundle version the deployment should be reset to. + * + * As with the destinations, the ID of a bundle version can be determined in the GUI by + * examining the URL. If you navigate to some version of a bundle, the bundle version ID is + * the very last number in the URL in the address bar of the browser. + */ +var bundleVersionId = null; + +/** + * A deployment of the bundle version may require configuration. + * Normally, this can be provided as a simple javascript object (using the curly braces notation). + * Each key in the object corresponds to a name of one "rhq:input-property" in the + * recipe of the bundle. + * + * For example, if your deploy.xml recipe contains the following input properties: + * + * <rhq:input-property type="string" name="my-string-property" /> + * <rhq:input-property type="boolean" name="my-bool-property" /> + * <rhq:input-property type="integer" name="my-int-property" /> + * + * You would provide values for those properties as: + * + * var deploymentConfig = { + * "my-string-property" : "value", + * "my-bool-property" : false, + * "my-int-property" : 42 + * }; + * + * + * Note that the bundle recipes support only a limited set of types of these properties. + * Please consult the provisioning subsystem documentation for a complete coverage of the bundle recipe + * capabilities. + */ +var deploymentConfig = null; + +/** + * The description of the deployment that will be performed. + */ +var description = "redeploy due to drift"; + +// DO NOT TOUCH THIS UNLESS YOU FULLY UNDERSTAND WHAT YOU ARE DOING. +// NOTE: It's essential that isCleanDeployment=true, otherwise files that have drifted will not be replaced with their +// original versions from the bundle. +var isCleanDeployment = true; + +//-------------------- util.js + +/** + * If obj is a JS array or a java.util.Collection, each element is passed to + * the callback function. If obj is a java.util.Map, each map entry is passed + * to the callback function as a key/value pair. If obj is none of the + * aforementioned types, it is treated as a generic object and each of its + * properties is passed to the callback function as a name/value pair. + */ +function foreach(obj, fn) { + if (obj instanceof Array) { + for (i in obj) { + fn(obj[i]); + } + } + else if (obj instanceof java.util.Collection) { + var iterator = obj.iterator(); + while (iterator.hasNext()) { + fn(iterator.next()); + } + } + else if (obj instanceof java.util.Map) { + var iterator = obj.entrySet().iterator() + while (iterator.hasNext()) { + var entry = iterator.next(); + fn(entry.key, entry.value); + } + } + else { // assume we have a generic object + for (i in obj) { + fn(i, obj[i]); + } + } +} + +/** + * Iterates over obj similar to foreach. fn should be a predicate that evaluates + * to true or false. The first match that is found is returned. + */ +function find(obj, fn) { + if (obj instanceof Array) { + for (i in obj) { + if (fn(obj[i])) { + return obj[i] + } + } + } + else if (obj instanceof java.util.Collection) { + var iterator = obj.iterator(); + while (iterator.hasNext()) { + var next = iterator.next(); + if (fn(next)) { + return next; + } + } + } + else if (obj instanceof java.util.Map) { + var iterator = obj.entrySet().iterator(); + while (iterator.hasNext()) { + var entry = iterator.next(); + if (fn(entry.key, entry.value)) { + return {key: entry.key, value: entry.value}; + } + } + } + else { + for (i in obj) { + if (fn(i, obj[i])) { + return {key: i, value: obj[i]}; + } + } + } + return null; +} + +/** + * Iterates over obj similar to foreach. fn should be a predicate that evaluates + * to true or false. All of the matches are returned in a java.util.List. + */ +function findAll(obj, fn) { + var matches = java.util.ArrayList(); + if ((obj instanceof Array) || (obj instanceof java.util.Collection)) { + foreach(obj, function(element) { + if (fn(element)) { + matches.add(element); + } + }); + } + else { + foreach(obj, function(key, value) { + if (fn(theKey, theValue)) { + matches.add({key: theKey, value: theValue}); + } + }); + } + return matches; +} + +/** + * A convenience function to convert javascript hashes into RHQ's configuration + * objects. + * <p> + * The conversion of individual keys in the hash follows these rules: + * <ol> + * <li> if a value of a key is a javascript array, it is interpreted as PropertyList + * <li> if a value is a hash, it is interpreted as a PropertyMap + * <li> otherwise it is interpreted as a PropertySimple + * <li> a null or undefined value is ignored + * </ol> + * <p> + * Note that the conversion isn't perfect, because the hash does not contain enough + * information to restore the names of the list members. + * <p> + * Example: <br/> + * <pre><code> + * { + * simple : "value", + * list : [ "value1", "value2"], + * listOfMaps : [ { k1 : "value", k2 : "value" }, { k1 : "value2", k2 : "value2" } ] + * } + * </code></pre> + * gets converted to a configuration object: + * Configuration: + * <ul> + * <li> PropertySimple(name = "simple", value = "value") + * <li> PropertyList(name = "list") + * <ol> + * <li>PropertySimple(name = "list", value = "value1") + * <li>PropertySimple(name = "list", value = "value2") + * </ol> + * <li> PropertyList(name = "listOfMaps") + * <ol> + * <li> PropertyMap(name = "listOfMaps") + * <ul> + * <li>PropertySimple(name = "k1", value = "value") + * <li>PropertySimple(name = "k2", value = "value") + * </ul> + * <li> PropertyMap(name = "listOfMaps") + * <ul> + * <li>PropertySimple(name = "k1", value = "value2") + * <li>PropertySimple(name = "k2", value = "value2") + * </ul> + * </ol> + * </ul> + * Notice that the members of the list have the same name as the list itself + * which generally is not the case. + */ +function asConfiguration(hash) { + + config = new Configuration; + + for(key in hash) { + value = hash[key]; + + if (value == null) { + continue; + } + + (function(parent, key, value) { + function isArray(obj) { + return typeof(obj) == 'object' && (obj instanceof Array); + } + + function isHash(obj) { + return typeof(obj) == 'object' && !(obj instanceof Array); + } + + function isPrimitive(obj) { + return typeof(obj) != 'object'; + } + + //this is an anonymous function, so the only way it can call itself + //is by getting its reference via argument.callee. Let's just assign + //a shorter name for it. + var me = arguments.callee; + + var prop = null; + + if (isPrimitive(value)) { + prop = new PropertySimple(key, new java.lang.String(value)); + } else if (isArray(value)) { + prop = new PropertyList(key); + for(var i = 0; i < value.length; ++i) { + var v = value[i]; + if (v != null) { + me(prop, key, v); + } + } + } else if (isHash(value)) { + prop = new PropertyMap(key); + for(var i in value) { + var v = value[i]; + if (value != null) { + me(prop, i, v); + } + } + } + + if (parent instanceof PropertyList) { + parent.add(prop); + } else { + parent.put(prop); + } + })(config, key, value); + } + + return config; +} + +/** + * Opposite of <code>asConfiguration</code>. Converts an RHQ's configuration object + * into a javascript hash. + * + * @param configuration + */ +function asHash(configuration) { + ret = {} + + iterator = configuration.getMap().values().iterator(); + while(iterator.hasNext()) { + prop = iterator.next(); + + (function(parent, prop) { + function isArray(obj) { + return typeof(obj) == 'object' && (obj instanceof Array); + } + + function isHash(obj) { + return typeof(obj) == 'object' && !(obj instanceof Array); + } + + var me = arguments.callee; + + var representation = null; + + if (prop instanceof PropertySimple) { + representation = prop.stringValue; + } else if (prop instanceof PropertyList) { + representation = []; + + for(var i = 0; i < prop.list.size(); ++i) { + var child = prop.list.get(i); + me(representation, child); + } + } else if (prop instanceof PropertyMap) { + representation = {}; + + var childIterator = prop.getMap().values().iterator(); + while(childIterator.hasNext()) { + var child = childIterator.next(); + + me(representation, child); + } + } + + if (isArray(parent)) { + parent.push(representation); + } else if (isHash(parent)) { + parent[prop.name] = representation; + } + })(ret, prop); + } + (function(parent) { + + })(configuration); + + return ret; +} + +//------------------------------ bundles.js + +/** + * A simple function to create a new bundle version from a zip file containing + * the bundle. + * + * @param pathToBundleZipFile the path to the bundle on the local file system + * + * @return an instance of BundleVersion class describing what's been created on + * the RHQ server. + */ +function createBundleVersion(pathToBundleZipFile) { + var bytes = getFileBytes(pathToBundleZipFile) + return BundleManager.createBundleVersionViaByteArray(bytes) +} + +/** + * This is a helper function that one can use to find out what base directories + * given resource type defines. + * <p> + * These base directories then can be used when specifying bundle destinations. + * + * @param resourceTypeId + * @returns a java.util.Set of ResourceTypeBundleConfiguration objects + */ +function getAllBaseDirectories(resourceTypeId) { + var crit = new ResourceTypeCriteria; + crit.addFilterId(resourceTypeId); + crit.fetchBundleConfiguration(true); + + var types = ResourceTypeManager.findResourceTypesByCriteria(crit); + + if (types.size() == 0) { + throw "Could not find a resource type with id " + resourceTypeId; + } else if (types.size() > 1) { + throw "More than one resource type found with id " + resourceTypeId + "! How did that happen!"; + } + + var type = types.get(0); + + return type.getResourceTypeBundleConfiguration().getBundleDestinationBaseDirectories(); +} + +/** + * Creates a new destination for given bundle. Once a destination exists, + * actual bundle versions can be deployed to it. + * <p> + * Note that this only differs from the <code>BundleManager.createBundleDestination</code> + * method in the fact that one can provide bundle and resource group names instead of their + * ids. + * + * @param destinationName the name of the destination to be created + * @param description the description for the destination + * @param bundleName the name of the bundle to create the destination for + * @param groupName name of a group of resources that the destination will handle + * @param baseDirName the name of the basedir definition that represents where inside the + * deployment of the individual resources the bundle will get deployed + * @param deployDir the specific sub directory of the base dir where the bundles will get deployed + * + * @return BundleDestination object + */ +function createBundleDestination(destinationName, description, bundleName, groupName, baseDirName, deployDir) { + var groupCrit = new ResourceGroupCriteria; + groupCrit.addFilterName(groupName); + var groups = ResourceGroupManager.findResourceGroupsByCriteria(groupCrit); + + if (groups.empty) { + throw "No group called '" + groupName + "' found."; + } + + var group = groups.get(0); + + var bundleCrit = new BundleCriteria; + bundleCrit.addFilterName(bundleName); + var bundles = BundleManager.findBundlesByCriteria(bundleCrit); + + if (bundles.empty) { + throw "No bundle called '" + bundleName + "' found."; + } + + var bundle = bundles.get(0); + + return BundleManager.createBundleDestination(bundle.id, destinationName, description, baseDirName, deployDir, group.id); +} + +/** + * Tries to deploy given bundle version to provided destination using given configuration. + * <p> + * This method blocks while waiting for the deployment to complete or fail. + * + * @param destination the bundle destination (or id thereof) + * @param bundleVersion the bundle version to deploy (or id thereof) + * @param deploymentConfiguration the deployment configuration. This can be an ordinary + * javascript object (hash) or an instance of RHQ's Configuration. If it is the former, + * it is converted to a Configuration instance using the <code>asConfiguration</code> + * function from <code>util.js</code>. Please consult the documentation of that method + * to understand the limitations of that approach. + * @param description the deployment description + * @param isCleanDeployment if true, perform a wipe of the deploy directory prior to the deployment; if false, + * perform as an upgrade to the existing deployment, if any + * + * @return the BundleDeployment instance describing the deployment + */ +function deployBundle(destination, bundleVersion, deploymentConfiguration, description, isCleanDeployment) { + var destinationId = destination; + if (typeof(destination) == 'object') { + destinationId = destination.id; + } + + var bundleVersionId = bundleVersion; + if (typeof(bundleVersion) == 'object') { + bundleVersionId = bundleVersion.id; + } + + var deploymentConfig = deploymentConfiguration; + if (!(deploymentConfiguration instanceof Configuration)) { + deploymentConfig = asConfiguration(deploymentConfiguration); + } + + var deployment = BundleManager.createBundleDeployment(bundleVersionId, destinationId, description, deploymentConfig); + + deployment = BundleManager.scheduleBundleDeployment(deployment.id, isCleanDeployment); + + var crit = new BundleDeploymentCriteria; + crit.addFilterId(deployment.id); + + while (deployment.status == BundleDeploymentStatus.PENDING || deployment.status == BundleDeploymentStatus.IN_PROGRESS) { + java.lang.Thread.currentThread().sleep(1000); + var dps = BundleManager.findBundleDeploymentsByCriteria(crit); + if (dps.empty) { + throw "The deployment disappeared while we were waiting for it to complete."; + } + + deployment = dps.get(0); + } + + return deployment; +} + +//------------------- script body + +deployBundle(destinationId, bundleVersionId, deploymentConfig, description, isCleanDeployment); + diff --git a/modules/enterprise/server/appserver/src/main/downloadable-resources/connectors/README.txt b/modules/enterprise/server/appserver/src/main/downloadable-resources/connectors/README.txt new file mode 100644 index 0000000..c1dc783 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/downloadable-resources/connectors/README.txt @@ -0,0 +1,22 @@ +This directory contains connectors that instrument various products to expose +monitoring data. This monitoring data can then be accessed by the RHQ plugins +corresponding to those products. + +HTTP Response Time Filter +-------------------------- +This is a servlet filter that can measure response times for HTTP requests +made to servlets and write the response times to a logfile. The filter is +compatible with any servlet 2.4 or later container running on Java 1.4 or +later. However, since upport for parsing the response time logfiles is +only provided by the jboss-as, jboss-as-5, jboss-as-7, and tomcat RHQ +plugins, it typically is only of value to deploy the filter to JBoss AS +or Tomcat. + +Note, a commons-logging jar is supplied for use with Tomcat 6. It is not +required for earlier versions of Tomcat, since they already include that jar. + +For details on how to deploy the filter to various versions of JBoss AS and +Tomcat, see: + +https://docs.jboss.org/author/display/RHQ/Managed+Product+Configuration + diff --git a/modules/enterprise/server/appserver/src/main/resources/alert-scripts/README.txt b/modules/enterprise/server/appserver/src/main/resources/alert-scripts/README.txt new file mode 100644 index 0000000..7675cbf --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/resources/alert-scripts/README.txt @@ -0,0 +1,2 @@ +This directory contains scripts for the scriptlang alert sender. +Currently JRuby and JavaScript are supported. \ No newline at end of file diff --git a/modules/enterprise/server/appserver/src/main/resources/alert-scripts/example.rb b/modules/enterprise/server/appserver/src/main/resources/alert-scripts/example.rb new file mode 100644 index 0000000..3a01100 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/resources/alert-scripts/example.rb @@ -0,0 +1,16 @@ + +require 'java' + +def sendAlert(alert, url, conditions) + + puts alert.alertDefinition.name + puts url + puts conditions + + result = org.rhq.enterprise.server.plugin.pc.alert.SenderResult.new + state = org.rhq.enterprise.server.plugin.pc.alert.ResultState::SUCCESS + result.setState(state) + result.setMessage("Sending via ruby succeeded") + + return result +end \ No newline at end of file diff --git a/modules/enterprise/server/appserver/src/main/resources/etc/RHQ-mib.txt b/modules/enterprise/server/appserver/src/main/resources/etc/RHQ-mib.txt new file mode 100644 index 0000000..ced6071 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/resources/etc/RHQ-mib.txt @@ -0,0 +1,135 @@ +RHQ-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE, snmpModules, enterprises + FROM SNMPv2-SMI + coldStart + FROM SNMPv2-MIB + OBJECT-GROUP, NOTIFICATION-GROUP, MODULE-COMPLIANCE + FROM SNMPv2-CONF + DisplayString + FROM SNMPv2-TC; + +rhqMIB MODULE-IDENTITY + LAST-UPDATED "201112200000Z" + ORGANIZATION "RHQ-Project" + CONTACT-INFO "http://www.jboss.org/rhq" + DESCRIPTION + "The MIB module for RHQ alerts. + + This file is part of the RHQ management platform + Copyright (C) 2005-2012 Red Hat, Inc. + All rights reserved. + " + + REVISION "200807110000Z" + DESCRIPTION "Initial version" + REVISION "201010180000Z" + DESCRIPTION "Better trap support" + REVISION "201112200000Z" + DESCRIPTION "Also emit resource lineage" + ::= { snmpModules 1 } + +jboss OBJECT IDENTIFIER ::= {enterprises 18016 } + +rhq OBJECT IDENTIFIER ::= {jboss 2 } + +alert OBJECT IDENTIFIER ::= {rhq 1 } + + +alertName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the alert definition for this alert" + ::= { alert 1 } + +alertResourceName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the resource that triggered the alert" + ::= { alert 2 } + + +alertPlatformName OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The name of the platform hosting the resource" + ::= { alert 3 } + + +alertCondition OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..4096)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The conditions leading to the alert" + ::= { alert 4 } + +alertSeverity OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..255)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Severity of the alert." + ::= { alert 5 } + +alertUrl OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..1024)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The url of the individual alert" + ::= { alert 6 } + +alertHierarchy OBJECT-TYPE + SYNTAX DisplayString (SIZE (0..1024)) + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "The hierarchy of the resource that triggered the alert" + ::= { alert 6 } + +-- conformance information + +snmpMIBConformance + OBJECT IDENTIFIER ::= { rhqMIB 2 } + +snmpMIBCompliances + OBJECT IDENTIFIER ::= { snmpMIBConformance 1 } +snmpMIBGroups OBJECT IDENTIFIER ::= { snmpMIBConformance 2 } + +-- compliance statements + +snmpBasicCompliance MODULE-COMPLIANCE + STATUS current + DESCRIPTION "TODO" + MODULE + MANDATORY-GROUPS { alertGroup, trapGroup } + + ::= { snmpMIBCompliances 2 } + +alertGroup OBJECT-GROUP + OBJECTS { alertName, + alertResourceName, + alertPlatformName, + alertCondition, + alertSeverity, + alertUrl, + alertHierarchy } + STATUS current + DESCRIPTION "A collection of objects providing information about an alert" + ::= { snmpMIBGroups 1 } + +trapGroup NOTIFICATION-GROUP + NOTIFICATIONS { coldStart } + STATUS current + DESCRIPTION "A collection of notifications for alerts" + ::= { snmpMIBGroups 2 } + +END diff --git a/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war.skipdeploy b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war.skipdeploy new file mode 100644 index 0000000..e69de29 diff --git a/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/WEB-INF/jboss-web.xml b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/WEB-INF/jboss-web.xml new file mode 100644 index 0000000..493bdbf --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/WEB-INF/jboss-web.xml @@ -0,0 +1,5 @@ +<?xml version="1.0"?> + +<jboss-web> + <context-root>/installer</context-root> +</jboss-web> diff --git a/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/WEB-INF/web.xml b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/WEB-INF/web.xml new file mode 100644 index 0000000..c6bd385 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/WEB-INF/web.xml @@ -0,0 +1,20 @@ +<?xml version="1.0"?> + +<web-app xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> + + <display-name>Post Installer Notification</display-name> + <description>Post Installer Notification</description> + + <mime-mapping> + <extension>jsf</extension> + <mime-type>text/html</mime-type> + </mime-mapping> + + <welcome-file-list> + <welcome-file>/index.html</welcome-file> + </welcome-file-list> + +</web-app> diff --git a/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/index.html b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/index.html new file mode 100644 index 0000000..5da4047 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/index.html @@ -0,0 +1,17 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title>The Server Is Installed!</title> + +<meta http-equiv="Pragma" content="no-cache" /> +<meta http-equiv="Expires" content="-1" /> +<meta http-equiv="Cache-control" content="no-cache" /> + +</head> +<body> + <p> </p> + <h1 align="center">The Server Is Installed!</h1> + <p align="center"><a href="/coregui">Click here to get started!</a></p> +</body> +</html> diff --git a/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/start.jsf b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/start.jsf new file mode 100644 index 0000000..4e5a220 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/start.jsf @@ -0,0 +1,13 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title>The Server Is Installed!</title> + +</head> +<body> + <p> </p> + <h1 align="center">The Server Is Installed!</h1> + <p align="center"><a href="/coregui">Click here to get started!</a></p> +</body> +</html> diff --git a/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/welcome.jsf b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/welcome.jsf new file mode 100644 index 0000000..4e5a220 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/resources/jbossas/standalone/deployments/rhq-postinstaller.war/welcome.jsf @@ -0,0 +1,13 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title>The Server Is Installed!</title> + +</head> +<body> + <p> </p> + <h1 align="center">The Server Is Installed!</h1> + <p align="center"><a href="/coregui">Click here to get started!</a></p> +</body> +</html> diff --git a/modules/enterprise/server/appserver/src/main/resources/plugins/README.txt b/modules/enterprise/server/appserver/src/main/resources/plugins/README.txt new file mode 100644 index 0000000..8189194 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/resources/plugins/README.txt @@ -0,0 +1,7 @@ +You can copy agent plugins or server plugins to this directory. + +When the server is running, it will periodically scan this +directory and hot-deploy the plugins it finds. + +The jar files will be removed from this directory after they have +been detected. \ No newline at end of file diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index eded774..5cb56a5 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -199,10 +199,27 @@ <delete dir="${jboss.home}/standalone/tmp" /> <delete dir="${jboss.home}/standalone/work" />  - <echo>Delete unused configurations</echo> - <delete file="${jboss.home}/standalone/configuration/standalone-ha.xml" /> - <delete file="${jboss.home}/standalone/configuration/standalone-full.xml" /> - <delete file="${jboss.home}/standalone/configuration/standalone-full-ha.xml" /> + <echo>Delete unused configurations and other files</echo> + <delete> + <fileset dir="${jboss.home}/standalone/configuration"> + <include name="standalone-ha.xml" /> + <include name="standalone-full.xml" /> + <include name="standalone-full-ha.xml" /> + </fileset> + </delete> + <delete> + <fileset dir="${jboss.home}/bin/"> + <include name="add-user.*" /> + <include name="appclient.*" /> + <include name="domain.*" /> + <include name="jconsole.*" /> + <include name="run.*" /> + <include name="vault.*" /> + <include name="wsconsume.*" /> + <include name="wsprovide.*" /> + </fileset> + </delete> + <delete dir="${jboss.home}/bin/init.d" />    +  </target>

11 years, 10 months

1
0
0 / 0

[rhq] modules/plugins

by Heiko W. Rupp

modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java | 75 +++++++ modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java | 40 +++ modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityDelegateTest.java | 106 ++++++++++ 3 files changed, 221 insertions(+) New commits: commit 4f60260d2afe019943f23c64cdaf14f1f11c3d53 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Wed Aug 1 16:34:02 2012 -0400 BZ 845118 provide delegates for the tow classes that were moved to util/ as other plugins may still rely on the old package structure. diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java new file mode 100644 index 0000000..bc4b264 --- /dev/null +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java @@ -0,0 +1,75 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.jmx; + +import java.util.Map; +import java.util.Set; + +import org.rhq.core.domain.configuration.Configuration; + +/** + * Delegate for the old version of the class which got moved to util package + * @author Heiko W. Rupp + * @deprecated Use the version in the util package + */ +public class ObjectNameQueryUtility { + + private org.rhq.plugins.jmx.util.ObjectNameQueryUtility onu; + + public ObjectNameQueryUtility(String objectNameQueryTemplate) { + onu = new org.rhq.plugins.jmx.util.ObjectNameQueryUtility(objectNameQueryTemplate); + } + + public ObjectNameQueryUtility(String objectNameQueryTemplate, Configuration parentConfiguration) { + onu = new org.rhq.plugins.jmx.util.ObjectNameQueryUtility(objectNameQueryTemplate,parentConfiguration); + } + + public boolean setMatchedKeyValues(Map<String, String> keyProperties) { + return onu.setMatchedKeyValues(keyProperties); + } + + public String formatMessage(String message) { + return onu.formatMessage(message); + } + + public void resetVariables() { + onu.resetVariables(); + } + + public String getQueryTemplate() { + return onu.getQueryTemplate(); + } + + public Map<String, String> getVariableProperties() { + return onu.getVariableProperties(); + } + + public Map<String, String> getVariableValues() { + return onu.getVariableValues(); + } + + public String getTranslatedQuery() { + return onu.getTranslatedQuery(); + } + + public boolean isContainsExtraKeyProperties(Set<String> strings) { + return onu.isContainsExtraKeyProperties(strings); + } +} diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java new file mode 100644 index 0000000..fccb0ab --- /dev/null +++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java @@ -0,0 +1,40 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.jmx; + +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; + +/** + * Delegate for the original version of this + * class that got moved to util/ + * @deprecated Use the version of the class in the util Package + * @see org.rhq.plugins.jmx.util.ParentDefinedJMXServerNamingUtility + * @author Heiko W. Rupp + */ +@Deprecated +public class ParentDefinedJMXServerNamingUtility { + public static final String PROPERTY_CHILD_JMX_SERVER_NAME = "childJmxServerName"; + + /** @deprecated use the version in util package instead */ + @Deprecated + public static String getJVMName(ResourceDiscoveryContext<?> context) { + return org.rhq.plugins.jmx.util.ParentDefinedJMXServerNamingUtility.getJVMName(context); + } +} diff --git a/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityDelegateTest.java b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityDelegateTest.java new file mode 100644 index 0000000..58d11a1 --- /dev/null +++ b/modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityDelegateTest.java @@ -0,0 +1,106 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 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., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +package org.rhq.plugins.jmx.test; + +import java.util.Collections; + +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import org.testng.annotations.Test; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.plugins.jmx.ObjectNameQueryUtility; + +/** + * This test explicitly tests the delegate for the ObjectNameQueryUtility. + * The Utility itself got moved into the util package. To be backward compatible, + * we need to have a delegate + */ +public class ObjectNameQueryUtilityDelegateTest { + @Test + public void testObjectNameQueryUtility() throws MalformedObjectNameException { + ObjectNameQueryUtility onqu = null; + onqu = new ObjectNameQueryUtility("java.lang:type=MemoryPool,name=Code Cache"); + assert onqu.getQueryTemplate().equals("java.lang:type=MemoryPool,name=Code Cache"); + + onqu = new ObjectNameQueryUtility("java.lang:type=MemoryPool,name=%name%"); + assert onqu.getTranslatedQuery().equals("java.lang:type=MemoryPool,*"); + assert onqu.getVariableProperties().size() == 1; + assert onqu.getVariableProperties().get("name").equals("name"); + + onqu = new ObjectNameQueryUtility("java.lang:type=Threading"); + + onqu = new ObjectNameQueryUtility("java.lang:type=%foo%"); + assert onqu.getTranslatedQuery().equals("java.lang:*"); + assert onqu.getVariableProperties().size() == 1; + assert onqu.getVariableProperties().get("type").equals("foo"); + + onqu = new ObjectNameQueryUtility("jboss.esb.*:service=Queue,name=%name%"); + assert onqu.getTranslatedQuery().equals("jboss.esb.*:service=Queue,*"); + assert onqu.getVariableProperties().size() == 1; + assert onqu.getVariableProperties().get("name").equals("name"); + ObjectName testON = new ObjectName( + "jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw"); + onqu.setMatchedKeyValues(testON.getKeyPropertyList()); + String formulatedMessageTemplate = "Name of queue: {name}"; + assert onqu.formatMessage(formulatedMessageTemplate).equals("Name of queue: quickstart_helloworld_Request_gw"); + + onqu = new ObjectNameQueryUtility("java.lang:type=%MyType%,name=%MyName%,app=%MyApp%,foo=%MyFoo%"); + assert onqu.getTranslatedQuery().equals("java.lang:*"); + assert onqu.getVariableProperties().size() == 4; + testON = new ObjectName("java.lang:type=A,name=B,app=C,foo=D"); + onqu.setMatchedKeyValues(testON.getKeyPropertyList()); + formulatedMessageTemplate = "Type: {MyType}, Name: {MyName}, App: {MyApp}, Foo: {MyFoo}"; + assert onqu.formatMessage(formulatedMessageTemplate).equals("Type: A, Name: B, App: C, Foo: D"); + + Configuration c = new Configuration(); + c.put(new PropertySimple("e", "foo")); + c.put(new PropertySimple("g", "bar")); + onqu = new ObjectNameQueryUtility("a:b=c,d={e},f={g}", c); + System.out.println("Template: " + onqu.getQueryTemplate()); + assert onqu.getQueryTemplate().equals("a:b=c,d=foo,f=bar"); + + // Test some very long replacement tokens inspired by BZ 828596 + onqu = new ObjectNameQueryUtility("*:type=HttpMetricInspector,name=%name%"); + assert onqu.getQueryTemplate().equals("*:type=HttpMetricInspector,name=%name%"); + assert onqu.getVariableProperties().size() == 1; + assert onqu.getVariableProperties().get("name").equals("name"); + testON = new ObjectName("FooBarABCDEFGHIJKLMNOPQRSTUVWXYZ:type=HttpMetricInspector,name=ABCDEFGHIJKLMNOPQRSTUVWXYZöABCDEFGHIJKLMNOPQRSTUVWXYZ"); + onqu.setMatchedKeyValues(testON.getKeyPropertyList()); + formulatedMessageTemplate = "Http metrics for endpoint {name}"; + String res = onqu.formatMessage(formulatedMessageTemplate); + assert res.equals("Http metrics for endpoint ABCDEFGHIJKLMNOPQRSTUVWXYZöABCDEFGHIJKLMNOPQRSTUVWXYZ") : res; + + + } + + @Test + public void testObjectNameQueryUtilityFiltering() throws MalformedObjectNameException { + ObjectNameQueryUtility onqu = null; + + onqu = new ObjectNameQueryUtility("java.lang:type=MemoryPool,name=%foo%"); + assert !onqu.isContainsExtraKeyProperties(Collections.singleton("type")); + assert !onqu.isContainsExtraKeyProperties(Collections.singleton("name")); + assert onqu.isContainsExtraKeyProperties(Collections.singleton("splat")); + + } + +} \ No newline at end of file

11 years, 10 months

1
0
0 / 0

[rhq] Branch 'rc/jon3.1.1.ER1' - modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml

by rhqci

modules/cli-tests/pom.xml | 2 +- modules/common/ant-bundle/pom.xml | 2 +- modules/common/drift/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/arquillian-integration/archive/pom.xml | 2 +- modules/core/arquillian-integration/container/pom.xml | 2 +- modules/core/arquillian-integration/pom.xml | 2 +- modules/core/client-api/pom.xml | 2 +- modules/core/comm-api/pom.xml | 2 +- modules/core/dbutils/pom.xml | 2 +- modules/core/domain/pom.xml | 2 +- modules/core/gui/pom.xml | 2 +- modules/core/native-system/pom.xml | 2 +- modules/core/plugin-api/pom.xml | 2 +- modules/core/plugin-container-itest/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-test-api/pom.xml | 2 +- modules/core/plugin-test-util/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/binding/pom.xml | 4 ++-- modules/enterprise/comm/pom.xml | 2 +- modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +- modules/enterprise/gui/base-perspective-war/pom.xml | 2 +- modules/enterprise/gui/content_http-war/pom.xml | 2 +- modules/enterprise/gui/coregui/pom.xml | 2 +- modules/enterprise/gui/installer-war/pom.xml | 2 +- modules/enterprise/gui/pom.xml | 2 +- modules/enterprise/gui/portal-war/pom.xml | 2 +- modules/enterprise/gui/rest-war/pom.xml | 2 +- modules/enterprise/pom.xml | 2 +- modules/enterprise/remoting/cli/pom.xml | 2 +- modules/enterprise/remoting/client-api/pom.xml | 2 +- modules/enterprise/remoting/client-deps/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/remoting/webservices/pom.xml | 2 +- modules/enterprise/server/client-api/pom.xml | 4 ++-- modules/enterprise/server/container-lib/pom.xml | 2 +- modules/enterprise/server/container/pom.xml | 2 +- modules/enterprise/server/ear/pom.xml | 2 +- modules/enterprise/server/itests/pom.xml | 2 +- modules/enterprise/server/jar/pom.xml | 2 +- modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++-- modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++-- modules/enterprise/server/plugins/disk/pom.xml | 2 +- modules/enterprise/server/plugins/drift-mongodb/pom.xml | 2 +- modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++-- modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +- modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +- modules/enterprise/server/plugins/pom.xml | 2 +- modules/enterprise/server/plugins/url/pom.xml | 2 +- modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +- modules/enterprise/server/plugins/yum/pom.xml | 2 +- modules/enterprise/server/pom.xml | 2 +- modules/enterprise/server/safe-invoker/pom.xml | 2 +- modules/enterprise/server/sars/agent-sar/pom.xml | 2 +- modules/enterprise/server/sars/pom.xml | 2 +- modules/enterprise/server/xml-schemas/pom.xml | 2 +- modules/helpers/bundleGen/pom.xml | 4 ++-- modules/helpers/jeeGen/pom.xml | 2 +- modules/helpers/perftest-support/pom.xml | 4 ++-- modules/helpers/pom.xml | 2 +- modules/helpers/rtfilter-subsystem/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/integration-tests/apache-plugin-test/pom.xml | 2 +- modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +- modules/integration-tests/jndi-access/pom.xml | 2 +- modules/integration-tests/jndi-access/remote-server/pom.xml | 2 +- modules/integration-tests/pom.xml | 2 +- modules/plugins/aliases/pom.xml | 2 +- modules/plugins/ant-bundle/pom.xml | 2 +- modules/plugins/apache/pom.xml | 2 +- modules/plugins/augeas/pom.xml | 2 +- modules/plugins/byteman/pom.xml | 2 +- modules/plugins/cobbler/pom.xml | 2 +- modules/plugins/cron/pom.xml | 2 +- modules/plugins/database/pom.xml | 2 +- modules/plugins/filetemplate-bundle/pom.xml | 2 +- modules/plugins/grub/pom.xml | 2 +- modules/plugins/hadoop/pom.xml | 2 +- modules/plugins/hibernate/pom.xml | 2 +- modules/plugins/hosts/pom.xml | 2 +- modules/plugins/hudson/pom.xml | 4 ++-- modules/plugins/iis/pom.xml | 2 +- modules/plugins/irc/pom.xml | 2 +- modules/plugins/jboss-as-5/pom.xml | 2 +- modules/plugins/jboss-as-7/pom.xml | 2 +- modules/plugins/jboss-as/pom.xml | 2 +- modules/plugins/jboss-cache-v3/pom.xml | 2 +- modules/plugins/jboss-cache/pom.xml | 2 +- modules/plugins/jmx/pom.xml | 2 +- modules/plugins/kickstart/pom.xml | 2 +- modules/plugins/mod-cluster/pom.xml | 2 +- modules/plugins/mysql/pom.xml | 2 +- modules/plugins/netservices/pom.xml | 2 +- modules/plugins/oracle/pom.xml | 2 +- modules/plugins/pattern-generator/pom.xml | 2 +- modules/plugins/perftest/pom.xml | 2 +- modules/plugins/platform/pom.xml | 2 +- modules/plugins/pom.xml | 2 +- modules/plugins/postfix/pom.xml | 2 +- modules/plugins/postgres/pom.xml | 2 +- modules/plugins/rhq-agent/pom.xml | 2 +- modules/plugins/rhq-server/pom.xml | 2 +- modules/plugins/samba/pom.xml | 2 +- modules/plugins/script/pom.xml | 2 +- modules/plugins/script2/pom.xml | 2 +- modules/plugins/snmptrapd/pom.xml | 2 +- modules/plugins/sshd/pom.xml | 2 +- modules/plugins/sudoers/pom.xml | 2 +- modules/plugins/tomcat/pom.xml | 2 +- modules/plugins/twitter/pom.xml | 2 +- modules/plugins/validate-all-plugins/pom.xml | 2 +- modules/plugins/virt/pom.xml | 2 +- modules/pom.xml | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 137 files changed, 155 insertions(+), 155 deletions(-) New commits: commit 201fe9394a1b7328d980f29de9685233dd59a49d Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Wed Aug 1 14:13:15 2012 -0400 development RHQ_4.4.0.JON311-SNAPSHOT diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 13fcb99..0f2b4a2 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 6aacccd..5bc696d 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index 137bbe2..f3ab5cf 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index b12769f..6960d31 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index b2949a7..db5a207 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 379e203..19e6e60 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index 30f9fad..54fd8c6 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index dcf6837..d6830f9 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index 3761425..1aa6b62 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index c235bb9..619d08e 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index eb2ec87..01a4798 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 0841143..9f6171f 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 6411525..8b5548a 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 17dd981..96a76e1 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index 2a5233b..eb5572d 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index d6f49eb..a839f3e 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 85fb102..8374ac7 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 24a3042..b3cbeb4 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index 4bab11d..afabb42 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index 6cd4341..9f2839c 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 0e7e497..fd4ef54 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index ccabf3f..73400dc 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 62f797d..6b11536 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index d651463..30b5d95 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index bafae5c..490a946 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index f68d3fb..8593b5f 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 768f792..f6857fd 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 8f157ef..65a624c 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 17b712f..b577a02 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 0d6a401..28afb49 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 6fb7ef6..592b93d 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 1bba803..5f5cc15 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index ce0c800..884dd66 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 46d09ca..2718943 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 608d7e5..1016580 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index d943a71..e9752b4 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 65ab867..da2f14b 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index e75848a..dc717d1 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 899faab..5520a7a 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index 0bcd924..e035c0c 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 32f387e..c62b1b8 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index ae20950..0c20190 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index f35e55f..5ec2d40 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index cb9d209..f11a522 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 59e23cd..022eeed 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index abbc5ce..eaa3875 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index 33f7ac6..240fa99 100644 --- a/modules/enterprise/server/itests/pom.xml +++ b/modules/enterprise/server/itests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 78bab7d..33cdb96 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index fa6ebfe..18e6467 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 9fa9b78..cf7b42a 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index e638422..80d7fd8 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index 3940cfe..e95c1e8 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 794ce80..a5acda8 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 2a98645..e56a616 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index aaf8175..fab20a6 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 452372c..0073cd3 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 575cd1a..62b8bb2 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 6431063..547e9d7 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 8c30cf4..604f1d7 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 62baef9..926933c 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 75f47fa..385f158 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-mongodb/pom.xml b/modules/enterprise/server/plugins/drift-mongodb/pom.xml index b0efe9c..176366c 100644 --- a/modules/enterprise/server/plugins/drift-mongodb/pom.xml +++ b/modules/enterprise/server/plugins/drift-mongodb/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index d1bfb24..c136a90 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index cdf8a7b..9d1576f 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 548244d..516a32d 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server Groovy Script Plugin</name> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index a5993bb..f0809a5 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 385e2b2..ffc65aa 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 776f8a9..c16faed 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index e563c8f..4503b40 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 3b03252..282303d 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index a0d2f9b..f476e2b 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index 379ff80..c7ff44f 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index 0e3170d..b4709ef 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 88fa944..45e1948 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index a72a97d..01d48b0 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index be76c09..042c1fe 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index dc33feb..7e6a364 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index b9e6261..080805b 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 2b1b420..aa7b085 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index a8838bc..34f4222 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 365bf99..e19e745 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index c988911..a5bb5e9 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index 40f95ff..885e816 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index dff43bb..77dd6b6 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index fdc0ab0..6866171 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 8937dc4..8f169aa 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 58d02b6..85c7d55 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index cbee7a3..45358f7 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index 5b6df97..f06d7fc 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 03767ce..2dc27d8 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index c9b9cdb..28601d2 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 9fa3fb9..c58aa31 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 742f869..9e0fae7 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index ec9511d..876f11b 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 5a8945c..3f53b80 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 1246df5..32645e9 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 7f22350..6b82881 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 9093a78..6b2212c 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 6e9aa0d..06dd508 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index f7ec728..f3efa17 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 201cd22..cc7c484 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index b63c007..f5560cd 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 99e1a27..f2b7183 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 3f977a6..10e3a19 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 03b917c..0602589 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 33ea3ef..4713193 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 2bf394e..ee6a9fb 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index b1b1cfa..a4dc8ca 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 8cd57ac..22f6691 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 04a65ff..ecc2252 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 0f4b7b9..f0991dd 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index e9cc79e..dd5bea5 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 4e36748..a54b1f2 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 02fcb44..4f63ff9 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index d86e3f6..3f61a09 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index b1f6bbb..87b1507 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 6430e2b..aa64e16 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index fd0d13f..b06a0c8 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index 3b0b58c..cbecaf2 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index dc09a77..fcb4a97 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 4734c8f..417478b 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 3cf6bea..28fac6b 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index a65a868..e224079 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index d40c78d..e71114f 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 4147b78..a63ded1 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 01e5999..5ca7584 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 9b275be..3e056cb 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index fd90f55..939a5b3 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index e091a22..aedbc25 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 26296c3..322346e 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 0a92b7d..e533489 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index c3225c3..f6935f5 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index ad23c9a..7fa4439 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 47eeda9..d33757a 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 7203361..713ad3c 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index d9d15b5..a0f8e6f 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 9f364e1..4f59c1c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311ER1</version> + <version>4.4.0.JON311-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name>

11 years, 10 months

1
0
0 / 0

[rhq] Changes to 'refs/tags/RHQ_4_4_0_JON311ER1'

by rhqci

Changes since RHQ_3_0_0-BETA1: Denis Krusko (2): BZ 796795 Add separator after type label in type tooltip. Add some Russian translations (sync to version 9b4908a5bb of the translation project) Elias Ross (3): BZ 750665 - fix a regex issue with formatMessage BZ 772726 - Oracle Plugin. Bugfixes feature counting active and total connections per user. [BZ 766959] fix possible memory leak in plugins Fusayuki Minamoto (3): Updated Japanese translations. Translate remaining properties Added another translated entry Heiko W. Rupp (331): Very basic initial working version of a REST interface. Allow to output xml and json for Availability. Add the rest war to the container build. Move the REST interface over to the server jar. Adding REST libs to the container build. Add another provider for metrics (dummy for now) Enable the metric provide in web.xml. Otherwise it can't be found. Provide a ResourceWithType as sort of a DAO for rest. Emit Schedules and metric data for schedules. Obtain single schedules. Merge branch 'master' into heiko-rest Add a filter to check the authorization of the request. Merge branch 'master' into heiko-rest Add standard web authentication, as this puts the principal trhough to the EJB layer, where an interceptor then populates the 'caller' variable with the subject of the caller. Argh, the Interceptors annotation had vanished - readding. Move the REST 'domain' classes into the server package, as they are only needed there. Auth filter is not needed anymore. Better URIs for resources, handling of favorite resources. Merge branch 'master' into heiko-rest Add some handling around alerts, system status and Exceptions. Add time and description of alert. Add more linking. Move base url to /rest/1. Add a 'landing page'. Some better treatment of the parent resource. Turn primitives to Objects as this way they may be skipped when marshalling. Merge branch 'master' into heiko-rest Better schedule and data handling. Merge remote-tracking branch 'origin/master' into heiko-rest Improve status display. Add some graphing of values as examples. Hide empty values and improve display somewhat. Start some support for HTML output of data. Freemarker ftw! Fix the url to fetch the data from (this must be relative so that the browser can prepend the host and port). Further improve html display for mere humans. Add some code to display resource trees. Still unfinished. Add a resource tree browser. Put tree code in a separate file. Fix some fallout from type-detection. Merge branch 'master' into heiko-rest Merge branch 'master' into heiko-rest Start support for updating of schedules. BZ 741855 - use standard conforming escapes in Postgres 9.1+ BZ 738029 - partially revert the change of BZ 536496, so that plugins that still use the deprecated (and useless) attribute can be deployed. Spit out a warning to the console. BZ 734135 -- Don't accept dynagroups with <,$,',[,{ in the name and < in the expression. Merge remote-tracking branch 'origin/master' into heiko-rest BZ 742614 filter out < in messages so that the message content is not treated as html and interpreted by the browser. Merge branch 'master' into heiko-rest Make some tweaks to build REST nicely and also add the links library to the container build that was missing in heiko-rest branch. Depending on the system, the schedule ids may map to other metrics, so remove the naming. Add a note about the API not being stable. BZ 694741 filter destinations according to user roles (and thus visible resource groups) BZ 743559 Fix link from Inventory summary portlet to DynaGroup definitions Add the developer group from nexus, in the hope that the jsp compiler can be found again. Pass the RESTeasy version to the ant task that builds the container. Try to access nexus via https. Only use the language code without country for the installer translations. Disable JSP compilation in the hope to get the build to go again. There are no JSPs in here. Remove that part. Re-enable jsp compilation to see if the needed jars can be resolved now. Add an ID column to RHQ_DRIFT_DEF_TEMPLATE in the upgrade script. BZ 739629 - make sure ant-contrib.jar gets included. BZ 683556 - Don't display links to pages of the old UI. That are wrong and not needed anyway. BZ 744770 - Don't put html in the message, as the sanitizer would not allow to render it. A few more German translations. BZ 743221 catch some rare occurrences where not all fields were in preferences and use the default in that case. BZ 728274 - add a message that the user needs to wait for the purge to complete before re-adding the plugin. Add a description to the plugin descriptor. Skip the two tests that only work on Linux instead of letting the build fail on them if not on Linux. BZ 738642 Try to resolve ${} expressions for the management port. Fix a small typo and add a link to the forums. BZ 734895 cli samples no longer throw an error when being run on the command line of the CLI. Also add links to blog post that discusses them. BZ 734592 make the details r/o for autogroups. Some more translations BZ 747681 Fix Microblog plugin to use the already provided keys. Also disable on initial load, as the user has to configure it before first usage. BZ 747922 Prevent a NPE when the valuesList is null. Add some comments + do some cleanup on the samples. Update to RESTeasy 2.2 and move artifacs into rhq.ear, so future updates do noot need a container build. Add cache control and merge all media types into one method API cleanup for getting metrics and schedules. Also fix updating of schedules. Add support for hyperlinking between schedule and metrics and to the edit schedule method. Add hyperlinks from resource/schedules to their metrics Introduce a ParamMissing exception for missing query params We need to check if the user has actually enabled any swap at all before checking for free swap. Add the deprecated repo of JBoss Nexus as it is needed for Hibernate. Remove bogus import. Bump max memory setting for surefire tests, as the old one is no longer enough in some scenarios. Add the deprecated repo of JBoss Nexus as it is needed for Hibernate. Add the deprecated repo of JBoss Nexus as it is needed for Hibernate. BZ 751016 - set content type,as as7 requires this now. BZ 751027 Skip tests if not on a RH flavor of Linux BZ 751065 better detect the version and mark EAP servers as such. More REST work, consisting of: Add some more translations. Add the deprecated-repo of the nexus to the root pom, as this is needed in many places when the old repo.j.org/maven2 repo is not available. BZ 736481 - Fix the missing ':' errors. BZ 638181 Don't print server side stack traces on stdout of the CLI. Check for username + password being present before to prevent ArrayIndexOufOfBound exceptions. BZ_715404 prevent creation of groups with duplicate names BZ 750241 remove insufficient <http-method> entries in web.xml so that they don't trigger CVE-2010-0738 by accident. BZ 751065 prepend "EAP " to the names of server(s) and host controllers. BZ 751065 prepend "EAP " to the names of server(s) and host controllers. BZ 751065 Do not prepend EAP to the resource key, as this is needed later to address the server through the api. BZ 753177 Standardize server types for AS7 plugin Update RESTeasy to 2.2.3 Unify get schedules code, allow to limit the returned values to all,metric,trait We still need the user admin page for LDAP logins. Change the error page to point to the new GWT-locations. Merge branch 'master' into feature/rest Improvements in group handling. Allow updates to the group name. Do some caching of the group. Use the correct data type as input for group creation. Add some more attributes to a group. BZ 750240 - escape <,",>,&,',/ to prevent html injection attacks BZ 754199 don't print to stdout/err from within plugins. Also put the discovery loop in a try-catch-block, so that one failed discovery does not prevent discovery of other processes. Merge remote-tracking branch 'origin/master' BZ 750849 - provide a way to dump the system information to the server log. BZ 754838 - if no host name or port are found, use a default for now. Tried to do some stuff wrt caching, simple operations can now be scheduled. BZ 755544 prevent NPE when no resource or group or metric were selected. Turn down logging. Prevent a LazyLoadException for schedules. Merge branch 'master' into feature/rest BZ 757175 Prevent a NPE by missing directory listing rights. BZ 757178 If we can't read the file return to prevent an Exception later. Merge branch 'master' into feature/rest Improve history handling and parameter passing. Get system status from the SystemInfoManager Adapt the examples to the latest changes in the API. Make ResourceWithType show up as <resource> in xml output Allow to limit schedules by name Allow to obtain metrics for multiple schedules at once. Improve Exception mapping Initial set of integration tests for the REST api. Merge remote-tracking branch 'origin/master' into feature/rest Don't put @Stateless on the (abstract) super class. Several improvements to the AS7 plugin: Add tests for child:key=value groups in config. Also update Jackson. Fix compile errors. Initialize additionalProperties; give more debug output when assert fails. Support submission of (numerical) metrics into the server and retrieval of raw numeric values. Rollback jackson to 1.7.4, as 1.9.3 has a bug (JACKSON-744) sort retrieved values by timestamp, as some clients don't cope well with out of order data. Mention RHQ samples project. BZ 771216 - return messages accompanying error codes with the return type the client has requested. Some cleanup, return location for PUT metric, allow to expose raw metrics as xml too. Allow to submit a 'now' value - otherwise the 7days case will always be served from the 1h table as the Handler's now is some ms earlier than the utilities now. BZ 770967 - the port expression may now also have a ${} expression. Upgrade D3.js to version 2.7.1 Add an example of graphing raw data with D3.js as dots or lines. Allow to also show lines and dots. Add a graph where each days metrics consist of a certain color Fix the computation of the correct start and end times, so that each color represents a full day. BZ 771940 - Increase timeout when waiting for process start. BZ 734495 - allow to provide JAVA_HOME BZ 781801 - if frequency is 0 print a note and return. Allow to get and set baselines. Fix a small issue with opacity, that prevented the dots to show. BZ 708332 - Add support for reading/writing of system-properties and paths (partially cherry picked from commit 3e12e49) BZ 772726 - Disable tests by default for now Add product-release and product-version traits (relates to BZ 734488). BZ 782780, BZ 766284 - properly detect management ports on the HC, move managed hosts below HC in the resource tree, BZ 783507 - allow to enable/disable deployments on server-group level. If the result is not a string, try to convert it accordingly. Add a getParent() method to addresses. BZ 766284 - Follow the type renaming from the plugin descriptor to again correctly detect server state. First cut at content-based (re-)deployment Also allow to deploy to domain deployments. Add a note about the max. allowed value. Small comment fix. BZ 758655 - remove no longer needed attributes, as they were removed in AS7 BZ 758655 - more fixes. Set timeouts for connecting and reading of data. Fix compile error Upgrade RESTEasy to 2.3.1.GA Take care of changes in XA-DS land within AS7 We need to disable the datasource before making changes an re-enable it later. Take care of changes in XA-DS land within AS7 We need to disable the datasource before making changes an re-enable it later. Example of graphing metrics in HTML+CSS Allow to report availabilities If the media type can not be determined, we use plain text as fallback. BZ 788487 - Allow to manually add standalone AS7 servers. BZ 788334 - prevent NPE for the first availability report for a new resource. BZ 734488 provide server start time BZ 788554 Prevent NPE when server can not be contacted. Allow to read and put traits, expose raw metric as html table and csv as well. Ignore the RhqThrowable for the moment. BZ 734488 provide server start time - improvements. BZ 742705 - make JNDIView result sensible data again. Enable gathering of server logs. Revert "Enable gathering of server logs." Improved detection for layered products. BZ 708293 - allow modification of xa-properties. Updated PT translations from the translations project up to its rev a1446c932 Pull logging from the m2 repo, parametrize the RHQ version, add plugin-api to cp. BZ 708332 - don't fail when the AS sends us unknown properties. Upgrade RESTeasy to 2.3.2 Improve support for Infinispan subsystem and EDG Update version. Add initial support for remoting and jgroups Managed servers are now removed with the normal remove resource method. BZ 801554 Create new managed serves via Create Child operation. Remove previous operations for this. BZ 800472 Change the property code to support as-resources without name as property. BZ 800070 Follw up with the changes of socket-binding format changes Fix a potential NPE that can prevent detection of managed AS7 servers in domain mode. If no result params are given by AS metadata, provide the default. Make the tool more robust BZ 803387 - provide the values for the resource config. BZ 803783 Increase wait time between shutdown and start. Also treat "Socket closed" as a positive outcome. Better user feedback when the type does not exist. BZ 802474, BZ 802467 HornetQ jms-queues,jms-topics and connection factories can now be added via the standard RHQ way. Fix javadoc BZ 805209 - detect wrong server mode. Add Torben and Rafael as contributors. Pull over translations from translation project to bring them to their version df97f356de (incl). BZ 702595 - parametrize 'ago' and fix the duration converter to use message bundles. Request availability checks on lifecycle methods (start/stop/restart) Added a bunch of comments wrt. integration tests. Remove code that returned a surrogate Result on failure, as this did not cater for all needed fields. Mention the flag for debugging the itests. BZ 803820 If product-* traits are null for community AS, return surrogate values. Update note on running to latest setup. Add a check to see if the resource is actually there. Remove a no-longer valid test. Check for rhq-resource being non-null. Introduce execute() methods with a timeout for cases where the 10sec default are not just right. BZ 804102 make lifecycle operations wait for completion. Fix typo Also take a port-offset from the command line into account. Tell the VM to prefer IPv4 BZ 802794 - SocketBindingGroups must not be removed/re-added on change. Also add integration tests. Trigger discovery BZ 805028 - honor the new port-offset attribtute for <socket-binding-group> elements in the AS7 descriptor. Add test for domain mode and apply fixes to the standalone one. Copy over rev 280095f47b from translations project. Relates to BZ 806281 BZ 802561 - fix display of resource configuration. Add system-properties. Make the assertion print what was wrong. Make the cache local for now. Try to better see why this is failing. config file arguments (option -c to start scripts) must be relative. BZ 808903 Allow to delete managed servers again. Remove obsolete operation. Prevent NPE and be less noisy when we just can't connect to the remote DB. Fix the standalone socketbinding test Don't follow redirects, tone down logging, do not always include-defaults, as this may cause harm with non read-* operations Write a newline first, as the AS-supplied file may not end in a newline and the new property would just be appended at end of line instead of a separate line. Fix some smaller typos and correct a comment. Improve help text. BZ 809622 - Datasource metrics have moved to child resources Comment out for the moment. Add a print command to print the current resource, improve the find command to take all remaining tokens for the search expression. BZ 809623 - re-enable startTime metric on managed servers and host. Add "blocking" parameter to managed server restart. Wait after each invocation and also fix the abort count logic. Disable for now - seems to be a timing issue on Jenkins. Fix two configuration related failures for root-logger and EE Fix a bug in address handling where a value of "jndi:/foo" would have been cut in the middle. Reformat mime-mappings are not required; do not hard code a child that may not be there BZ 791364 - Add a connection check trait. BZ 811300 - temporarily comment out calls to requestAvailabilityCheck() Fix a NPE Put quotes around the type name, so that the search works correctly. BZ 811188 wait a little longer after a reload to give the as7 server a chance to do its work. BZ 782598 - Collect max-pool-size as a metric. Reformat BZ 811623 - Datasources can now be created via create child. Disable for the moment, as the operation is gone. Move domain deployment related code into the DomainDeploymentComponent. BZ 811149 - scheme is required. While we're at it, provide a selection list for socket bindings. Allow to add/remove VHosts and display re-write rules. Rule properties can be modified, but not yet conditions. Implement methods on the Threading part of the platform mbean BZ 801800, 801849 - implement creation of JVM Definitons, make them editable and pass them on to managed server creation. Completely disable. This seems to create havoc. Updated translations from translations project. SocketBindingGroupDomain no longer exists - remove it. BZ 812762 Expose min-pool-size BZ 812761 AvaliableConnectionCount has no units Enumerate the options for flush strategy Prevent a NPE for cases where statistics are not exposed (like e.g. in profiles) BZ 812763 Add connection-properties to non-xa datasources. Rename resource types to be consistent with definition types. BZ 812745 add drift definitions for standalone server and host controller Small fix BZ 812912 prevent an NPE if e.g. the resource is ignored. BZ 812748 - add bundle support for standalone mode. Also use the introduced 'deployDir' config prop for drift. Add 'GC' operation to the memory subsystem of the JVM-Info BZ 812744 - fix the path to log file and also add it when it does not yet exist BZ 812264 Add server name/version to managed servers. BZ 708332 - remove the jvm attribute, which is now a child. Gets writing system-properties going again. BZ 812404 - detect product type and throw Exception if it does not match the discovered type. Rename EDG to JDG BZ 811892 Introduce deloyments on managed server level and allow to set a runtime name when deploying to a server group. Be less noisy when the server sends a variation of "resource not found" ssl and sso are optional, mark them so. If a child: node does not exist we create it if described in the plugin descriptor Allow to print single properties. list of properties is now printed on single lines. Avail and other commands allow a dot to mean current resource. BZ 794765 - provide max-connections configuration value as metric. BZ 812757 add vhost aliases as traits The resource config for content is read-only BZ 813750 - Only enable the ssl child if requested via setting the connector to secure. BZ 813270 - re-add the StatusHandlerBean to the list of declared classes for rest endpoints. BZ 813214 - allow to have zero or one jvm definitions on server-group or managed server level, that overrides a matching definition on host level. BZ 814408 Port is no longer required - in the case of a multicast port set. BZ 708332 'boot-time' flag is not available for standalone servers. Comment out mime-mapping section, as this is currently broken in AS7. See AS7-4592 Set properties on custom-handlers BZ 815447 - expose node name as part of the server resource config object. BZ 802467 - check for at least one jndi-name and the connector name being present BZ 812452 - set default timeouts for deployments to 30s to connect and 120s to upload. User can override the total timeout (for both) in the UI. BZ 708332: Revert " -support reads of name-value property maps", as Add test for adding a system property and retrieving it. Lets see if it blends Add a sleep to give the PC more time to start up resource containers. BZ 816584 - default-cache-container is gone in ER6 and no longer needed. Disable so that Jenkins is happy. Revisit and re-enable again. There is no "MaxWaitCount". Sort alphabetically to match the :read-resource output BZ 817540 - don't try to write path objects that are r/o (introduced in eap6er6) BZ 811149 - make protocol required to follow eap6er6 here BZ 811300 - Again use the new methods of the AvailabilityContext. Also for enable/disable of deployments and datasources. BZ 816169 connector does not need a backup. Connector and discovery-group-name are mutually exclusive BZ 818213 make the expression check for exactly "Profile" type - and ignore other types that have "Profile" in their name. BZ 818553 - protocol is AJP/1.3 not only AJP BZ 818552 - allow deletion of user defined path BZ 820272 Fix jdg slot name and default home directory detection. BZ 820623 signal a reload needed to the user Revert "BZ 820623 signal a reload needed to the user" BZ 821381 Follow the change of as7 saying "no metric available" (cherry picked from commit ef80432) BZ 821699 Add a display name to the _maxConnections metric BZ 820623 - if after a config change a reload is needed, signal this to the user. BZ 821721 - The inner item is a handler, not handlers BZ 822126 - Those properties are not all needed and the server may return different subsets. So mark as optional. (cherry picked from commit ac42e94) BZ 823582 - Prevent a NPE if a context is not deployed (e.g. no app deployed) (cherry picked from commit a2b225c) BZ 811288 - If a property name ends in :expr, we need to set a displayName BZ 824878 Support crud on network interfaces BZ 824513 - Fix issues with manual add. Also prevent some operations to be run, as we can's start processes on machines without agents. (cherry picked from commit f6a5001) + signal failed connection to the user. BZ 826031 Deliver both signal reload/restart to the server. (cherry picked from commit 74bef96) BZ 826030 Fix bug in pseudo-metric collection and remove formerly needed enable/disable wrapper BZ 825818 . Suppress AS7-ISPN type if JDG is deployed. Also remove JDG types from AS7-descriptor (cherry picked from commit c52b96d) BZ 844407 - Eliminate call to isLast() which is problematic on Oracle (cherry picked from commit bbf48d7, BZ 834820) Hudson (5): development RHQ_4.3.0-SNAPSHOT development RHQ_4.3.0-SNAPSHOT development RHQ_4.4.0-SNAPSHOT development RHQ_4.5.0-SNAPSHOT tag RHQ_4_4_0_JON311ER1 Ian Springer (545): add more detailed logging of SQLExceptions in a couple places tweak the metric collection intervals in the configurable-5 scenario to [BZ 676761] add better error handling when user enters an invalid search expression on the Inventory>Children subtab (https://bugzilla.redhat.com/show_bug.cgi?id=676761) add support for dev profile to perftest plugin's pom [BZ 722548] add new #Test/Rpc view that can be used to invoke a new sleep() RPC [BZ 734610] remove validator on username field that was disallowing usernames [BZ 608798, 608803] changes to LoginView and MenuBarView to allow RHQ logos to [BZ 735232] Message portlet should not be displayed on default dashboard in JON include exception in logged error when adding a ResourceError fails document what the default collection interval will default to if the defaultInterval attribute is not specified for a metric in an Agent plugin descriptor make various improvements to the server-a resourceType used by the configurable-1 scenario, including setting up resource subCategories; add generic support to PerfTestComponent for simulating operation execution; make minor Javadoc improvement in PerfTestEventPoller [BZ 553034] fix so Solaris lofs and tmpfs fielsystems are discovered guard against possible NPE; extract constants for fs sys type names [BZ 736439] prevent potential timeout of overlord session Merge branch 'master' into feature/performance [BZ 736848] add new method to LinkManager that can return the appropriate form of group URL given an EntityContext; update several spots in the code to start using this new method to ensure the correct form of URL is used for the different types of compat groups (https://bugzilla.redhat.com/show_bug.cgi?id=736848) [BZ 736848] add new method to LinkManager that can return the appropriate form of group URL given an EntityContext; update several spots in the code to start using this new method to ensure the correct form of URL is used for the different types of compat groups (https://bugzilla.redhat.com/show_bug.cgi?id=736848) [BZ 738031] upgrade EMS from 1.2.15.1 to 1.2.16 to fix failure of as5 plugin to initialize the EMS connection to an AS 6.0 instance (https://bugzilla.redhat.com/show_bug.cgi?id=738031) [BZ 738050] prior to invoking plugin API methods on discovery components, make sure the context classloader is set correctly; specifically, it must be set to the parent resource component's classloader, except for platform discovery, where it must be set to the platform-plugin classloader) (https://bugzilla.redhat.com/show_bug.cgi?id=738050) add traits and operations to the server-a/service-a resource types used by configurable-1 scenario, and add metric and trait generators to that scenario; make SimpleNumericMeasurementFactory and SimpleTraitFactory return more realistic metric and trait values [BZ 738050] prior to invoking plugin API methods on discovery components, make sure the context classloader is set correctly; specifically, it must be set to the parent resource component's classloader, except for platform discovery, where it must be set to the platform-plugin classloader) (https://bugzilla.redhat.com/show_bug.cgi?id=738050) [BZ 738031] upgrade EMS from 1.2.15.1 to 1.2.16 to fix failure of as5 plugin to initialize the EMS connection to an AS 6.0 instance (https://bugzilla.redhat.com/show_bug.cgi?id=738031) Merge branch 'master' into feature/performance fix minor bug where as/as5 server discovery failed to parse the --properties fix minor bug where as/as5 server discovery failed to parse the --properties Merge branch 'master' into feature/performance disable footer controls on metric schedules list view after Set Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq add commented out skipTests=true prop in overrides profile Merge branch 'master' into feature/performance add commented lines that can be uncommented to enable JProfiler agent update the pattern-generator plugin so it can be used to reproduce [BZ 736517] remove unnecessary loading of grandchildren Resources in [BZ 739529] fix a regression that was causing the group Configuration tab to fix typo in comment [BZ 737121] fix sorting bug for Type, Children, and Descendants columns on Resource group list views (https://bugzilla.redhat.com/show_bug.cgi?id=737121) fix javadoc generation remove an unused param; misc cosmetic tweaks [BZ 736848] fix links to autogroups and cluster groups in various places where [BZ 727869] load ConfigurationUpdate.configuration entity field lazily in order upgrade to surefire plugin 2.10 and TestNG 6.2; use useSystemClassloader=true, fix test failures caused by TestNG upgrade optimize imports, in particular removing illegal import of non-public class downgrade testng from 6.2 to 6.1.1 to prevent server-jar test failures [BZ 734599] fix "Could not enlist in transaction on entering meta-aware object!" disable annotation processing in default compiler plugin config [BZ 743271] Fix LazyInitializationException that occurred when going to the [BZ 743683] prevent NPEs in Message constructor Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq [BZ 744003] log an INFO message once the Server is fully started; use [BZ 738798] dynamically calculate RPC timeout for calls to delete-all and acknowledge-all alerts to ensure timeout is long enough when deleting or acknowledging a large number of alerts (https://bugzilla.redhat.com/show_bug.cgi?id=738798) [BZ 720786] fix NPE that occurred when hovering over an ancestry cell in a ListGrid before the grid's data was loaded (https://bugzilla.redhat.com/show_bug.cgi?id=720786) [BZ 738798] for delete-all or acknowledge-all actions on alert list views, calculate thr RPC timeout dynamically based on the total number of alerts (https://bugzilla.redhat.com/show_bug.cgi?id=738798) add a ds field for "id", so the ds has a primary key field defined; optimize fetch by not specifying a priorities filter if all three priorities were specified by the user optimize fetch by not specifying a severities filter if all five severities were specified by the user fetch condition logs by default on fetch requests, log the PageControl being used at debug level; also, log a warning if getFetchCriteria() returns a null criteria (since this means there would be no paging of the fetch results) [BZ 720826] for Tables that have an initialCriteria, don't use autoFetch, since it causes the ListGrid to set the page size to 1000, rather than the specified page size, on the initial fetch request (https://bugzilla.redhat.com/show_bug.cgi?id=720826); turn off group-by by default on the ListGrid; set the max group-by records to 200, rather than the default of 1000, to prevent group-by attempts from loading too many records [BZ 720786] fix a 2nd potential NPE in AncestryUtil (https://bugzilla.redhat.com/show_bug.cgi?id=720786) for BZ 720826 (https://bugzilla.redhat.com/show_bug.cgi?id=720826): update setFirstRecord(), reset(), and toString() to support the recently added optional 'firstRecord' field hide the suggestion box when user clicks Enter in the search form item to submit a search request [BZ 746277] on alerts list view, after a delete-all call completes, reset sorting and paging before refreshing to avoid invalid PageControl exception from occurring on the Server side (https://bugzilla.redhat.com/show_bug.cgi?id=746277); on alerts list view, call refreshTableInfo() upon failure of any action (Delete, Delete All, etc.) so Table buttons will get re-enabled; in Tables with search support, when user clicks Enter in the search form item, only submit a fetch request if the search expression has changed; in RPCDataSource, when a fetch request is initiated, reset PageControl to first page if the criteria has changed since the last fetch request - this prevent invalid PageControl exceptions on the Server side (https://bugzilla.redhat.com/show_bug.cgi?id=720490); turn down verbositoy of DEBUG logging in RPCDataSource; add new setPagingInfo method in RPCDataSource and begin refactoring subclasses to use it; add a new CriteriaUtility class containing utility method s for working with SmartGWT Criteri [BZ 720826] fix bug introduced in Table.refresh() by a recent commit of mine - invalidateCache() and fetchData() should only be called when the Table's ListGrid is DataSource-backed, otherwise NPEs occur for Tables that are not DataSource-backed; make Table and AbstractTableSection implement InitializableView so users of the class can determine when onInit() is done; when rendering an alert templates view for a particular restype, do not call renderView() on the alert templates view until its onInit() is done (this prevents a potential NPE in renderView()) cosmetic - improve a log message; remove two unnecessary null checks [BZ 720826] fix bug introduced in Table.refresh() by a recent commit of mine - do not assume this.listGrid is non-null in fetchData() callback, since if the user went off to another view before the fetch completed, the Table widget could have been destroyed by our Selenium locator infrastructure and this.listGrid could have been nulled out was using the wrong QueryImpl class in DEBUG logging in findAlertsByCriteria() - use org.hibernate.ejb.QueryImpl from hibernate-entitymanager.jar, not org.hibernate.impl.QueryImpl from hibernate3.jar (minor) fix bug in logic that determines whether to add a Back to List button on [BZ 746669] make sure that Table uses getDataSource(), rather than this.datasource, when it needs its dataSource, in case a subclass has overridden getDataSource(), instead of calling super.setDatasource() (https://bugzilla.redhat.com/show_bug.cgi?id=746669) [BZ 737191] stop grouping rows, since it can cause too many records to be fetched resulting in perf issues (https://bugzilla.redhat.com/show_bug.cgi?id=737191) misc minor remove redundant test-scoped hibernate-entitymanager dep (made redundant by the recently added provided-scoped hibernate-entitymanager dep); group all test-scoped deps together optimize equals() method by adding an == check at the very top replace clearSortingAndPaging() method in Table with a new refresh(boolean resetPaging) method, which refreshes the data, and if resetPaging=true, also resets paging; paging is reset via the listGrid.scrollToRow(), rather than the listGrid.clearSort() hack that was used by clearSortingAndPaging() [BZ 746670] add new createListGrid() to Table to clearly separate the ListGrid specify setInitialCriteriaFixed(false) in ResourceSearchView, and pass in several fixes to SmartGWT-war Maven archetype [BZ 746347] allow a user w/ MANAGE_SECURITY to edit the assigned roles of an LDAP-authenticated user if LDAP authorization is not enabled in the system settings (https://bugzilla.redhat.com/show_bug.cgi?id=746347) update comment describing gwt.userAgent prop upgrade twitter4j from 2.1.2 to 2.2.4 to fix compile errors in alert-microblog [BZ 717284] prevent NumberFormatException from occurring when a non-numeric [BZ 738325] prevent "JavaScriptException:(TypeError): listGridRecord is null" fix compilation errors and deprecation warnings in twitter plugin misc minor improvements fix recent regression where Resource Inventory > Child Resources subtab was fix recent regression that caused group Inventory > Members subtab to list all inventoried Resources, rather than just the group member Resources reset this.initialized to false in destroy() to prevent potential NPEs if refresh() is called after a Table is destroyed minor improvement to log messages if any of the RPC calls fail during init, abort rendering of the editor update all places that use the "CAM_JAAS_PROVIDER" system setting to assume its update all places that use the "CAM_LDAP_PROTOCOL" system setting to assume its [BZ 747678] increase the maximum number of available items listed on the left in selectors and display a warning message to the user if that number ends up being less than the total number of items in the DB (https://bugzilla.redhat.com/show_bug.cgi?id=747678) minor - javadoc fixes etc. various minor fixes to exception handing in our GWT RPC services [BZ 748002] fix NPE that occurred upon hovering over the Category column (https://bugzilla.redhat.com/show_bug.cgi?id=748002) [BZ 748003] fix NPE that occurs if RPC call to load global perms fails (https://bugzilla.redhat.com/show_bug.cgi?id=748003) interpret this.dataPageSize == null as paging disabled [BZ 734231] set max lengths on input fields in group definition detail view to prevent user from entering illegal values (https://bugzilla.redhat.com/show_bug.cgi?id=734231) [BZ 734073] set max length of dashboard name input field to 200 to prevent user from entering an illegal value (https://bugzilla.redhat.com/show_bug.cgi?id=734073) [BZ 736836] in the config editor, properly handle editing values of simple props [BZ 748111] fix bug where when a prop became invalid, the fired prop value changed event incorrectly indicated that the set of invalid props had not changed (https://bugzilla.redhat.com/show_bug.cgi?id=748111) fix minor bug where when a green message got replaced by a red one (or vice simplify logic increase timeout in test from 2s to 3s in hopes of getting it to pass in jenkins [BZ 734064] don't allow multiple dashboards with the same name on the global minor - make non-unique-dashboard-name error message transient [BZ 734438] don't allow user to set the # of columns on a dashboard to 0 increase timeout of event test from 3s to 4s, since the test is still failing [BZ 737159] fix a number of major bugs in jboss-cache resource config loading [BZ 736836] fix recent regression caused by recent switch to using SpinnerItems there is a bug in the RHQ criteria API, where when an unlimited [BZ 749277] fix bug where the ""Only 1 out of 2 available items are listed - [BZ 749654] (stopgap workaround for RHQ 4.2) for selectors with no filters, set the available record page size to 500, rather than 100, to minimize the chances of use not being able to view some available items (https://bugzilla.redhat.com/show_bug.cgi?id=749654) [BZ 749657] display not-all-available-records-loaded warning message within selector widget itself, rather than in the main message bar (https://bugzilla.redhat.com/show_bug.cgi?id=749657) minor - fix a couple typos fix ordering of modules so a clean mvn install can be done from the root dir minor - fix typo in comment [BZ 751097] various improvements to the code used to load top-level server and [BZ 744273] improve variable names and extract some variables to aid debugging [BZ 701375] upgrade EMS from 1.2.16 to 1.3 in order to prevent exceptions in [BZ 751421] fix so two ResourceTypes with same name minor - fix a typo [BZ 627023] use JBossEntityResolver to locally resolve DTDs and XSDs referenced in XML config files parsed by jboss-as, jboss-cache, and mod-cluster plugins - this allows these plugins to function even if the RHQ Agent cannot access the Internet (https://bugzilla.redhat.com/show_bug.cgi?id=627023) [BZ 627023] two files I missed in my previous commit [BZ 752239] at runtime, default to the "en" locale, not the "default" locale; [BZ 627023] add SelectiveSkippingEntityResolver class to plugin-api and use improve the Javadoc for getValues() [BZ 752399] fix bug in property adapter framework that was causing datasource resource creation to fail (https://bugzilla.redhat.com/show_bug.cgi?id=752399) [BZ 752814] fix broken detail links in recent operations portlets [BZ 752981] remove duplicate call to FileSystemInfo.refresh(), which was resulting in invalid metric values (https://bugzilla.redhat.com/show_bug.cgi?id=752981); use switch-case rather than if-else in getValues() to make code more readable log message reporting invalid numeric metrics at DEBUG, rather than WARN, filter out infinite values, as well as null and NaN values, in addNumericData() [BZ 753264] make JNP URL discovery more robust, so it doesn't provide garbage values in certain edge cases (https://bugzilla.redhat.com/show_bug.cgi?id=753264) add a Version field to the agent plugin and server plugin list views, but hide it by default minor - add a TODO to add groupBy support to the Resource Install Report view once the groupBy bugs in SmartGWT have been fixed; add copyright headers to a couple classes that were missing them [BZ 750240] comment out all Struts actions that are no longer needed by the new SmartGWT GUI (https://bugzilla.redhat.com/show_bug.cgi?id=750240) [BZ 752893] refresh the resource-errors (yellow triangle) icon after the user [BZ 634306] increase the max length of a product version from 50 to 100, so it [BZ 753883] require a user to have MODIFY_RESOURCE perm on a Resource in order improve description of "Version Name" trait add support for authentication; reproduce profile service bug with [BZ 712433] ProductInfo.properties file is now included in installer.war; this file is read in to determine if the current product is RHQ or JON; if JON, server properties that are not supported in JON (namely, unsupported DB types and embedded-agent related props) are not displayed in the installer GUI (https://bugzilla.redhat.com/show_bug.cgi?id=712433) initial version of a shell script for creating a JBoss AS or EAP bundle zipfile v2 of this script - remove the top-level jboss-as dir from the AS/EAP zipfile minor - fix a bunch of typos add a boolean isCleanDeployment param to deployBundle() [BZ 726689] upgrade Javassist from 3.8.0.GA to 3.9.0.GA to prevent intermittent NPEs on JSF-based pages [BZ 756106] ensure resource classloader is initialized in processSyncInfo() prior to making any resource component facet [BZ 620603] turn log level down from WARN to ERROR for org.hibernate.hql.ast.QueryTranslatorImpl minor - fix javadoc typos change log messages from INFO to DEBUG to be consistent w/ other plugins don't prepend RHQ Server resource name with "AS "; include JNP port in RHQ Server resource name; refactor formatServerName() to use a StringBuilder and be more readable minor - remove manual boxing [BZ 751418] Finish button is now disabled / grayed out on final step of resource import/create wizards until the config editor reports the config as being valid; note, to achieve this a new method isNextButtonEnabled() was added to the WizardStep interface and a new method updateButtonEnablement() was added to the WizardView class (https://bugzilla.redhat.com/show_bug.cgi?id=751418); also added javadoc to the WizardStep interface [BZ 760721] fix bug where negative values would always get incorrectly normalized to "-" (https://bugzilla.redhat.com/show_bug.cgi?id=760721) minor - fix some typos in javadoc [BZ 760185] fix NPEs that occurred if user hovered over the Severity or Source Location columns while grid data was still loading (https://bugzilla.redhat.com/show_bug.cgi?id=760185) [BZ 765593] escape HTML in unified diff output (https://bugzilla.redhat.com/show_bug.cgi?id=765593) improve javadoc move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage (missed this file in my last commit) make Resource's compareTo impl consistent with its equals() impl, so Resources can be reliably added to TreeSets and TreeMaps; update "inventory" Agent prompt command to sort sibling Resources by type and then by name, rather than just by name - this makes the output much more readable cosmetic: minor tweak to comment move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage (missed file from earlier commit) add 'commandLine' prop to plugin config def for JMX Server type (this prop was already being used in the plugin's code) move ObjectNameQueryUtility and ParentDefinedJMXServerNamingUtility classes to util subpackage (missed files from earlier commit); minor code cleanup in InternalJMXServerDiscoveryComponent [BZ 703557] when possible, auto-discover JVM's not exposing JMX Remoting; as part of this, include the JDK tools.jar in the Agent's classpath when it's available from the Agent's JDK (https://bugzilla.redhat.com/show_bug.cgi?id=703557) change the line endings back to Windows format (CRLF) (IntelliJ fix generics-related compiler warning if an exception occurs when discoverResource() calls ProcessComponent.getProcessForConfiguration(), include it as the cause of the RuntimeException that is thrown, rather than swallowing it; set a description on the details object returned by discoverResource() [BZ 703557] add support for building and running the jmx plugin on [BZ 785026] log an informative warning, if log files cannot be polled for events due to SIGAR being disabled or unavailable (https://bugzilla.redhat.com/show_bug.cgi?id=785026) fix typo and remove redundant import minor: make help output consistent w/ the other CLI commands [BZ 784983] fix output of CLI version command (https://bugzilla.redhat.com/show_bug.cgi?id=784983) [BZ 785218] fix so -v/--version option does not print redundant info remove a bunch of dead code (minor) remove unused import [BZ 784678] prevent NPE from occurring if -f option is not passed to CLI record command - instead throw a command line minor: remove unused imports; alphabetize ClientCommand.COMMANDS array when a commands are passed invalid options, print an error message and the command's usage - do not print a stack trace [BZ 786980] avoid potential ConcurrentModificationException for Resource.childResources Set [787250] add comment telling user not to include the --daemon option in minor: remove unused imports; alphabetize ClientCommand.COMMANDS array when a commands are passed invalid options, print an error message and the command's usage - do not print a stack trace [BZ 786980] avoid potential ConcurrentModificationException for Resource.childResources Set [787250] add comment telling user not to include the --daemon option in [BZ 787769] upgrade Oracle JDBC driver to ojdbc6 (JDK6) version 11.2.0.3.0 [BZ 787766] upgrade Postgres JDBC driver to version 9.1-901.jdbc4 some minor cleanup initial version of a tool for generating test ejb-jars, wars, and/or ears - currently only supports v2.1 ejb-jars containing only session beans add support to jeegen for entity beans and for ejb 3.0 and 3.1 Merge branch 'master' into bug/788638 jeegen: add support for generating message-driven beans, as well as Merge branch 'master' into bug/788638 [BZ 790073] do not allow keys or names with values of "", since Oracle would ultimately normalize those values to null; normalize values of "" for version or description to null, since Oracle would ultimately do that same normalization; fix several errors in Javadoc (https://bugzilla.redhat.com/show_bug.cgi?id=790073) [BZ 790179] temptoray workaround for https://bugzilla.redhat.com/show_bug.cgi?id=790179 that makes list-o-map members a shell script for spawning n JBoss AS or EAP instances [BZ 736737] log a detailed DEBUG message if an exception occurs during an avail check (https://bugzilla.redhat.com/show_bug.cgi?id=736737) consistently use -n/-z for checking if variables have non-zero/zero-length values; several other minor changes [BZ 789529] fix ClassCastException in ensureNoPluginConfigurationUpdatesInProgress() that would occur when one or more member Resources had individual plugin config updates in progress (https://bugzilla.redhat.com/show_bug.cgi?id=789529) [BZ 754521] prevent NPE when user navigates away from a Resource detail view before that view has finished loading [BZ 768707] fix bug where passing agent command-line options via start script/environment prevents agent from starting via wrapper script (https://bugzilla.redhat.com/show_bug.cgi?id=768707) [BZ 768707] change line endings back from Unix-form (LF) to Windows-form (CRLF) use "-z $foo"/"-n $foo", rather than "x$foo" = "x"/"x$foo" != "x", to check if variables have values or not [BZ 791009] use the -z and -n options to the 'test' builtin command to check if variable have non-zero values or not (https://bugzilla.redhat.com/show_bug.cgi?id=791009) minor improvement to debug logging [BZ 771415] reset to page 0 after the user deletes or uninventories resources or groups to prevent an invalid PageControl from being sent to the server in the subsequent fetch call (https://bugzilla.redhat.com/show_bug.cgi?id=771415) [BZ 786161] add a new "Connection Available?" trait to datasource and connection factory Resource types [BZ 769861] add a new "Maximum Threads" trait to the Tomcat Connector ResourceTypes in both the as4 and as5 plugins (https://bugzilla.redhat.com/show_bug.cgi?id=769861) [BZ 791009] use the -z and -n options to the 'test' builtin command to check if variable have non-zero values or not (https://bugzilla.redhat.com/show_bug.cgi?id=791009) minor improvement to debug logging [BZ 771415] reset to page 0 after the user deletes or uninventories resources or groups to prevent an invalid PageControl from being sent to the server in the subsequent fetch call (https://bugzilla.redhat.com/show_bug.cgi?id=771415) [BZ 786161] add a new "Connection Available?" trait to datasource and connection factory Resource types [BZ 769861] add a new "Maximum Threads" trait to the Tomcat Connector ResourceTypes in both the as4 and as5 plugins (https://bugzilla.redhat.com/show_bug.cgi?id=769861) fix a bunch of bugs in testResourceLineage() and add an assertion to it use Hibernate.initialize(), rather than size() hack, to init lazy fields; remove an unused import [BZ 794790] within the plugin container, always use a ConcurrentHashMap-based Set for Resource.childResources field to allow it to be concurrently accessed safely (i.e. to avoid ConcurrentModificationExceptions) (https://bugzilla.redhat.com/show_bug.cgi?id=794790) [BZ 786159] add a new VIEW_USERS global permission that is required in order to view other users (https://bugzilla.redhat.com/show_bug.cgi?id=786159) use Hibernate.initialize(), rather than size() hack, to init lazy fields; remove an unused import [BZ 794790] within the plugin container, always use a ConcurrentHashMap-based Set for Resource.childResources field to allow it to be concurrently accessed safely (i.e. to avoid ConcurrentModificationExceptions) (https://bugzilla.redhat.com/show_bug.cgi?id=794790) [BZ 786159] add a new VIEW_USERS global permission that is required in order to view other users (https://bugzilla.redhat.com/show_bug.cgi?id=786159) [BZ 786159] add functional tests for the new VIEW_USERS global permission add tests that test overwriting and upgrading a JON 3.0 DB schema use StreamUtil.copy() (from rhq-core-util.jar), rather than private copyStreamData() fix some javadoc typos when an SQLException occurs in DBSetup.doSQL(), catch it, wrap it in an ExtendedSQLException that includes the SQL add a new Resource constructor that allows setting the childResources field (useful if caller wants to use a Set impl other than HashSet) add tests that test overwriting and upgrading a JON 3.0 DB schema use StreamUtil.copy() (from rhq-core-util.jar), rather than private copyStreamData() fix some javadoc typos when an SQLException occurs in DBSetup.doSQL(), catch it, wrap it in an ExtendedSQLException that includes the SQL add a new Resource constructor that allows setting the childResources field (useful if caller wants to use a Set impl other than HashSet) fix recent regression where this.childResources wasn't getting initialized when certain constructors were used if an SQLException is thrown, wrap it in an ExtendedSQLException, so an outer catch block can include the SQL when logging the SQLException add a TestNG suite/test lifecycle listener that prints info to stdout as suites and tests start and finish upgrade Log4J from 1.2.14 to 1.2.16 and define this version once in the root pom, from which all other poms will inherit it [BZ 796437] make sure superusers or users w/ MANAGE_SECURITY can view other users, even if they don't have VIEW_USERS (https://bugzilla.redhat.com/show_bug.cgi?id=796437) turn down log levels to make log file less verbose minor: remove unused import minor: don't print quite so many dots to stdout while creating member Resources of large groups minor: comment out some println's that were cluttering stdout remove dependsOnGroups="drift" attribute from @Test annotation on class, since that group is not defined anywhere [BZ 786159] add test that verifies dbsetup and dbupgrade work as expected when adding the new VIEW_USERS permission to the model (https://bugzilla.redhat.com/show_bug.cgi?id=786159) fix bug in Ant script triggered by -Ddbsetup, where all-*.xml files were not always regenerated when the schema version was bumped up in the pom; fix bug in dbupgrade schema version 2.119 update maven jar plugin from 2.3.1 to 2.4 in DbSetupUtility, read the test datasource connection props from Maven's rhq.test.ds.* props, rather than using hard-coded values write user prefs to /tmp/user, rather than /home/user, when running tests, use correct syntax for passing sysprop to surefire (fixes my previous commit) [BZ 749368] add Javadoc @since tags to plugin API classes (https://bugzilla.redhat.com/show_bug.cgi?id=749368) fix bad failure message; add an additonal failure check include uuid and type's plugin in toString() minor: improve variable name minor: remove unused imports [BZ 797999] prevent ConcurrentModificationExceptions during inventory sync of unknown Resources (https://bugzilla.redhat.com/show_bug.cgi?id=797999) minor: make code that converts LDAP attribute values to Strings more robust [BZ 799376] make prepopulation of fields on new LDAP Subject from LDAP user attributes recognize standard alias attributes; prepopulate the Subject.department field from the "ou" (organizationalUnitName) attribute (https://bugzilla.redhat.com/show_bug.cgi?id=799376) minor: remove some unused params from private methods; add a comment describing where to find the LDAP core schema [BZ 800141] fix a NullPointerException (NPE) that occurs when "discovery -f" Agent prompt command is run when the Agent is not connected to the Server, i.e. not in "sending" mode (https://bugzilla.redhat.com/show_bug.cgi?id=800141) switch very noisy log message from DEBUG to TRACE minor: fix mistake in javadoc [BZ 799532] do not attempt to attach to java processes running as different users than the Agent, since it sends SIGQUIT signals to the java processes causing them to spew thread dumps to their stdouts, and it fails to attach to them to boot (https://bugzilla.redhat.com/show_bug.cgi?id=799532); turn down logging in JMX discovery component - log most things at DEBUG, not INFO [BZ 800570] set Content-Type header to "text/plain", rather than not setting it at all, in sessionAccess servlet responses - this prevents errors in FF's error console when FF tries to parse the response as HTML (https://bugzilla.redhat.com/show_bug.cgi?id=800570) update check-java-api profile so it is activated if mvn is run w/ JDK7 or later and so the default value for java6.home works out of box on Fedora systems (and possibly RHEL systems?) fix jdk version range syntax stop using jdk activation for check-java-api profile, since it causes "Failed to determine Java version for profile check-java-api" errors when running mvn install on descendant modules add jdk activation back; it wasn't broken after all - the error tuned out to be due to a syntax error in a jdk version range in my settings.xml take out the jdk activation again - it is causing errors from the Shrinkwrap maven resolver... in persistToDisk(), create PC data dir if it doesn't already exist upgrade shrinkwrap-resolver from 1.0.0-beta-6 to 2.0.0-alpha-1 upgrade shrinkwrap-resolver from 1.0.0-beta-6 to 2.0.0-alpha-1 (missed file from previous commit) add a new PluginContainerConfiguration ResourceProvider that allows tests to inject the config for the current plugin container minor: remove some unused imports move MockingServerServices from test source to main source, since it can be of use to other modules using our Arquillian framework move props defining the arquillian and shrinkwrap versions into the root pom, so we're using the same versions across the entire project minor: fix typo in exception message remove some long-commented-out obsolete code; log a warning if the plugin finder is null in the PC config, since this should never be the case outside of a test environment improve the INFO message that is logged to summarize the results of a discovery scan add a new InventoryManagerTest RHQ-Arquillian-based test that tests inventory sync works following a clean restart of the PC disable this test for now, since the Arquillian stuff interferes with some of the other PC tests, causing them to fail break the Arquillian test out into its own Surefire execution inside a separate Maven profile to prevent it from temporarily comment out the Arquillian-based tests until they can be moved to their own module move arquillian-integration modules under core; add new plugin-test-api and plugin-container-itest modules under core reformat XML using 2-space indent be tolerant of the XML entities which are at the top of some of our plugin descriptors (e.g. the jboss-as* plugins) change Nullable annotations to NotNull on a couple methods that had the wrong annotation add an integration test that uses the new Arquillian framework deploy the platform plugin to the test PC too, to make it as realistic as possible add org.eclipse.jdt.core.compiler.source=1.6, since the IntelliJ Eclipse Code Formatter plugin expected this property to be set optimize imports and reformat add gwt.style prop whose default value of "OBF" can be overridden to "DETAILED" in settings.xml add preliminary support for SIGAR setup to the arquillian PC container temporarily disable the test until we figure out why it's failing in jenkins cosmetic: fix typos in comment add an Arquillian-based integration test that tests discovery of a real AS7 instance, which we start up ourselves via the Arquillian Maven plugin enable the Arquillian-based tests for the as5 and as7 plugins, though they may fail in Jenkins exclude the Arquillian test from the surefire execution during the 'test' phase turn level of "Sigar" category down to WARN fix so canProvide() does not assume the container has been initialized; improve error handling in lookup() minor: use a Logger, rather than System.out.println() add the previously MIA arquillian.xml make assertions more robust in testAutoDiscovery() use the failsafe plugin, rather than the surefire plugin, for integration tests move all integration tests under itest subpackage; move integration test resources under itest subdir; clean up and organize deps reorganize and remove some redundant entries upgrade dependency plugin from 2.3 to 2.4; upgrade ant-nodeps antrun plugin dep from 1.6.5 to 1.7.0 (to match the version of Ant used by the antrun plugin); add ant-nodeps as antrun plugin dep cosmetic: add comment begin adding code to start and stop an AS7 host controller via the maven-exec-plugin (commented out for now until it is fully functional) fork the exec maven plugin from codehaus mojo (https://svn.codehaus.org/mojo/trunk/mojo/exec-maven-plugin/, r16129), so we can add support for background execution to the exec goal delete fork of the codehaus exec maven plugin - the fork now lives at https://github.com/ispringer/exec-maven-plugin improve error handling in AbstractAroundDiscoveryExecutor; don't assume server services are mocks in MockingServerServices.resetMocks() add a new itest.debug profile, which is the failsafe plugin analog of the test.debug profile for the surefire plugin break one line into two to be able to pinpoint NPE's itests now test all of the operations and metrics exposed by both Server Resource types; the AS7 dist zipfile is downloaded and unpacked via the dependency plugin; the AS7 standalone instance is started via the arquillian plugin; the AS7 domain instance is started via my own fork of the exec plugin, which adds support for background execution and polling a network address to verify the exec'ed process has fully started remove unneeded @OperateOnDeployment("jboss-as-7") annotation from test methods; remove @RunDiscovery annotation from all test methods other than testAutoDiscovery(); when metric collection throws an exception, log the exception; upgrade exec-maven-plugin from 1.2.1.jbossorg-1 to 1.2.1.jbossorg-3; change console log threshold from ERROR to INFO add support for running itests against EAP6: to run against EAP6, use -Ditest=eap6 -Deap6.url=http://blah.com/blah/jboss-eap-6.0.0.Beta1.zip - to run against AS7, use -Ditest=as7 -Das7.version=7.1.1.Final; fix testReleaseVersionTrait so it passes against EAP6; use facet loacks for ResourceComponent invocations made within itests; rename jboss7.home sysprop to jboss.home add failure message to assertion set uuid field to a real UUID improve logging minor change in toString() impl minor: remove an unused import fix a few bugs in the AS7 itests make AS bind addresses configurable; go back to using jboss7.home as sysprop name, rather than jboss.home disable forking in compiler plugin config in root pom; add URL to my blog in root pom; suppress up a few compiler warnings add some utility classes for working w/ Resources and ResourceTypes add commented-out line that shows how to disable execution of the animal sniffer plugin move the provided-scoped deps providing JPA and Hibernate annotations (for working around the JDK6 javac bug where annotations used by dependent classes must be in the classpath) to the root pom, so sub-pom's don't need to worry about specifying them add a new plugin-test-util module containing a base class that can be subclassed by any plugin writing plugin-test-api based integration tests; refactor the as5 plugin and as7 plugin itests to use the new module; add support for starting/stopping an AS5 instance for itests to the as5 plugin pom (currently AS 6.0 and 6.1 are supported - still need to add support for EAP 5.0.x and EAP 5.1.x) [BZ 804832] fix invalid plugin config exception that occurred when "type" conn prop was set to "Local" when manually adding/importing a JMX Server / JVM (https://bugzilla.redhat.com/show_bug.cgi?id=804832) oops, this file should have been included in commit a981458 more gracefully handle when avail check thread is interrupted (e.g. during shutdown of the PC) add a new getAvailability() method that subclasses can call to check a ResourceComponent's avail combine start and shutdown test methods into a single testShutdownAndStartOperations test method; add some avail assertions to start, stop, and restart test methods pass jboss.domain.bindAddress into tests as sysprop, so non-PC tests know the AS7 domain server's bind address; upgrade jackson from 1.7.4 to 1.9.5 add some param validation to constructors move Heiko's itests into the as7 plugin module alongside the new Arquillian-based itests fix some itest failures use same default config for failsafe plugin that we use for the surefire plugin remove invalid param from javadoc make startLogFileEventPollers() fail more gracefully if the "logEventSources" prop is not defined in the plugin config throw a more detailed exception if an operation is missing a required parameter more itest fixes another attempt to fix testUploadViaCreateChild1() and testUploadViaCreateChild2() set testFailureIgnore=true in failsafe plugin config add a assertAllNumericMetricsAndTraitsHaveNonNullValues() method in AbstractAgentPluginTest, and make use of it in the AS7 itests minor: misc. cleanup upgrade testng from 6.1.1 to 6.4; upgrade surefire plugin from 2.10 to 2.12 only try to delete the plugin jar if it still exists minor: javadoc fix don't try to schedule an avail check if the avail threadpool executor has been shutdown (which can happen when the PC is in the process of shutting down) split one line into two to help better debug NPE's pom.xml: move dependencies up near top of pom; remove repositories; always use antrun to download AS7 dist zipfile; configure StdoutReporter testng listener to print "running test [blah]..." messages prior to running each test method remove obsolete settings-*.xml files from the imanage era workaround for SUREFIRE-831: replace dashes in testng group names with dots (http://jira.codehaus.org/browse/SUREFIRE-831) fix URL for AS 7.x snapshot dist zipfile fix a group name containing a dash that I missed in my earlier commit fix some testng infrastructure bugs in our tests; configure my testng lifecycle reporter make sure the test-platform Resource uses a Concurrent Set for its childResources field; add a Nullable annotation to InventoryManager.call() include a newline before each message that's printed to make the messages more prominent in the test output; fix a bug where duplicate tests could be included in the list of tests contained in the suite; in the message printed by onTestStart(), include the list of groups the test belongs to by default, use 127.0.0.1 and offset ports for both the standalone and domain instances; the port offsets are configurable, but the defaults are 40000 for standalone and 50000 for domain; the IP addresses are still configurable in case one wants run the tests using alternate addresses reformat XML w/ 2-space indent; add a pom description don't wrap attribute values or text inside elements, since I don't trust Maven to trim the text downgrade surefire and failsafe plugins from 2.12 to 2.11 to avoid http://jira.codehaus.org/browse/SUREFIRE-836 fix some failing tests attempt to fix a drift itest that's failing in Jenkins prevent LazyInitException from occurring in toString() when getters are called on resourceType field add StdoutReporter testng listener fix test interdependency issues only log a "switched container" message if the container was actually switched to a new container validate that params are non-null make as5 plugin itest support in pom consistent w/ as7 plugin attempt to fix some issues in the as7 itests improve logging to help debug test failures in jenkins improve assertion failure messages to help debug test failures in jenkins bump up minimum maven version from 2.0.10 to 2.1.0 attempt to fix test failure in jenkins set project.reporting.outputEncoding=ISO-8859-1 to prevent the failsafe:verify goal from logging an annoying warning about no default encoding being set improve logging when an exception occurs while attempting to collect file system usage info remove invalid parent relativePath if as7.itest is set, always run the itests, even if skipTests or skipITs sysprop is set use static import for org.testng.Assert.* add assertions to testAutoDiscovery() that verify the 'hostname' and 'port' plugin config props got set correctly by the discovery component re-enable testReloadOperation(), since "reload" is working now 'discovery' command now discovers types in order, by plugin name then by type name, rather than in random order minor: fix some typos [BZ 807008] use server baseDir as Resource key for both standalone and host controller server Resources (https://bugzilla.redhat.com/show_bug.cgi?id=807008); extract two subclasses from BaseProcessDiscovery - StandaloneASDiscovery and HostControllerDiscovery - the former discovers standalone instances and the latter discovers host controller instances; add two new plugin config props - homeDir and configDir (the previously existing baseDir prop is now set to the baseDir, rather than the homeDir) fix invalid ordering of "Transactions Subsystem" service element (the xsd requires service elements to come after sibling server elements) while processing @RunDiscovery, if an error occurs during either server or service discovery scan, throw a RuntimeException various minor improvements to itests: extra some code to util methods in core-domain; improve assertion failure messages; add some additional debug println's deploy() now throws a RuntimeException if deployment of the plugin fails make the homeDir plugin config prop optional; add a JBossProductType enum and some provisional code for determining the product type add support for spawning AS7 instances - either standalone servers or host controllers [BZ 804705] NativeSystemInfo.getOperatingSystemName() now returns "Windows", rather than "Win32" for Windows systems, since "Win32" did not seem like an appropriate value in the case of 64-bit Windows systems (https://bugzilla.redhat.com/show_bug.cgi?id=804705) update logic for determining product type - first try to use JBOSS_HOME/bin/product.conf, and if that fails, fall back to looking for substrings in the JBOSS_HOME directory name add support for resolving jboss.*.dir sysprops that are relative paths (this completes the work on https://bugzilla.redhat.com/show_bug.cgi?id=807008); add some utility code for reading AS7 server command line options; improve code for determining log file location well-formed XML cannot have "--" within a comment turn down PC logging by default to make test output more readable add an 'rhqadmin' management user to each cloned AS7 config, so the instances can be connected to by RHQ without any improve logging improve error handling fix bug where wrong path was being used for mgmt-users.properties file tone down some INFO logging to DEBUG; remove some dead code fix a couple compile errors and a regression in the code that determines the management bind address from the command line log failures to connect to the management URL at DEBUG, rather than ERROR, level turn down logging a bit and fix an incorrect log category name bugfix: homeDir was being used in a couple places where baseDir should have been used; use the PropertiesFileUpdate utility to update the mgmt users props file; minor: add a constant for the char encoding in PropertiesFileUpdate add a productType plugin config prop; generify some of the components; add an AS7Component interface don't attempt to do any yum stuff if the internal yum server is disabled use longs, not ints, for timeout vars make sure itests run in desired order; use exec plugin, rather than arquillian plugin, in pom to start as7 standalone instance; various minor tweaks; turn down some logging to make log less cluttered when we receive 500 (Internal Server Error) responses, include the response body in the error message we log, since it often includes valuable details upgrade jboss-sasl from 1.0.0.Beta9 to 1.0.0.Final; only pass options specific to java7 or 64-bit java on as7 java command line when appropriate replace calls to Throwable.printStackTrace() with logging add support for EAP 6.0.0.ER4 include the IOE in the call to log.error() when logging 500 errors, so the stack trace will get logged; the stack trace of the IOE will help us track down which classes the requests returning errors originate from fix so rolled-back attribute gets correctly deserialized to JsonNode returned for 500 responses (this fixes a couple failing tests); further improve error reporting wait for all levels of discovery to complete (i.e. including async scans) in @AfterDiscovery method add a new GenericJBossAS7PluginTest test class containing a single test - testAllMetricsHaveNonNullValues() [BZ 809191] fix ClassCastException in JMXDiscoveryComponent.getJavaVersion() that occurred during manual add/import (https://bugzilla.redhat.com/show_bug.cgi?id=809191) make update() return a boolean that's true if an existing prop was updated or false if the prop was added, and take advantage of this boolean in the as7 plugin if the file's not newline-terminated, we should always append a newline before appending the line for a new prop (e.g. "foo = blah\n") use the correct resourcetype tree depth for AS7 discovery completion checker (5, not 4); sort names of metrics w/ null values remove class that is no longer used [BZ 809473] fix so JVM's with authentication-enabled JMX Remoting get autodiscovered as JMX Servers (https://bugzilla.redhat.com/show_bug.cgi?id=809473) dust off plugindoc and get it working again; enhance it so it publishes Confluence pages with the appropriate parent pages make toString() more succinct with output suitable for use in log messages include as4, as5, and as7 plugins in the list of plugins that are validated comment out the as4, as5, and as7 plugins until this can be reworked reformat XML w/ 2-space indent (replace all tabs w/ spaces) fix a bunch of typos add a new itest that tries to load the resource configs of all Resources that support the config facet; the test asserts that all the configs loaded without exception and are valid according to the associated configdef prevent PluginManagerBeanTest.doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled() test from failing in Jenkins by having the tests in PluginManagerBeanTest run after all other tests (implemented by setting the 'priority' attribute of the @Test class annotation on PluginManagerBeanTest to 100000) disable each of the test methods, rather than the test class, to avoid a bug in Arquillian where it throws an NPE if any tests are disabled or manually excluded via mvn command line options [BZ 808001] improve default Resource names for the two top-level server types (https://bugzilla.redhat.com/show_bug.cgi?id=808001) fix bug in ResourceGroupManagerBean.findResourceGroupComposites() that was causing an exception when the method was called when no compat groups existed in the DB improve handling of SQLExceptions to help debug why RecursiveResourceGroupTest.testImplicitGroupMembershipFromComplexGroupUpdates() is failing include more fields in toString() impl add a new test that asserts all ResourceComponents are non-bull and started; add a way to exclude certain metrics or traits from the null-value test [BZ 810342] add support for embedding a server type as a service type, e.g. now the "JMX Server" server type can be embedded as the "JBoss AS JVM" *service* type (https://bugzilla.redhat.com/show_bug.cgi?id=810342) [BZ 810342] add support for changing an existing ResourceType's category (https://bugzilla.redhat.com/show_bug.cgi?id=810342) [BZ 810342] change category of the following types from SERVER to SERVICE: turn down some noisy logging from DEBUG to TRACE minor: fix some typos [BZ 810540] clear the ResourceType cache when the user logs out (https://bugzilla.redhat.com/show_bug.cgi?id=810540) [BZ 810540] comment out clearing of ResourceType cache upon logout until it can be discussed upgrade Arquillian from 1.0.0.CR7 to 1.0.0.Final; upgrade Shrinkwrap from 1.0.0-cr-3 to 1.0.0 add support for EAP6 ER5 minor: add class-level javadoc pull all command line parsing code in discovery component classes out into utility classes; the base utility class JavaCommandLine lives in plugin-api, since it's not AS7-specific get rid of the ctors that took the command line as a single String [BZ 812400] add new startScriptEnv and startScriptArgs plugin config props to both server types to give user full control over the start script used by the Start and Restart ops; also do our best in discovery to initialize these two props; get rid of the javaHomePath plugin config prop, since startScriptEnv supersedes it (https://bugzilla.redhat.com/show_bug.cgi?id=812400) [BZ 808027] make sure the 'config', 'hostConfig', and 'domainConfig' props get initialized to the correct values for servers that specified non-default config files names using the --server-config, --host-config, or --domain-config options (https://bugzilla.redhat.com/show_bug.cgi?id=808027) replace plugin config props with null values with "", rather than "null" [BZ 812400] fix a few bugs and add support for extrapolating plugin config prop values into the start script args (https://bugzilla.redhat.com/show_bug.cgi?id=812400) [BZ 813424] when SNMP agent is configured to listen on 0.0.0.0, set snmpAgentHost plugin config prop to "127.0.0.1", rather than "0.0.0.0" (https://bugzilla.redhat.com/show_bug.cgi?id=813424) minor: remove an unused constant; add a comment use Properties.load() to load mgmt-users.properties file; if rhqadmin admin mgmt user is defined and its password is "rhqadmin" encrypted, then default the "password" conn prop to "rhqadmin" [BZ 813845] fix so name and baseName fields are set correctly on ProcessInfo objects for processes running as a different user than the RHQ Agent (https://bugzilla.redhat.com/show_bug.cgi?id=813845) [BZ 813361] change default snmp timeout from 50ms to 2000ms and make it configurable; also make the number of timeout retries configurable (https://bugzilla.redhat.com/show_bug.cgi?id=813361) [BZ 813434] use the PC avail facet timeout, rather than hard-coded value of 3s, as the timeout for HTTP ping avail checks (https://bugzilla.redhat.com/show_bug.cgi?id=813434); add lots of DEBUG logging to WWWUtils.isAvailable() to aid in debugging connection failures log a warning if we fail to set the read timeout on the URLConnection factor out the host config XML loading/parsing code into a HostConfiguration class, and remove the AbstractBaseDiscovery class which no longer serves any purpose default the config file name for AS7 standalone to standalone-full.xml, rather than standalone.xml; make the AS7 config file name configurable; add a 5s sleep after each instance is started; other minor refactoring oops, the config vars at the top of the script should be commented out add new API method - getSimpleValue(String) (should have added it a long time ago!) add new API method - getParentProcess() add new util classes for discovering server start script path, env, and args remove an unused param move all custom options to the end of the AS7-standalone jvm command line, and add the --server-config=standalone-full.xml option to the command line refactor discovery code to use the new util classes in plugin-api for initializing the start script path, env, and args plugin config props [BZ 813434] further improvements to logging and error handling (https://bugzilla.redhat.com/show_bug.cgi?id=813434) add new API method - setSimpleValue() fix several bugs in command line parsing and start script plugin config init code; enable the start/stop operation itests fix a test failure fix some itests that were failing in jenkins minor: remove some obsolete TODO's minor: improve display name of startScript prop; remove unneeded default="" attributes on start script props minor: turn down an INFO log message to DEBUG, but log at WARN if it takes unusually long hard-code a core set of generic OS-level env vars in ServerStartScriptDiscoveryUtility, which all processes will require [BZ 815889] add a HTTP response time call-time metric to the Web Runtime type; add support for detecting the AS7 log dir to RtFilter (https://bugzilla.redhat.com/show_bug.cgi?id=815889) fix a bug in JavaCommandLine.getClassOption() where a bogus warning was logged whenever the requested option was not present on the command line; fix a bug in JavaCommandLine.toString() where Array.toString() was called on several non-arrays; add tests for these changes add a bunch of env vars that were missing from the env var includes list; set cwd for start script process to JBOSS_HOME/bin, rather than JBOSS_HOME, for AS7 increase expected type hierarchy depth from 5 to 6 and add a constant for the value add support for EAP 6.0.0.ER6 [BZ 815889] add support for globally deploying the RT filter to an AS7 instance using an AS7 subsystem (https://bugzilla.redhat.com/show_bug.cgi?id=815889) [BZ 815889] fix for rtfilter subsystem (apparently implementing the config writer is not optional) (https://bugzilla.redhat.com/show_bug.cgi?id=815889) temporarily disable testAllResourceComponentsStarted test until the PC shutdown issue has been fixed fix a couple bugs, refactor a couple things, and add javadoc for a host controller started via domain.sh, the domain.sh process will be the grandparent process, not the parent process (the parent will be the AS7 process controller) - update start script discovery code to recognize this [BZ 816633] add support for specifying a start script prefix in the plugin configs for AS7 servers (https://bugzilla.redhat.com/show_bug.cgi?id=816633) fix regression where discovery was defaulting the 'startScript' plugin config prop to 'bin/standalone', rather than 'bin/standalone.sh' oops, i didn't get that last commit quite right add deprecation notes to the descriptions of the 'serverName', 'bindAddress', and 'javaHome' plugin config props, which have been superseded by the new 'startScriptArgs' and 'startScriptEnv' props; leverage the prefix parsing capability of ProcessExecutionUtility, rather than parsing it ourselves use StringBuilder, rather than StringBuffer add "@since 4.4" to the two new methods I recently added to notate that they were added in RHQ 4.4 [BZ 808231] add configurable support to the PC for waiting for background threads to terminate during shutdown (https://bugzilla.redhat.com/show_bug.cgi?id=808231); set the new 'waitForShutdownServiceTermination' PC config prop to true in the PC config used by the AS7 itests [BZ 787016] correctly discover JBoss Data Grid (JDG), correctly setting its name, description, and version, and correctly validating its product type in getAvailability() (https://bugzilla.redhat.com/show_bug.cgi?id=787016); pull the impl of getAvailability() up to BaseServerComponent default value of "waitForShutdownServiceTermination" prop to "true" in RhqAgentPluginContainerConfiguration; do not throw an IllegalArgumentException if PluginContainer.shutdownExecutorService() is called not during PC shutdown don't set "waitForShutdownServiceTermination" to "true" in arquillian.xml for AS7 itests, since that prop now defaults to true within our Arquillian framework; add a new kill() public API method to ProcessInfo and use it in the AS7 itests get AS5 itests running and passing on UNIX fix an NPE that can occur in the context of itests update root pom to use dependencyManagement for all arquillian/shrinkwrap deps by importing the arquillian-bom pom (this way we're using versions of arquillian, shrinkwrap, and shrinkwrap-resolver that are supposed to be fully compatible with each other); fix a number of issues in the AS5 itests and make some improvements; config regex jar exclusions for the PC's root plugin classloader in the config for our arquillian framework's PC (this ensures jars in the test classpath do not pollute the plugin's classloader) cosmetic cleanup remove deprecated stuff in pom to clear up mvn warnings move test plugin classes to a different package that is not below org.rhq.core.pc fix some test failures that were caused by the recent change to start configuring package exclusions/hiding for the root plugin classloader in arquillian-managed PC's add support for running itests against EAP 5.x [BZ 818643] change the category of the Profile, Host, JVM, and ServerGroup types from SERVER to SERVICE (https://bugzilla.redhat.com/show_bug.cgi?id=818643) [BZ 810342] change the category of the following ResourceTypes from SERVICE back to SERVER: add new public API method: getClassOption(CommandLineOption option, String defaultValue) change logging of a metric being added to or removed from an existing type from DEBUG to INFO [BZ 817631] remove config, hostConfig, and domainConfig plugin config props, and replace with serverConfig, hostConfig, and domainConfig traits (https://bugzilla.redhat.com/show_bug.cgi?id=817631) don't swallow stack trace of exception throw when a plugin operation fails [BZ 818919] fix regression caused by fix for https://bugzilla.redhat.com/show_bug.cgi?id=817631 (https://bugzilla.redhat.com/show_bug.cgi?id=818919) -Ddbreset now implies -Ddbsetup-do-not-check-schema=true get rid of antrun plugin 1.1 usage improve toString() impls - include metric name and make more readable when a facet method times out, include what the timeout was in the logged DEBUG message add some additional assertions that the metric datums returned by plugins have the expected name and data type use standalone-full-ha.xml, rather than standalone-full.xml, for the AS7 instance used by the itests - this will get us a larger set of discovered resource types fix insidious bug where server-name trait was missing the dataType="trait" attribute in the plugin descriptor and hence was getting defined as a numeric metric, rather than a trait; refactor so values for config file traits are retrieved via management API, rather than by parsing server command line (still plan to later add command line parsing as a fallback mechanism) improve plugin display names and descriptions in both pom and plugin descriptor remove a few obsolete things and reformat update copyright years [BZ 820445] fix so a "negative seek offset" IOException does not occur when PropertiesFileUpdate.update() is called on a non-existent file or an empty file (https://bugzilla.redhat.com/show_bug.cgi?id=820445) [BZ 819145] code in discovery that figures out System property (sysprop) values by parsing the server command line now processes -P/--properties options, in addition to -Dxxx options (https://bugzilla.redhat.com/show_bug.cgi?id=819145) minor: improve descriptions of start-script-related plugin config props [BZ 820648] code that discovers the domain controller address now handles the --master-port host controller command line option (https://bugzilla.redhat.com/show_bug.cgi?id=820648) [BZ 822736] fix so extra jars don't get included in the plugin jar's lib dir (https://bugzilla.redhat.com/show_bug.cgi?id=822736) [BZ 823026] change Product Name trait to displayType="summary" and change Server Code Name and Server Version traits to displayType="detail" (https://bugzilla.redhat.com/show_bug.cgi?id=823026) convert indents from tabs to spaces add support for running itests against EAP6 ER8 make sure the port offsets used by the itest AS7 instances are fully configurable [BZ 823558] check that server's basedir has not changed since discovery needs to be added to server components' start() method (https://bugzilla.redhat.com/show_bug.cgi?id=823558) [BZ 823558] a small fix to the original fix - getAvailability() now throws InvalidPluginConfigurationException when validation of server attributes fails (https://bugzilla.redhat.com/show_bug.cgi?id=823558) [BZ 823558] another fix to the original fix - start() now initializes this.connection before calling getAvailability() (https://bugzilla.redhat.com/show_bug.cgi?id=823558) [BZ 823558] add itests that test the server attribute validation that is now done in BaseServerComponent.start(), and make sure to null out this.lastAvail in BaseServerComponent.stop() so the attribute validation is guaranteed to happen during a component restart (https://bugzilla.redhat.com/show_bug.cgi?id=823558) [823942] Prefer resource container Resource when recursing hierarchy [BZ 824401] handle condition of a missing parent resourceContainer more gracefully in a few places, since it's normal in situations where the corresponding resource was just uninventoried - we now log a DEBUG message, rather than an ERROR message + stack trace; add a PC integration test that verifies Resource uninventory works (https://bugzilla.redhat.com/show_bug.cgi?id=824401) fix some test failures [BZ 813066] expose new 'multicastAddress' trait on Standalone Server and Managed Server Resources that are running in HA/cluster mode (https://bugzilla.redhat.com/show_bug.cgi?id=813066) [BZ 813066] exclude the 'multicastAddress' trait from the null-metric-values test for Managed Servers, since a null value is expected when the managed servers are not in HA mode (https://bugzilla.redhat.com/show_bug.cgi?id=813066) [BZ 820570] fix a bug in the original fix, which caused an "IllegalArgumentException: URI is not absolute" error when trying to parse a -P option value that was a relative path (https://bugzilla.redhat.com/show_bug.cgi?id=820570) add support for running AS7 itests against EAP 6.0 CR1 [BZ 827447] prevent subject session timeouts from occurring during registration of agent plugins with tons of types (e.g. the as7 plugin) (https://bugzilla.redhat.com/show_bug.cgi?id=827447) Jan Martiska (1): changed maven profiles for integration tests Jan Martiška (1): Add a profile for integration testing Jay Shaughnessy (401): [BZ 695889 - Search Bar Saved Search issues] [BZ 733144 - links to non-default subtabs don't work] [BZ 734034 - Saved search name should be removed from search bar after user deletes it] [BZ 734092 - 'Discovery Queue' portlet refresh is not working on dashboard] [BZ 34054 - Throws 'Globally uncaught exception' while adding 'Platform Utilization' on dashboard] [BZ 733613 - Add button got disabled, if user cancel the drift creation] [BZ 734879 - Drift display issue ... Change Sets-->Context Menu--->Details] Some initial domain/entity for drift configuration mode (planned changes support) Planned Drift Support - DriftConfigurationDefinition work Change instances of History.newItem to be CoreGUI.goToView to ensure Update Mongo plugin with drift handling mode support (still has TODOs) comment out some debug messaging that leaked into a previous commit. Add DriftHandlingMode filtering to DriftCriteria in order to filter out To ensure we don't accidentally cancel our drift detection job due Expand the drift configuration nodes by default, so you can see the Add Drift Handling column to the drift configuration list view. Fix the drift config list view column sort options Protect drift detector from nonexistent base directories and throw a [BZ 736050 - Domain jar being packaged in rhq.ear lib directory] fix the element name to match our convention. dbupgrade addition for drift config's drift handling mode support Reflect in the GUI when a changeset contains planned changes. It is Som boilerplate for group level drift tab [BZ 736685 - cannot uninventory resource that has condition log not associated with an alert] merge two antrun plugin sections into one with two executions Change rhq_drift_config.mode column to rhq_drift_config.drift_handling_mode Fix issue setting default value for enumerated value property in Convert drift I18N properties to use updated terminology. Additionally, made Add a drift profile that basically builds the agent, coregui and drift More terminology changes, this time the canned dift config def. First pass at Drift Carousel view, this is a work in progress! Fix a variety of merge issues. Hopefully got them all. Make sure our renamed resource field does not get wiped when sent to the Add null protection for fileUtil.useForwardSlash() Normalize drift file entries to use forward slash for safer comparison Protect certain tests from the fact that windows flavors don't support A second wave of refactor updates moving code from "drift config" to Fix filtering issues in drift carousel Drift Carousel Work Drift carousel tweaks Drift GUI Work Drift GUI work, some cleanup Remove the Drift snapshots subtab and the supporting tree display code. Remove unused imports and fix some formatting Add Eclipse dependencies for building REST interface Complete merge work for building snapshots given the new initial Drift Snapshot work: make sure to fetch drifts in order to calculate snapshot. Trivial - Fix several "@{link" instances to correctly be "{@link". Added a utility to get filename from a path string. And then realized Protect Table against possible NPE in rare circumstances. Add new "Pinned?" column to Drift Def List View. This indicates pinning and Rework snapshot view to correctly get the directory-specific stuff. This Fix issue with getCurrentSnapshot impl Fix some broken tests. Make sure drift def names are trimmed, both for correctness and to solve Drift work Split admin templates view into three parts, one for each kind of template: merge in changes from e96159b835e481fb6059c3dd22882beeb363c084 and Drift: Fix table column name using oracle reserved word. Drift Admin Template Work - *not yet ready for use* Fix issue in sequence name in the upgrade and the entity. More incremental work on the Drift template add wizard Finish adding support for drift definition descriptions. One more thing to support drift definition descriptions Started Pin to Template Work (in progress) Fill out the Pin Template Wizard Drift pin to template wizard wired to call SLSB. Ensure getSnapshot returns a DriftSnapshot object. It was incorrectly When pinning a template ensure the potential templates have the correct BZ 734592 - Make sure when computing the tree the first time (and thus computing the name of the AG), the parent is fetched to determine the correct name for the AG. Add support to wizard framework for skipping steps if the step returns a make the drift pin template wizard more robust, allowing the ability Update eclipse .classpath with new twitter4j version fix error in twitter4j pom, it was missing a groupId element value drift, fix a few seeming build issues and remove a few warnings Beef up the drift pin to template wizard with more help and better titles. trivia - remove some unused code / warnings Dial down this new logging from ERROR to DEBUG since it seems on windows Drift templates view work I18N fix. Hopefully this does not adversely affect other eclipse users. Get rid of Fix array index issue when there are no macthing existing templates. Add support for display of pinned snapshot for a template. - Working version of SnapshotView for pinned template [Bug 714277 - Consider redesigning Administration-->Templates UI] trivial - add license header Add findDriftDefinitionCompositesByCriteria in order to fetch a more Change the carousel start filter from a text box to a spinner so it can Comment out the Drift History subtab to simplify the drift - Enhance the titles on the snapshot view to give better context PageControl - Add ability to remove an OrderingField. With this the - Use new DriftDefinitionComposite fetch to display information about Drift - Move some local slsb methods to the remote Drift fix for accidentally reassigning a drift's changeset id in Fix snapshot directory view, removing bad assumption about what will Drift Defs View, make sure ATTR_ENTITY is properly set for use by Drift, fix diffs involving new and removed files. Drift - Make JPADrift.changeSet not null. This field should never be Add optional fetch for DriftDefinitionTemplate.resourceType Coregui: Add the ability for the ResourceType cache to provide non-cached Fix subtle caching issues suffered by the drift template wizards because Coregui: add ability to get the current viewpath index. Without this [BZ 749432 - Drift detail view navigation issues] A post 4.2 TODO for Table Log failures to reschedule EJB timers. If they don't get rescheduled bad Change DriftSnapshotView to inline drift details via another level of Fix issue in handling of non-cached metadata types in type repo. Also, Rework drift metadata update for changes to plugin defined drift templates. Update plugins supporting drift to use better template names remove webservices stuff from eclipse libs, I don't think we need it for We've already upped the pom versions in every place that the release builds Remove the ":" character from the plugin defined drift template names as eclipse: add new itests module's src into project source [751091 - Resource tree fails to render for non inventory manager] [745236 - JON3 BETA2 ...WARN messages after clean install, drift related] [BZ 738369 - a user with "Manage Drift" permissions of "Read" (implied) cannot view Drift] [Bug 734592 - in summary header for autogroups, Name, Description, and Recursive fields are editable and for some autogroups, the Name field contains the string "null (...)] take webservices out of the eclipse libraries so it gets ignored. Change some stuff around so that only the Inventory Report resource list Remove the Drift tab from compatible group views (for the valid types). Normalize BaseDir and Filter paths to use forward slashing. This gives Work related to bug 753000 Initial work for db upgrade issues [Bug 751778] Fix to QUERY_RESOURCE_VERSION_AND_DRIFT_IN_COMPLIANCE to ensure we more work for [bug 753000 - Error on the initial snapshot when creating a drift profile on Windows] make in Compliance column wider so column header isn't clipped. [bug 669521-getting agent clients is now too restrictive] Related to Bug 669521 [bug 750917 - Can't update a drift template] Related to bug 753000, prevent paths and filter patterns that will db-upgrade changes [Bug 754382 - Login after session timeout does not (re)display the portlets on summary tab] - make sure to protect against null *and* empty path or pattern fields Fix oracle syntax for sequence renaming in drift upgrade. Remove superfluous not null assignment in spec version 115. Oracle Create new Drift Compliance Report Integrated new drift pinned icons into code. [Bug 755712 - Drift carousel view previous button generates exception] [Bug 753659 - Exception thrown when clicking Back to List after pinning snapshot to template] Add new required method to mongo drift server impl [Bug 756171 - The UI does not have a way to see the template from which a drift definition is derived] [Bug 754197 - When agent runs on loopback address, the advisory text is incorrect. Administration > High Availability does not exist] Convert back to unix line terminators [Bug 757201 - NPE in Server with drift report processing] Make forEachFile() more efficient. [Bug 758261 - A bad drift definition can prevent agent startup] Fix issue in AS-4 plugin such that for embedded WAR resources the Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin Revert "Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin" Revert "Add drift templates to EAR/WAR/Embedded War types for AS-4 plugin" Revert "Fix issue in AS-4 plugin such that for embedded WAR resources the" [Bug 758565 - Add drift templates to JBAS WAR/EAR resources] [Bug 758724 - Transaction timing can prevent drift file content from being persisted] Fix dep group for javassist Fix some minor issues in the server itests. [Bug 759167 - Client side exception generated when viewing empty compatible group] [Bug 759485 - Error viewing live data in the resource metric graph portlet] [Bug 760105 - Drift: Unchecking the 'File Changed' option in 'Category' drop-down in the carousel view displays Globally uncaught exception] [Bug 760289 - Excessive file scanning in drift detection when using includes filters] [Bug 760145 - Drift snapshot displays wrong directory name on windows] [Bug 760209 - Drift Carousel not filtering the drift entries] [Bug 753866 - DB Upgrade needs more work for existing drift records] Change the getSequenceValue() method for postgres db type so that it [Bug 753866 - DB Upgrade needs more work for existing drift records] Add 2.117 to remove an obsolete drift table that may exist after upgrades. [Bug 755673 - Adding new drift: includes/excludes - Path property required?] [Bug 765592 - drift diff is different depending on order in which files are selected] [Bug 755580 - Unable to add 2nd file-system drift] Just some cleanup Ensure we have both the timestamp and the filesize before we skip using Make sure the drift def id is also in the copy so it can be applied to [Bug 756100 - RFE: use timestamp and file size during drift detection scans] - Add some unit tests ensuring timestamp info is updated appropriately. [Bug 756100 - RFE: use timestamp and file size during drift detection scans] Supporting check-in for [Bug 768031 - Pin template failure on upgraded dbs] [Bug 768031 - Pin template failure on upgraded dbs] Merge branch 'jsanda/drift' Fix compilation isue after merge. [Bug 535538 - (RHQ-2222) Installer: db "Test Connection" button clears password field] add jboss-sasl jar (as-7 plugin dep) to eclipse build path [Bug 751778 - Upgrade from rhq4.1.0 to rhq4.2.0 fails with error : relation "rhq_drift_def_template" does not exist] trivial, fix reference link in comments Fix Calculate AutoBaselines Admin option (although it should be used with [Bug 771201 - EPP 5.2 discovery fails with java.lang.StringIndexOutOfBoundsException] [Bug 703562 - Tomcat plugin missing support for JNDI configured Datasources] Fix an NPE issue generated for unavailable TC webapp resources. Also, [Bug 772742 - DB upgrade gives "All Resources Role" an unintended permission] [Bug 772771 - Agent not syncing updated plugin config at startup] [Bug 773435 - Enabled event sources cause initial resource component start to time out] [Bug 773031 - Component start() called more than once without an intervening stop()] [Bug 535725 - (RHQ-2391) Logfile parser ignores lines where severity is not surrounded by spaces] Add <soyc> element to help optimize gwt compiles. By default don't optimize. update Eclipse .classpath with gwt/smartgw upgrades [Bug 773662 - Unable to view resource or group metric schedules] Change deprecated ListGrid.getSelection() to ListGrid.getSelectedRecords() trivial - clean up a bunch of unused/unnecessary variable compiler warnings trivial - clean up a bunch of unused imports Fix deprecations after gwt/smartgwt upgrade trivial, add default serialVersionUID to Serializable class Fix clipped title for category in group list views. This icon field [Bug 758503 - Various AS-5 plugin types have unset read-only plugin config props] [Bug 758503 - Various AS-5 plugin types have unset read-only plugin config props] [Bug 769719 - resource key not HTML-escaped in search results and resource detail] [Bug 756184 - RFE: Drift UI needs better Template-Definition handling] It seems we didn't really understand how testng was executing tests Re-enable and update this test class. Seems to work now. More work to prevent server jar tests from stepping on each other, or Put back the test group dependency which, I think, effectively disables Try upping testng version from 6.1.1 to 6.3.1. This used to cause back to testng 6.1.1, still issues with upgrading... Add JDK tools.jar dep for the build Avail Work In Progress... [Bug 785022 - Server upgrade fails if db-uprade.xml task is unable to created index when index already exists] [Bug 785773 - CLI exporter variable not respecting settings] - Make PingRequest pass agent name as opposed to agent id, which we don't have Drop AGENT_MAX_QUIET_TIME_ALLOWED config setting from 15 to 5 minutes in Backfilling working for graceful or sudden agent shutdown. Now platform Stop sending avail reports for just the platform resource. In other [Bug 785773 - CLI exporter variable not respecting settings] Add Availability Duration Alerting [Bug 789039 - unwanted jars being pulled into rhq ear lib directory] Removing unused named query. [Bug 789039 - unwanted jars being pulled into rhq ear lib directory] Merge branch 'master' into jshaughn/avail I18N additions for new avail and avail duration alerting When performing an avail scan propagate a non-UP parent avail to the [Bug 789454 - Drift detection fails for whole directory if special-file is present] Part 1 of Prioritized Avail Checking [Bug 789454 - Drift detection fails for whole directory if special-file is present] [Bug 789454 - Drift detection fails for whole directory if special-file is present] [Bug 789454 - Drift detection fails for whole directory if special-file is present] Part 2 of Prioritized Avail Checking The avail metric needed to be more fleshed out. nullable fields Add ability for plugin code to request that the PC perform a call Merge branch 'master' into jshaughn/avail Work the new DISABLED and UNKNOWN avail types into the code Fix syntax issue. Merge branch 'master' into jshaughn/avail Up schema version after merge. Revert changes to getAvailability(). Plugins should not (and will be Fix some issues in the PC resource upgrade testing Update to protect against changing selections and against refresh issues Finish initial support for user Disable/Enable of resources Fix Suspect Job unit test to properly use ping times as opposed to Fix unit tests to run properly on windows. Unit tests failed on windows. This seems to be a real problem Fix unit tests given that: Fix issues in Availability and AvailabilityPoint handing and Update tests to also pass on Windows I18N fix Update tests to handle some avail changes and also add new avail Fix some new avail formatting for pretty print Fix db-upgrade format Update test to make sure our new built-in 'Availability Type' metric Ensure the new 'Availability Type' metric is created for both new types Add new avail (disabled,unknown) badged category icons for resources. Fix some unit tests to expect the built-in _AvaiabilityType_ metric. Add null checks on several finally close() methods Merge branch 'master' into jshaughn/avail Fix unit tests to expect built-in AvailabilityType metric def. add liquibase dep Fix compile issues in experimental oracle plugin test code. Fix compile problem in experimental snmptrapd plugin test code. Add test code for snmptrapd plugin to eclipse source Fix a bug for alerting against new resources, that do not yet have Add tests for Avail Change and Avail Duration conditions. To support Add unit tests for rhq.availability metric creation and plugin override. Make rhq.availability metric creation and override more robust. Apply calls to requestAvailabilityCheck() in plugins with lifecycle more eclipse classpath fixes Protect against yet-to-be-upgraded types Add disabled and unknown color handling for availability in timeline There was a problem with backfilling. Disabled resources should Related to Bug 800580 [Bug 800580 - 4.3 db upgrade failing if existing db does not have RHQ_DRIFT_TEMPLATE_MAP table] Fix test issues due to the introduction of a built-in Availability Fix bug in pretty printing avail duration conditions. Also Fix bugs in deleteForest, which was not always chopping down all of the Update test resource cleanup to handle new requirement of removing Fix bug in resource type removal, it was not always removing existing trivial - update test classes to use new helper method when cleaning up Merge branch 'master' into jshaughn/avail [Bug 800580 - 4.3 db upgrade failing if existing db does not have RHQ_DRIFT_TEMPLATE_MAP table] Handle the new semantics for DatabaseType.checkTableExists(). - Fix dbsetup issue to set max quiet time to 5 minutes Set the default avail check interval for Services to 10 minutes (from 5). Replaced dev logging and stats with a more formal ScanHistory feature Fix an issue with the scan history and also provide a new convenience For now, stop trying to delete plugin jar on windows, it's locked. Dial down console logging to INFO, there is too much DEBUG to handle. For now, up logging of the Scan results to INFO. - Work around some arquillian framework issues Added a 3rd test and enhanced scrubbing to reset avail check return vals. Add RHQ 4.2 and 4.3 upgrade unit tests, remove JON 2.3.0, which is Remove 2.3.1 from upgrade unit testing as well, it's not relevant and Add a constructor for testing Add 3 more tests Remove test constructor from AvailabilityExecutor, I didn't like it. Just Killing arquillian-integration branch in anticipation of master merge, Merge branch 'master' into jshaughn/avail Merge branch 'master' into jshaughn/avail Merge branch 'master' into jshaughn/avail Fix name of new Availability metric definition constant. Fix test given change to service avail collection interval. Now uses Fix test from new test class to deal with new built in Availability metric. Merge branch 'master' into jshaughn/avail [Bug 802769 - Clicking on Servers in inventory view returns list of Platforms] [Bug 802504 - Cannot view directory entries in drift snapshot view] [Bug 803516 - unable to re-import resources] [Bug 803841 - Example of drift remediation via bundle deployment] Fix tests that started failing with the fix for 803516. The bug [Bug 800410 - NumberFormatException in Dashboard] Fix more tests that started failing with the fix for 803516. The bug Fix still more tests that started failing with the fix for 803516. The bug Perhaps this is the end of the test fixes... [Bug 804115 - blank initial unknown avail data in the gui] [Bug 804115 - blank initial unknown avail data in the gui] [Bug 804115 - blank initial unknown avail data in the gui] Fix issue in InventorySummary global portlet, remove avail metric from Fix avail duration alert condition format [Bug 800413 - Inventory summary portlet: vertical alignment issues] [Bug 786416 - Map configuration properties not shown in correct order] Add some more comments for some Hibernate annotation use. No functional [Bug 786416 - Map configuration properties not shown in correct order] Property map properties are no longer returned sorted by This code was dependent on PropertDefinitionMap ordering that was [Bug 786416 - Map configuration properties not shown in correct order] When presenting a PropertyMapListGridRecord in the ConfigurationEditor [Bug 806009 - Trait history could not be displayed] Make Montoring->Tables the default subtab, graphs is too slow. - Change the Default dash masup portlet to show RHQ homepage as opposed to [Bug 805210 - Group view errors] Add some more protection against a null AvailabilityType getting included [Bug 802780 - Configuration editor in server plugin details is not stretching vertically] [Bug 807671 - Count of number of children and descendants in compatible group list view goes wrong if a member resource is disabled] [Bug 807660 - Duration field accepts hyphen (-) character] [Bug 807803 - Big avail icon on resource detail view doesn't get updated after stop, only tree is updated.] [Bug 807629 - Enable/Disable options are available for Platforms] Related to Bug 786889 which deals with invalid (low) schedule intervals Heiko pointed out a code snippet that still had an availType of Address some test failures related to 807671 fix. ResourceCriteria - add filterParentResourceCategory Add new "Servers - Top Level Imports" as Inventory option. Don't swallow exceptions that abort the transaction. The test class has to prepare the scheduler because tests involve Another test class that needed the scheduler but didn't know it. [Bug 786889 - Agent plug-in container should log warnings and disable metric collection for metrics with invalid collection intervals] Move a private util method I had in ResourceContainer to ThrowableUtil [Bug 811287 - RFE (availability): Allow component code to disable or enable resource] [Bug 809617 - Configuration editor issues with set/unset, drop down lists, and map of simples] trivial, add core utils to coregui profile [Bug 805210 - Group: Operations portlet fails to load data if Oracle [Bug 772223 - JAVA_OPTS and EAP server command line arguments] [Bug 813917 - High CPU utilization after enabling certain Metric Collection Templates for Tomcat WARs] [Bug 813917 - High CPU utilization after enabling certain Metric Collection Templates for Tomcat WARs] Fix merge issues due to cherry pick of [Bug 81391] Some refactoring to share code between AS5 and AS7, and potentially Add some debug logging and enhance toString() AS5 start script work Improve start script discovery on Windows by better parsing away Update ArgsPropertySimpleWrapper to have a getValue that allows [Bug 772223 - [as5 plugin] JAVA_OPTS and EAP server command line arguments] Changes to get itest working on win - Add synchronized block to getAvailabilitySchedule to make its side-effect Improve description for startScriptArgs property. Use File.separatorChar instead of File.pathSeparatorChar. trivial - remove some dev logging - Remove JAVA_OPTS from AS5 and AS7 startScriptEnv discovery as it will [Bug 816680 - Child availability still up with down parent after shutdown operation on AS5] Add a test to cover a recent regression case that was not [Bug 772223 - [as5 plugin] JAVA_OPTS and EAP server command line arguments] Some tweaks to get the AS7 itests running on Windows. Remove some quoting in the args for the itest. It was not parsing well Fixing typo and removing a missed occurrence of quoting Don't use old version for shrinkwrap dep [772223] tweak description for legacy bindAddress prop indicating its Fix a bunch of eclipse .classpath entries for arquillian and shrinkwrap Add some missing src modules to eclipse .classpath (there are more but Add missing interface method given updated shrinkwrap version Use our own I18N for Table loading and Table empty. This ensures we [Bug 817604 - Trying to delete a Dynagroup Definition gives db constraint errors] [Bug 820709 - [plugin-container] with two or more AS7 host controllers in inventory, a full discovery scan takes an unacceptably long time] [772223] related work [772223] related work [Bug 817185 - Child compatible group name displayed as ... in navigation tree after a group member's name is changed] [Bug 818761 - "Unable to re-install or upgrade server on same host and port due to 404 /coregui/ not found"] [Bug 820700 - if one or more of the Resources in an avail report is no longer inventoried, then the avail manager EJB throws a hibernate ConstraintViolationException, and the entire avail report fails to be persisted] [820700] Add a negative test to justify cherry-picking the fix for this bug. [823942] Prefer resource container Resource when recursing hierarchy [823942] Update test code related to fixes for this issue. [Bug 824778 - Schedules cannot be deleted] [Bug 826503 - Log in screen available but user is not able to log in for several minutes after installation] [Bug 829433 - When MeasurementCollectorRunner logs metric collections is falling behind it should include metric details] [831237 - modules/core/domain/src/main/resources/META-INF/persistence.xml missing version attribute] [Bug 830325 - [Downloads view] links in Connectors and CLI Alert Scripts sections are centered, rather than left-aligned] [827647 Relative path for Drift Detections Definition Include/Excludes Path does not handle relative path alias or trailing file separator correctly] [827647 Relative path for Drift Detections Definition Include/Excludes Path does not handle relative path alias or trailing file separator correctly] [732571 - Admin Test page operation Snapshot Measurement Tables (snapshotMeasurementTables)fails against Oracle] [Bug 835113 - EJB2 MDBs are DOWN in JON UI] [831254 - resource tree's right-mouse context menu item "Import" is empty] John Mazzitelli (249): create/delete child history has its own inventory filter - will add more timeline markers for inventory shortly add inventory data to timeline (when resource was discovered and when it was inventoried) add drift to timeline clean up some of the timeline we have create-child and delete-child icons - use those rather than re-use the inventory icons start of drift alerting support. Merge commit 'origin/master' into drift-alert Merge commit 'origin/master' into drift-alert set the data directory so we don't get changesets directory outside of the target/ dir have eclipse use skipTests when doing full builds after we persist a drift change set, hand off the summary data to the alert condition cache manager to check to see if drift alerts need to be fired Merge commit 'origin/master' into drift Merge commit 'origin/master' into drift [BZ 735230] initial attempt at alerting on drift for certain drift configs and certain pathnames of files [BZ 735230] provide better messages in ui Merge commit 'origin/master' into drift fix the error log to include the stack. add debug message so we know we got the message this gets JMS messages to flow in our test embedded container test log4j.xml hides the TIMER SERVICE IS NOT INSTALLED warning - we know embedded EJB3 container doesn't support timers this completes the integration of JMS into the server/jar test embedded container. start alert unit tests. this commit causes one test failure. need to fix 736685 create the server entity with a custom name so it doesn't clash with a possibly already existing default one make test better add test that shows bug BZ-736685 refactor to make some of the helper methods more generic [BZ 735262] to support range alert definitions, we now have a "RANGE" conditional. Merge commit 'origin/master' into drift BZ 737565 - do not allow user to pick multiple conditions using the same metric if using ALL conjunction upgrade ems version in eclipse classpath fix version in pom remove the Refresh button since there is nothing to refresh (the table is always fully populated) make sure we show the proper values in the alert conditions, formatted based on their units. trivial - clean up imports, add TODO to mark a possible duplicate class [BZ 698600] fix UI so users can enter units and see units in alert condition UI [BZ 698600] do some null checks, because i am paranoid don't show the refresh button in the alert details view - they don't do anything and when you click it, they get disabled and never enabled again. make the test group names unique from other tests so we can tell what tests created what groups don't throw exception if a bad jobID is given, just log a message. this also fixes an error in our unit tests that couldn't clean up rename AlertManagerBeanTest to DeleteAlertsTest - it is still disabled, some other test isn't cleaning up properly and causing bad data to be sitting in the DB that this test fails on [BZ 738614] fix condition pretty printing - this is for email alert messages and other notifications add configurability to the logging of the hibernate detach utility. with this checkin, the following happens: make sure we re-enable the table buttons this method still needs to do something - it has to set the label of the title bar, even if it shouldn't set the window title. putting some of this back. [BZ 741691] make sure the plugin XML descriptor accepts all units that the code can support Merge commit 'origin/master' [BZ 681708] allow upload of bundle distro files as byte array to support CLI. note this requires the file to be loaded in memory which can cause OOM in either the server OR the CLI. framework to get large groups. extend LargeGroupTestBase to access API to create and destroy large groups fix the names given to the entities trivial change to test warning message Merge commit 'origin/master' [BZ 737196] refactor the code that checks to see if there is an INPROGRESS plugin config update trivial - no code changes, just correcting format fix test utils - create resources as committed and spit out some more messages so we know the test is doing something [BZ 737196] use JPQL to get the explicit member size, rather than using .size() to make things a bit faster [BZ 737196] fix the queries for getting both resource and plugin config updates by adding ORDER BY clause do unauthz testing for large group plugin config access NPE checks [BZ 736802] test large group resource config updates fix eclipse classpath [BZ 743742] first attempt at getting group members properties editor to work. looks good from the test page's group config editors. the stack trace in message details is sanitized but this makes sure the indentation is preserved add new scenario to perftest plugin to test all types of configuration properties [BZ 743742] the new group member values editor remove the {0} placeholder, we don't use that anymore for this message [BZ 743423] canceling group membership dialog now ensures the footer buttons are re-enabled. trivial fixes to javadoc [BZ 683543] new confirmation messages warning user when disabling/deleting plugins code no longer passes {0} to the message - we took out the link there is no plugin config for the filetemplate server plugin [BZ 747626] [BZ 747611] do not bomb out the entire master server plugin container if a single plugin fails to load. capture the error and report it, but keep going and allow other plugins to start when possible. add javadoc to explain the version format [BZ 748024] fix plugin upload - the file name needs to be passed to the servlet [BZ 748511] check for null [BZ 749824] fix login logo so it isn't clipped. we now have two logo files - one 40px high and the other 28px high (40 for login screen, 28 for top menu bar) [BZ 749560] make it clear that "deleting" bundle entities only removes them from the DB, the remote content is not purged. [BZ 745456] catch exceptions in the EventJSON jsp pages so we don't blow up the Timeline component [BZ 748474] add a fixed criteria and blank out the search bar. users find this more intuitive. [BZ 741331] turn off all plugin metrics by default, up all default collection intervals [BZ 741331] just some very limited number of metrics to be enabled out of box - mainly in platform plugin [BZ 741331] no metrics on by default in hardware plugin [BZ 750224] NPE check [BZ 741331] change default intervals [BZ 751128] missing calltime alert stats. also adds "total cache element count" as well. [BZ 741331] go through plugins and switch some services' metrics away from being "summary" to detail (this is the displayType attribute) [BZ 751177] make sure the buttons in the footer are re-enabled. [BZ 751231] delay the initial collection to avoid missing it the first time through [BZ 751424] make sure to re-enable footer buttons [BZ 747925] revert the changes that BZ 741331 made to the JMX plugin rhq-plugin.xml that materially affects the metadata. [BZ 753959] do not add dup menu items [BZ 753947] fix the selector so there isn't abnormal whitespace. Reduce the warning message so it is on a single line and add a yellow warning icon to bring the message to the attention of the user [BZ 753585] fix group metric and ops portlets for auto-group/cluster provide a eclipse tool to easily build GWT for dual FF/IE8 support [BZ 754556] strip paths from uploaded file names [BZ 755564] null check to avoid NPE. summary must be non-null as per data model [BZ 756205] installer should go to /coregui explicitly add bindings test module to eclipse classpath [BZ 756086] allow CLI to support printing of arrays (primitive and object). This only supports single-dimension arrays but none of our APIs return multi-dim arrays AFAIK [BZ 759173] rename package name so we don't have the same package in different signed jars Utility that examines jar files and/or directories and will print out [BZ 752550] remove old downloaded bundle files to help clean out the tmp directory [BZ 755019] sort the deployment audit trail [BZ 755019] sort the deployment table make sure we can support schema versions that we put inbetween existing versions. [BZ 767263] don't assume there is always a template baseDir might be null, so don't assume it isn't eclipse tool to build for both FF and chrome [BZ 766574] fix NPE if there is no availability yet [BZ 766574] for some reason, the remote interface was removed from the discovery SLSB. put it back. [BZ 759640] this also appears related to BZ 765670 - have the installer ping the startup servlet to know if the server is fully installed and ready [BZ 759481] fix the NPE that occurred when quick clicking between the template screens fix the log message - we want to see the resource Ids so we need to convert the array to a string fix the user prefs test page so the buttons are re-enabled after clicking them [BZ 771984] is appears that trying to concurrently update a subject's user preferences fails when one of the updates involves inserting a new property. The problem appears from the GWT client, so at the GWT servlet layer, we will now ensure that no two GWT requests can concurrently update a subject. [BZ 773090] fix the attachment form item so it doesn't cause the info to go off the screen [BZ 672947] add favorite groups portlet [BZ 692948] config comparator GWT view now compares list-o-maps and maps [BZ 772318] the agent registration process was lax and allowed somethings that it shouldn't have. This closes the known holes and adds unit tests to check that all known use-cases are handled properly. [BZ 772318] forgot to test the most obvious and most common scenario - re-starting the agent. My original fix broke that. This fixes it back again and adds a unit test for it. [BZ 782612][BZ 772318] the agent registration now requires a token. null tokens are rejected unless its a new agent. [BZ 784006] rename agent option to --fullcleanconfig and change the error you get so the user knows the command line argument to pass to set the token. [BZ 784124] fix the issue where, on initial deployment of a bundle, we didn't clean out any files that happen to be in the deployment dir. [BZ 784124] forgot to fix this test [BZ 785270] add 4 new unit tests to make sure we handle the case when a new file was added but is not part of any bundle deployment (either in the original or new deployment) [BZ 785268] fix the case where you do a clean deploy but a file was edited (where the file content didn't change from bundle v1 to bundle v2) [BZ 703557] eclipse has to be told where tools.jar is in order to build the jmx plugin [BZ 768706] add some more code to make sure we do proper error correction/checking [BZ 773031] enhance test to check and make sure the state is set properly [BZ 768706] add some more code to make sure we do proper error correction/checking [BZ 773031] enhance test to check and make sure the state is set properly we are now at GWT 2.4 - change the DOCTYPE in the .gwt.xml to reflect the new DTD [BZ 752215] according to some resources on the 'net, they say this locale.useragent=Y config property should turn on different languages if the browser supposed the languages. I can't get FF or Chrome to work with this, but I'm checking it in because from all I read, this "should" work. there may be something else we have to do to enable this now that we are on GWT 2.4, we can add strict compile checking - which will fail the build when problems occur during compilation (before, it would just warn you but continue) [BZ 784656] fix platform util portlet [BZ 790322] pass in tags as @@ replacement tokens for ant recipes to use [BZ 790322] pass in tags as @@ replacement tokens for ant recipes to use [BZ 747925] add a test to see that plugin extensions work on initial deployment. this just shows things working when you initially register the plugins (no bugs here, this all works) [BZ 747925] get the test to register an updated parent plugin v2 and refactor the tests to make it easier to work with. [BZ 747925] this unit test is now set up to fail for all different parts of the metadata that should have been upgraded in the child type but wasn't. [BZ 616395] the original fix for this BZ was to change the value in Merge remote-tracking branch 'origin/master' into bug/747925 Merge remote-tracking branch 'origin/master' into bug/747925 remove erroneous import remove erroneous import [BZ 747925] change plugin metadata manager to return map of extension plugins (with tests) and have plugin manager use that information to update those extended plugin types. preliminary unit testing seems to show this works. Merge remote-tracking branch 'origin/master' into bug/747925 [BZ 747925] add more tests Merge remote-tracking branch 'origin/master' into bug/747925 [BZ 747925] the plugin manager bean was using its own internal metadata manager Merge remote-tracking branch 'origin/master' into bug/747925 Merge remote-tracking branch 'origin/master' into bug/747925 [BZ 747925] hot deploying a new plugin wasn't working because the metadata manager wasn't looking at the new descriptor, it was reusing the old descriptor. this hopefully fixes the problem. [BZ 747925] add a debug log message so we know when the re-registration happens Merge remote-tracking branch 'origin/master' into bug/747925 [BZ 790152] remove e.printStackTrace - log it instead Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq [BZ 747925] add more tests that simulate what the server does when it scans/registers plugins. this uses the actual scanner and deployer classes that the server does Merge remote-tracking branch 'origin/master' into bug/747925 fix the maven test code in server/jar pom.xml so we don't run tests more than once when using -Dtest= Merge remote-tracking branch 'origin/master' into bug/747925 oracle plugin has test classes - put in eclipse classpath rename the auto-generated availability metric to Availability [BZ 747925] there is only one test in this class, don't override beforeMethod, just get the SLSB managers in the test method itself [BZ 747925] make sure you can embed types mulitple times in the same plugin descriptor. this is also testing BZ 789420 [BZ 747925][BZ 789420] this test fails due to the fact that we have child services until the embedded type. need to fix this [BZ 747925][BZ 789420] comment out some metadata to make sure the test passes - if you uncomment this metadata before fixing 789420, this test will fail Merge remote-tracking branch 'origin/master' into bug/747925 Merge remote-tracking branch 'origin/master' into bug/747925 Merge remote-tracking branch 'origin/master' into bug/747925 [BZ 747925] now that we fixed the metadata update stuff, we are putting the jmx plugin's descriptor metadata back the way we want. organize the .classpath entries - put the source modules up top. the start of being able to test some of the new availabilty changes. this is just the framework - it commits 28 resources in inventory that we can then use to test avail [BZ 801167] make the database plugin more robust. make name/description optional. add log messages. I don't think we need to explicitly give the classes in the test initial testing of avail reporting test what happens when a parent goes down Merge remote-tracking branch 'origin/master' into bug/747925 Merge remote-tracking branch 'origin/master' into bug/747925 get the skeleton plugin to build with the new 4.3 artifacts - this way, someone can build this independently and not have to build the entire rhq source Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Merge remote-tracking branch 'origin/master' into bug/747925 Merge remote-tracking branch 'origin/master' into bug/747925 [BZ 802537] make sure we clean up (and backup) any files that are in the way in subdirectories during an initial deployment with manageRootDir=false [BZ 804131] fix the mis-alignment of the links add more test modules to eclipse classpath - organize them all in the same place in the file test the avail summary composite object. fix mtbf calc and the others to take into account disabled/unknown avails things use longs now, not dates it seems the as7 plugin test module was removed, take it out of eclipse more tests for the avail summary stuff finish up testing the new avail summary pojo add availability summary information to the new monitoring>availability gwt page 1. when refreshing the table, refresh the summary area also be consistent with the rest of the tooltips on this page - don't end with punctuation [BZ 806281] align-right the values and i18n the units abbreviations fix the default case - use the toString by default just to try to get something rather than a ? [BZ 804139] fix bundle file download issue fix the agent log messages [BZ 801432] but make sure we keep the same collection that we already have, even if the children is supposed to be empty [BZ 801432][BZ 807465] this is just test code to see if we can catch the concurrent mod exception. we must remove this code before release put bz# in warning message [BZ 806281] put space between value and unit [BZ 759615] refactor the domain jar's org.rhq.core.server package name to org.rhq.core.domain.server [BZ 759615] put our dynamic class definition in a separate package to avoid conflict with signed packages [BZ 759615] remove the last duplicate package across multiple jars put the test methods in another, unique, group - trying to get testng to work the way we want [BZ 804117] change warn message to info [BZ 802550] make the time to scan for children configurable [BZ 797325] oracle logging should be enabled for the rhq_alert_notification table [BZ 810302] add new rhq.agent.test-failover-list-at-startup configuration preference. provide eclipse tool to clean coregui [BZ 615978][BZ 806214] add unit test to new html-escaping feature of StreamUtils, fix bug in the return count value of the copy method [BZ 812000] mention the sysprop to use to reset the agent token [BZ 536205] allow custom values for enumerated properties [BZ 795531] support the use case when Tomcat connector uses a shared executor for its threadpool [BZ 795531] auto-discover the shared executor name so the user doesn't have to set it manually [BZ 803473] explicitly set width so the icon properly shows [BZ 812823] fix the links so they are left aligned properly [BZ 802528] create custom filter that takes into account the id may be a string (which is the partial group name to search on) [BZ 646631] when updating ear content in farm deployments, make sure they go into the farm/ directory, not deploy/ directory [BZ 813967] one-off hardcoding to fix a version problem we introduced in JON 3.0.1. [BZ 813967] change the version we hackily convert - since all our future versions will be of the form JON###GA (without dots), let's convert the one version we messed up with dots into a version without dots. [BZ 813967] opps... the new version strings won't have the got before the GA in the JON string portion. make the test mimic this. [BZ 797325][BZ 814839] revert the LOGGING enablement on the alert table fix schema - had to move it back one [BZ 814839] all oracle tables should use LOGGING except for those where we use +APPEND hint [BZ 815956] fix the event icon hover string be able to have eclipse easily build gwt client for FF, Chrome and IE8 [BZ 815341] get unknown count from group queries [BZ 815341] unit tests for unknown counts in group queries [BZ 815341] clear the entity manager in our tests [BZ 801432][BZ 807465] log stack if the child set is of an unexpected type [BZ 812331] mkdir returns false if the directory already exists - we need to first see if the dir exists and only if not do we see if we can create it [BZ 812331] not a fix for this issue - but it adds information to the inventory prompt command output to see what drift definitions the agent knows about. can help debug information about what the agent knows wrt drift intervals and the like [BZ 810302] turn off failover list testing by default [BZ 790224] avoid inserting data that is too large for the bundle dest table [BZ 818094] add a blank.gif explicitly for the standard skin to fix a SmartGWT 3.0 bug. Once we upgrade to a new SmartGWT, we should revert this commit (basically delete this .gif and its containing directories). [BZ 822861] older tomcat versions (like Tomcat 5) do not even have this executorName MBean attribute, make sure we account for this. [BZ 820629] upgrade xercesImpl due to CVE-2009-2625 [BZ 823860] get the installer startup props links to work. Get them to not require the prefix "-" so we can have JON be able to use these without requiring JON docs to have "-" in the URL. [BZ 820716] fix search bar group availability query [BZ 820716] unit tests to test the search bar queries when using the availability keyword [BZ 825318] fix a problem with conflicts during the cherry pick [BZ 828905] fix the version ordering column when deleting a bundle version [BZ 818751] don't use the live config if it was empty - we need to get the default template [BZ 828843] fix bundle deploy wizard's configuration editor initialization so required properties that didn't exist in the live deployment config are set to their default values [BZ 819897] filter out all non-committed resources from some group queries [BZ 819897] fix the left-hand tree on the group page - don't show non-committed resources [BZ 820981][BZ 819897] fix some group queries that did not properly filter non-committed resources opps.. fix test method name [BZ 820981][BZ 819897] fix unit tests that now must ensure they put new resources in the committed inventory state John Sanda (392): Check to see if a schedule has been removed before sending change set to server Updating clean up code in DriftManager to not delete files until streams are closed [BZ 732078] Adding support for detecting "viewable" files Enable drift configurations by default Package sample/demo scripts with CLI [BZ 734194] Check that content is loaded in db on drift details view fixing test failures [BZ 734842] Adding more detailed logging around drift detection [BZ 734814] Adding docs [BZ 734881] Need to check for empty content because oracle blobs don't handle it Fixing syntax error Override default tmp directory used during gwt compilation Update the resource container when a drift config is deleted Adding support for syncing drift configs when agent starts with --cleanconfig Detect deleted drift configs during inventory sync Fix test failure No need to reschedule drift configs that have not changed Add change set version to headers in change set report Removing commented out, obsolete code fixing test failure Adding more detailed logging Do not purge change set directories for configs that have not been deleted Adding more logging around drift detection and inventory sync Filter queue by resource id when checking for deleted configs Refactoring drift config sync code out of InventoryManager adding javadocs Update test/example to write and read file using GridFS Initial commit for FileDAO and FileDAO test Have the agent track and store the change set version number Updating test to set change set version from headers Merge branch 'mongodb-drift' Set the change set version from the headers Updating MongoDB drift plugin to store file contents. Adding more drift criteria query support Adding more drift criteria query support First pass at using $slice operator to fetch drift entries by id Adding error handling logic on the agent during drift detection Server now sends acknowledgement to agent when change set content is persisted Scan for change set content at start up that needs to be resent to server Resend change set content during inventory sync [BZ 727959] Check to make sure files are readable during drift detection First, (very) rough cut of support for pinned snapshots Merge branch 'master' into pinned-snapshot more merge clean up Merge branch 'master' into mongodb-drift Adding support for fetching drift entries by id using the $slice operator Adding more filterin support for drift criteria queries Adding initial suport for filtering on change set and entry fiels in drift criteria queries Adding better support for filtering change set entries in memory Adding support for filtering on creation time and path for drift criteria queries Merge branch 'master' into pinned-snapshot Adding a new change set header, "repeated" Refactoring file permission logic into a help method Updating logic for drift detection with a pinned snapshot Updating inventory sync logic to handle pinned snapshots Updating drift def comparator and tests to handle new pinned snapshot fields Merge branch 'master' into pinned-snapshot Removing repeat change set header as it is not needed updating dbupgrade with new columns for rhq_drift_config table fixing dbupgrade error Initial commit for DriftDefinitionTemplate Updating usage of ResourceType.driftDefinitionTemplates Updating dbupgrade with rhq_drift_def_template table Adding assocation between DriftDefinition and DriftDefinitionTemplate Refactoring the template <---> definition association fixing dbupgrade script with template id column in drift_config table Iniital commit for DriftSet entity Adding rhq_drift_set to dbupgrade script adding some docs Updating javadocs and adding logic for accessing drifts of the initial change set Removing pinned version from drift definition data model Updating logic JPADriftServerBean to use JPADriftSet for initial change set Updating logic for querying change sets. Adding javadocs Refactoring snapshot generation logic in DriftManagerBean Merge branch 'master' into feature/drift Initial commit for DriftDefinitionTemplate Updating usage of ResourceType.driftDefinitionTemplates Updating dbupgrade with rhq_drift_def_template table Adding assocation between DriftDefinition and DriftDefinitionTemplate Refactoring the template <---> definition association fixing dbupgrade script with template id column in drift_config table Iniital commit for DriftSet entity Adding rhq_drift_set to dbupgrade script adding some docs Updating javadocs and adding logic for accessing drifts of the initial change set Removing pinned version from drift definition data model Updating logic JPADriftServerBean to use JPADriftSet for initial change set Updating logic for querying change sets. Adding javadocs Refactoring snapshot generation logic in DriftManagerBean Removing createSnapshot method. fixing test failure and dbupgrade script typos fixing another dbupgrade error Stubbing out test code temporarily fixing test failure fixing more dbupgrade errors First pass at SLSB code creating a drift template Merge branch 'master' into feature/drift Attemmpting to fix test failure Adding description field to DriftDefinition Debugging jenkins test failure Attempting to fix test failure that may be due to a surefire bug fixing oracle dbupgrade error First pass at SLSB code creating a drift template fixing oracle dbupgrade error Hopefully resolving weird test failure Refactoring drift db set up/tear down code into common base class Merge branch 'master' into feature/drift Add temlateDefinition property to DriftDefinitionTemplate Updating drift meta data parser to use new templateDefinition property fixing tests Initial commit for DriftDefinitionTemplateCriteria Fixing drift template criteria filters Adding some test and preliminary code for updating templates Set directory property of Drift entity so that we have better test coverage Adding server side logic for pinning snapshots re-enabling test send request to agent to pin snapshot in DriftManagerBean.pinSnapshot [BZ 738346] handle non-existent base directory during drift detection fixing tests that broke as a result of db table name change fixing logic for persisting pinned snapshot fixing failing test trying to get drift server tests passing on hudson Attempting to clean up, simplify tests Initial server support for pinning a drift template fixing mistake from merge conflict more post-merge clean up drift handling mode flag was wrong on the change for the pinned template Updating and adding tests in JPADriftServerBean Adding initial impl of JPADriftServerBean.copyChangeSet Changing signature of createTemplate so that it returns the template Call EntityManager.persist to get id for template returned from createTemplate Removing redundant call to EntityManager.persist Copy the pinned snapshot when definition is created from pinned template Addding support for generating snapshot for definition created from pinned template Adding support for generating snapshot that is not tied to a defnintion fixing logic for generating snapshot when creating drift definition Only look at directory specs when generating list of templates for wizard Pass the right template to the server when pinning a snapshot Initial support for propagating changes to defs when pinning a template Adding attached flag to drift definition Set the template reference of definitions when pinning a template Do not modify detached definitions when pinning a template Fixing bug in resource-level pinning first pass at template deletion Adding inital support for updating templates Do not allow template name to be changed Adding support for updating template fields that can be modidied. Propagate template updates to attached definitions Adding test to verify that template updates are not propagated to detached definitions Fixing bug where I was passing an attached entity to the agent fixing another detached/persist exception Handle detached definitions when deleting a template [BZ 749415] Control drift def fields that are rendered and editable fixing/updating tests [BZ 749415] check the right entity context to determine which drift config def to use Temporarily disabling drift tests due to test dependency issue fixing failing tests [BZ 749415] Making the pinned field editable Initial commit for integration-tests module Renaming module integration-tests to itests removing unnecessary dependencies no longer need to exclude drift tests in server/jar upping module version fixing compilation errors that resulted from itests refactoring fixing mbean interface name that was causing test failures [BZ 749899] Adding support for deleting drift templates [BZ 750895] Update the attached field when the definitions configuration is updated [BZ 750886] drift detection needs to handle resource going back into compliance [BZ 738404] Disable 'Detect Now' button for disabled definitons Do not enlist the SLSB call in the same txn context as the MDB [BZ 7517474] Initial support for tracking compliance [BZ 7517474] Adding compliance field to drift definitions view [BZ 7517474] Incorporate missing base directory into compliance [BZ 7517474] Updating compliance status when a definition is unpinned [BZ 751914] Show compliance at the resource type level [BZ 751914] Adding compliance column to resource list table Make sure streams are closed [BZ 753000] Normalize on using forward slashes in path names [BZ 749419] Do not allow pinned definition to be re-pinned [BZ 749419] We still want to allow pinning a snapshot to a template make sure file streams get closed [BZ 753827] Do not allow templates to be created with duplicate names Make DriftTemplateManager available to server-side scripts [BZ 753827] Fixing regression for pinning snapshot to existing template Adding method to retrieve drift content as byte array Fixing issue with duplicate snapshot getting reported Handle agent being down when pinning snapshot to definition [BZ 756100] Use file timestamp and size during drift detection [BZ 757758] Adding logic to filter out binary content [BZ 757758] make property name/values consistent with other server properties [BZ 755073] Do not display the view link for binary files [BZ 757958] updating script to work with current APIs Adding itests module to build [BZ 761320] Only update the detection schedule if drift detection runs Merge branch 'master' into jsanda/drift [BZ 760263] Adding check to avoid generating empty content zip file [BZ 767328] Make sure that each drift def is loaded into the persistence context Add dependency needed as a result of REST integration into server/jar [BZ 767205] Only read snapshot file once when looking for content to send to server DBInstallationTest needs to use its own dedicated database A CLI script for generating random files [BZ 768099] Add validation checks when creating a drift definition Commenting out tests that I added for BZ 768099 Adding/updating javadocs [BZ 694221] Initial upgrade of GWT and SmartGWT [BZ 771417] Refactor logic for enabling/disabling form fields [BZ 771406] Fixing issue with table headers not rendering We want to get the table contents but not recreate it [BZ 772259] Do not reset the pane property when a tab is being hidden updating javadocs [BZ 772749] Adding null check for when there are no repos [BZ 772681] Avoid ClassCastException Merge branch 'master' into feature/gwt-upgrade [BZ 742698] Send user to history page for operation scheduled immediately [BZ 788638] Do not cache ManagedComponent objects to avoid high memory usage. [BZ 788638] Remove extra calls to getManagedComponent [BZ 788638] Make service availability refresh interval configurable Send agent change set ack Adding initial support for change set criteria queries. Adding support for more DriftChangeSetCriteria filters Adding support for querying on the Drift.directory property Rounding out support for DriftChangeSetCriteria queries Refactoring findDriftsByCriteria to use ChangeSetDAO [BZ 788638] Removing extra call to fetch managed object Merge branch 'bug/788638' Adding support for retrieving drift file content The end version for DriftChangeSetCriteria should be inclusive. [BZ 783492] Avoid possible NPE Merge branch 'master' into feature/gwt-upgrade [BZ 787239] Retrieve attribute as a long instead of as an object Adding support for deleting change sets Adding initial impl for MongoDBDriftServer.persistChangeSet [BZ 720812] Don't show the no data msg until we've fetched data from server Fixing a couple bugs involving file hashes Adding initial impl for copyChangeSet [BZ 790467] Updating EC2 wrapper script [BZ 790467] Updating EC2 wrapper script Merge branch 'feature/gwt-upgrade' Renaming script to be consistent with naming conventions [BZ 742698] Adjust view path when operation is scheduled from context menu [BZ 742698] Adjust view path when operation is scheduled from context menu Initial commit for MongoDBDriftServerTest Adding verification logic for calls to agent Refactoring tests to pull common test code into base test class [BZ 772259] Use the destroyPanes property to save content panes [BZ 772259] Use the destroyPanes property to save content panes [BZ 781602] Adding logic to keep order of tabs consistent [BZ 796315] Adjust layout so search bar appears above list grid Updating GWT/SmartGWT versions in smartgwt archetype Adding some more verification logic Adding more tests for persisting a change set [BZ 749801] Add a dummy value to allow user to undo selections [BZ 751752] Do not allow grouping by edit column Fixing test to look for correct file name Adding test to verify file content is persisted in the db Initial commit for Mapper and MapperTest Refactoring MongoDBDriftServer to use new Mapper class [BZ 755703] Updating MeasurementManager to get live per minute metrics [BZ 755703] Removing superflous class MeasurementDataRequest Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Adding tests for MongoDBDriftServer.persistChangeSet Adding tests for change set and drift criteria queries [BZ 800026] Adding logic so that order of sub tabs remains consistent [BZ 800453] Initial commit for ReportTable Adding support for change set start/end version filters in drift criteria queries Adding support for filtering by change set version with drift criteria queries Merge branch 'master' into jsanda/drift-mongodb Bumping up project version to 4.4.0-SNAPSHOT Adding method to purge orphaned drift file content Exposing purgeOrphanedContent as plugin operation that can be invoked from UI. [BZ 800453] Adding export action to report tables [BZ 802504] Fixing vertical sizing in nested directory view [BZ 682255] Add titleCanvas back to title section in Table base class Updating gwt-maven-plugin version Reverting to default buildOutputDirectory for smartgwt-war-archetype [BZ 800453] Initial commit for CriteriaQuery and CriteriaQueryExecutor Merge branch 'master' into feature/export-reports Add missing import Initial integration of CriteriaQuery into REST reports [BZ 800453] Initial implementation of inventory summary CSV report [BZ 802544] Fixing problem with null links Adding drift-mongodb server plugin back to build Merge branch 'master' into feature/export-reports Use the caller from the principal from the web tier instead of overlord [BZ 802544] Adding initial support for details with inventory summary [BZ 802544] Breaking out inventory report into its own separate EJB class Use default write concern of SAFE so that exceptions are raised on writes Adding some source level docs [BZ 802544] Do not invalidate user session too soon [BZ 802544] Initial commit for drift compliance csv report [BZ 802544] Refactoring drift compliance report to make details query more efficient [BZ 802544] Initial commit for PlatformUtilizationLocal [BZ 802544] Big refactoring of PlatformSummaryPortlet [BZ 802544] Fetch data from PlatformUtilizationManagerBean [BZ 802544] Fix decimal, percentage formatting [BZ 802544] Adding support for filtering on resource type id [BZ 802544] First (very rough) cut at wiring up UI to download report [BZ 802544] Eliminate duplicate code for setting up export table action [BZ 802544] Refactor PlatformSummaryPortlet to extend Table [BZ 802544] Initial attempt at adding checkbox column to inventory summary report [BZ 802544] First cut at streaming xml for inventory summary report [BZ 802544] Fixing couple errors with recent operations report [BZ 802544] Re-enable table actions after the export action is closed. [BZ 802544] Fixing another instance of passing wrong value to Enum.valueOf [BZ 802544] Fixing issue where title bar was displaying twice [BZ 802544] Updating export window to include report format in URL Merge branch 'master' into feature/export-reports Merge branch 'master' into jsanda/drift-mongodb Disable plugin by default upon discover and disable tests by default [BZ 802544] Adding back checkbox column that was lost in merge conflict [BZ 802544] Adding some initial some for building report query string [BZ 802544] Adding support to pass resource type ids to export window [BZ 802544] display the id in the version column to match the UI [BZ 802544] Adding null check to avoid NPE [BZ 802544] Updating query to exclude drift from initial change sets [BZ 802544] Avoid lazy init exceptions [BZ 802544] Parse ancestry field so we display same value as UI [BZ 802544] First cut at implementing the alert condition text field [BZ 802544] fixing import errors from merge conflict [BZ 802544] Set the condition text for when there are multiple conditions [BZ 802544] Adding support for converting measurement values for display [BZ 802544] Fixing query params to match enum values [BZ 802544] Adding initial support for selecting/deselecting all details [BZ 802544] Pass the exportAll flag to the export window [BZ 802544] Adding details url column in config history report [BZ 802544] Adding details url column in more reports [BZ 802544]] Don't pass empty string for query params [BZ 802544] Generate status column for recent alerts report [BZ 802544] Adding export details column to drift compliance report [BZ 802544] Refactorig inventory summary and drift compliance reports code [BZ 802544] more refactoring of inventory summary and drift compliance reports Fixing missing title bars Merge branch 'master' into feature/export-reports [BZ 800453] Adding string util methods for converting query params [BZ 800453] Refactoring logic for including details [BZ 800453] fixing error from previous merge conflict [BZ 800453] Fixing bug where map of install counts was not using unique keys [BZ 800453] convert suspect metrics report to streaming response [BZ 800453] removing some code that was for testing only [BZ 800453] Refactoring logic to toggle state for export checkboxes [BZ 800453] fixing couple issues with handling of resource type id param [BZ 800453] Fix date range logic for when start and end date are the same [BZ 800453] Fixing date range filtering for recent alerts [BZ 800453] Fixing date formatting so that we are only filtering on days Merge branch 'feature/export-reports' Adding dependency to fix test failures [BZ 800453] Add null check for when drift def name query param not specified [BZ 800453] Generate a url for the parent column [BZ 800453] Initial commit for CsvWriter [BZ 800453] Do not convert null date filters [BZ 800453] Migrating more report handlers over to CsvReader [BZ 800453] converting a couple more report handler over to CsvReader [BZ 800453] converting platform utilization report handler to use CsvWriter [BZ 800453] Converting inventory summary handler over to CsvReader [BZ 800453] Refactoring so DriftComplianceHandler can use CsvWriter [BZ 800453] Fixing typo in default param value [BZ 800453] Latest round of master/detail changes [BZ 800453] Removing id column and adding details url column [BZ 812902] log exception to server log [BZ 812925] Do not include DELETED resources in tree sent to agent [BZ 790467] Applying patch [BZ 800453] Moving report REST end points to coregui [BZ 800453] Fixing base url for report exports [BZ 800453] Adding HttpServletRequest parameter that is now required [BZ 800453] Making date filter names in UI match query param names [BZ 800453] Matching up query param names [BZ 800453] Adding loging [BZ 800453] Adding more logging [BZ 800453] Adding debug logging and removing unused params [BZ 805987] Collect actual free and actual used platform memory metrics [BZ 805987] Get rid of warnning from plugin descriptor parser [BZ 805987] removing debug code that was inadvertedly included in previous commit Make running the animal sniffer plugin configurable fixing typo from previous commit undoing change to enable animal sniffer plugin by default Changing group id of rtfilter dependency updating path to rtfilter artifact with new group id fixing typo from previous commit adding support for russian translations removing unnecessary plugin dependency to work around maven 3 compatibility updating versions strings [BZ 822713] Adding support for disabling tags in the UI Adding version string for CR1 build [BZ 802796] providing more info about the deployment timeout [BZ 824129] Do not treat quotes as ordinary characters [BZ 824129,829309] Fix quote parsing [BZ 822299] Display better error message and no exception when agent is unreachable [BZ 822299] changing servialVersionUID to be consistent [BZ 831603] Do not allow plugin defined templates to be deleted bumping up version for JON 3.1.1 builds Larry O'Leary (3): Bug 736792 - CLI retrieveBackingContent gives a file not found exception on the agent [Bug 769470] TomcatWarDiscoveryComponent excludes valid WAR deployments due to eager host name regular expression Bug 615978 - Create bundle using 'Recipe' > 'Click to Upload A Recipe File' fails Failure is due to recipe file upload being echoed back to the client in the servlet response as HTML but not being HTML escaped. The result being that tags/elements in the recipe would become mangled when the client attempted to render it into the recipe text area. This fix will first escape the uploaded contents for use in HTML before sending it back to the client in the servlet response. It also explicitly sets the content type to text/html as per the GWT FormPanel requirements. Lukas Krejci (141): Merge branch 'master' into code-smell Merge branch 'master' into code-smell BZ 707669 - The bundled native augeas libraries have been bumped to version 0.9.0. BZ 707669 - Forgot to check in the plugin-container pom that actually fetches the augeas-native as its dependency. BZ 737996 - Working around the property names inconsistency in the clustered web app contexts. Added support for using the import configuration specified in the export Some amendments to the perftest-support database state export algorithms: BZ-735810 - make sure to reload the system config cache after its update. BZ 740582 - generate correct group URLs in the JSF-based metric graphs page in various contexts. BZ 743632, BZ 634648 Generics cleanup and formatting BZ 743379 - Make sure to initialize the script engine with as much bindings Added support for calling overloaded methods using the global indirection BZ 711502 - make sure the availability collectors are initialized before any resource component is started. BZ 728292 - Restore the behaviour from RHQ3 where we showed just an info BZ 745488 - make sure the JSP and JSF resource name disambiguation components generate links to GWT GUI. BZ 730335 - The system properties are now actually enumerated so that no other property names are possible. The values are validated at 2 places. Fix the config-sync tests. some more hardening of system settings validation. fixing the server/jar unit tests to account for the fact that the system manager now depends on there being drift server plugin service installed and running to be able to determine the installed drift plugins. Renaming SystemProperty to SystemSetting. Fixing the messed up merge of SystemProperty -> SystemSetting renaming. BZ 747709 - Making the user editor show itself for non-admin users. SystemManagerRemote.getSystemConfiguration() now returns data in the same Adding support for mocking the drift server service to the PluginContainerTest. Making the LdapGroupManagerBeanTest pass... DataPurgeJobTest now passes Formatting BZ 687992 - A final touch on making the apache config file parsing BZ 717787 - Making sure augeas is only ever used if the apache resource BZ 697585 - A better warning message if an absolute path of httpd BZ 698474 - Work around the limitations in PIQL so that we don't try to [BZ 749126] - Loosening validation requirements on import. [BZ 751765] Use the correct classloader for obtaining the bundled lens files [BZ 751246] - Sample scripts for deploying apps to JBAS. [BZ 753225] - removing the unused "directive index" property from [BZ 751246] - do NOT include implicit resources in the list of resource [BZ 688800] - More robust detection of EWS tomcat installation dirs. [BZ 754968] - making quoted arguments work with CLI on *nix. [BZ 690957] - EWS Tomcat is identical to "normal" tomcat when installed through RPM (at least wrt system services installed) [BZ 755653] - Make sure role membership is not updated through [BZ 751248] - Make the sample CLI alert scripts downloadable from the server's /download/cli-alert-scripts location and from the Downloads section of the GUI. [BZ 760148] - Use the unprivileged method introduced by the commit Use a custom java permission and an EJB interceptor to disallow server-side CLI scripts from accessing the EJBs directly. be paranoid even in the comments ;) moving the EJB access permission and the interceptor back to the server Making SessionManager behave the same as EJBs wrt the AccessEjbPermission. Adding EjbAccessTest to make sure the CLI scripts can access the business Revamped the script security to apply the checks at the JNDI lookup level Merge branch 'master' into lkrejci/dissalow-alert-scripts-from-accessing-local-slsbs Merge branch 'master' into lkrejci/dissalow-alert-scripts-from-accessing-local-slsbs Jnp port is now detected from system properties rather than hardcoded. Adding integration tests for the ability of serverside scripts to access remote JNDI servers (unlike the JNDI directory of the RHQ server itself). updating the javadocs to correctly explain the purpose of the URLPreferringContext Merge branch 'lkrejci/dissalow-alert-scripts-from-accessing-local-slsbs' Adding support for Ldap, Dir, Event and EventDir contexts in addition to [BZ 746113] - increasing the maximum wait time for the tomcat start/stop Fixing the application of various decorators to JNDI contexts to support reverting the secured JNDI access... This functionality is still failing Make sure the decorated contexts behave the same as the originals. Moving the JNDI access tests from rhq-server-client-api to Adding some logging to AccessCheckingInitialContextFactoryBuilder. Explicitly list the container-lib in the list of submodules of making sure that the tests that try to exit the jvm won't make the test Making the script security work with Java 6u27 and up. Increasing the log level back to WARN now that the tests are working again. Putting back the original version of secured JNDI access so that the latest Merge branch 'lkrejci/dissalow-alert-scripts-from-accessing-local-slsbs' Adding missing module references to the integration tests profile. Fixing the JNDI integration test's pom. Use the secured script engine in the JNDI integration tests. Added some clarification to the javadocs of InitializableView to lower [BZ 767170] - The permissions are already known, don't try to fetch them Updating the installer test to: [BZ 786106] Wrap calls to obtain managers in privileged blocks so that 3rd Make sure to set the correct context classloader when running inside [BZ 786194] - Make sure to set the correct context classloader when [BZ 773661] - Invalid plugin configuration errors are now reported also [BZ 773661] - Reporting invalid plugin configuration if the resource starts [BZ 773661] - The security exception is thrown directly if the principal is update the JNDI access tests to not use the "context" variable which seems [BZ 773661] - Invalid plugin configuration errors are now reported also [BZ 773661] - Reporting invalid plugin configuration if the resource starts [BZ 773661] - The security exception is thrown directly if the principal is update the JNDI access tests to not use the "context" variable which seems [BZ 790859] - Do not expect standard input when the CLI runs in non-interactive mode. [BZ 794511] - make sure to use the correct path separator in boot log path. [BZ 794511] - make sure to use the correct path separator in boot log path. [BZ 794489] - make sure to use the parent resource context when creating [BZ 794489] - Minimize the number of executed discoveries by sharing [BZ 794489] - make sure to use the parent resource context when creating [BZ 794489] - Minimize the number of executed discoveries by sharing [BZ 794489] - Fixing the unit tests to work with the changed signature of [BZ 786795] - rewritten the ScriptAssert class to not depend on TestNG (and [BZ 796405] - Catching any throwable while running a CLI script alert RHQ's embedded PluginContainer is now accessible as an Arquillian container. - make it possible to have multiple PC instances (with some restrictions Make the hardcoded test platform type declare the classloader type SHARED. - restructure the code to have an API, SPI and impl. This way it makes Added the ability to obtain a set of discovered resource containers for remove unnecessary service definition Merge branch 'feature/arquillian-integration' typo @BeforeDiscovery can now be targetted to only certain test methods. Changes to @RunDiscovery handling: [BZ 802437] Adding another lifecycle stage to the RHQ arquillian tests making it don't try to process @RunDiscovery if the annotation is not there... make sure @BeforeDiscovery and @AfterDiscovery are only called on test Actually switch to the correct plugin container before the test and Making the enablement of native system info in per-container configs [BZ 797252] - Add animal-sniffer plugin to the build to ensure the Java 6 Reverting the previous commit. BZ 797252 needs more work. [BZ 797252] - Add animal-sniffer plugin to the build to ensure the Java 6 Including the container-lib in the build by default. It is needed by server [BZ 794489] - Fixed the corner case of incorrectly reported processinfo [BZ 639398] - Adding an "Open Files" metric to the "Operating System" [BZ 786416 - Map configuration properties not shown in correct order] Trivial - formatting the Apache plugin source code. It was a beeping mess. [BZ 804303] - Instead of saving the whole set of preferences when changing [BZ 804303] - Make sure to hang on to the changed config that we need to [BZ 804164] - improve docs in "fix-bundle-deployment.js" sample script. [BZ 810204] - Make sure an invalid destination regex in calltime condition include the error message when reporting failure to load an element into [BZ 796636] - Infrastructure needed for password obfuscation [BZ 796636] - Adding support for obfuscating the passwords in the content [BZ 796636] - Adding an upgrade task to obfuscate all the password Merge commit '8ba02a773dd281cb2b9d8b6c7092c5bc1641244d' [BZ 796636] - fix the unit tests and make sure to obfuscate the passwords [BZ 816593][BZ 816587] - Deployments now correctly advertise their content [BZ 801638] - adding a sample CLI script that can make an AS7 standalone [BZ 818206] - make sure to use generic number type to prevent different [BZ 801638] - fixing a couple of small bugs in the clustering script + [BZ 818433] - Another batch of fixes for the obfuscation upgrade task to be [BZ 818870] - Defensive null check when determining the content location of [BZ 801638] - updating the plugin name to 'JBossAS7'. [BZ 822880] - Make sure to NOT discard any pending DB changes before [BZ 822905] - modified the unit tests for checking that the resource upgrade Revert "[BZ 822905] - modified the unit tests for checking that the resource upgrade" [BZ 822905] - modified the unit tests for checking that the resource upgrade [BZ 822905] - Make sure to always disable the resource upgrade after it [BZ 801638] - Modified the as7 cluster script to use the live configs of Mattias Nilsson Grip (1): BZ 803625 honor base dir and additional command line args that are passed to start the server. Mike Thompson (133): BZ691505 Changing units of measure using minutes instead of millis for recalculation interval of DynaGroup. [BZ734197]-Improvement: Dynagroup creation should provide better error msg for duplicate name. [BZ734197]-Improvement: Dynagroup creation should provide better error msg for duplicate name. Delete logging. [BZ734162] Improvement: (UXD) Non-editable checkbox in Roles is confusing. [BZ734162] Improvement: (UXD) Non-editable checkbox in Roles is confusing. Added non-enabled checkbox for when read-only checkbox is checked. Kind of a third state - checked, not checked and checked read-only(disabled check). [BZ734047 - Incorrect dashboard name on immediate deletion] - For some timing reason, new dashboard tabs were not showing the proper name on the confirmation message when the tab is closed (delete). [BZ786184 Remove gwt-log logging mechanism and replace with standard GWT logging] Using Log adapter to make GWT logging look like gwt-log [BZ787248 - Add IE9 user agent support for GWT] [BZ787248 - Add IE9 user agent support for GWT] Make IE9 default to IE8 rendering for compatibility with SmartGWT. Merge branch 'BZ773083' into feature/gwt-upgrade [BZ678638 - Cannot tab through elements on "Create New Role" page] Added predictable tabbing on the create roles page. [BZ755646 - GUI flags blank/empty values as invalid for Resource description and location and for group description ] Allow for empty location and description. [BZ773083 - Globally uncaught exception "JavaScriptException:(TypeError): this.getField(_3) is null" on Dashboards view immediately after logging in] This error has changed since the smartgwt 3.0 upgrade and now it is an intermittent error that fails because the width is returning null because the widget has been destroyed. According to the javadocs the width is default to null and the layout manager determines the width so change Canvas.getWidth() to Canvas.getDefaultWidth() will provide the proper value when automatically resized by a layout manager. [BZ752215 - at runtime, automatically detect what GWT locale to use as the default, based on the user's browser preferences] Fixed the runtime detection of browser by explicitly declaring the order of priority of locale resolution. The user agent method was getting lost in the priority. The query param method has the highest resolution (for overriding in testing etc.) followed by user agent for automatic locale detection. [BZ790621 - Remove IE6 Support from GWT ] Merge branch 'gwt-logging' into feature/gwt-upgrade Trivial. Added myself to developer roster in pom.xml [BZ752215 - at runtime, automatically detect what GWT locale to use as the default, based on the user's browser preferences]. Add IE Fixes this time. Trivial remove duplicate servlet mapping from web.xml Merge branch 'gwtAutoLocale' Trivial remove duplicate servlet mapping from web.xml [BZ790621 IE6 Removal] Removal last residuals of IE6 BrowserUtil ie6 browserHack Merge branch 'BZ682255' [BZ691544 - Entering very large numbers in Dynagroups Recalculate Interval field causes stack trace] Forgot to comment out foreign resource bundle keys for translation. Merge branch 'BZ691544' BZ795833 SearchBar Broken after gwt upgrade] Enabled enter key and fixed mangling of critera in web mode. Removed SearchGUI second entry point from CoreGUI.gwt.xml Merge branch 'BZ758893-2' Removal of Servlet Path entries from CoreGUI.gwt.xml -- no longer neccessary in *.gwt.xml only needed in web.xml Merge branch 'BZ758893-2' [BZ 758893] group Inventory>Members subtab: user should not be able to update the membership of a dynamic group / dynagroup and also for autogroups Merge branch 'bZ758893-3' [BZ 682255] Inconsistent titlebars. Provide consistent top level headers. [BZ 682255] Inconsistent titlebars. Add IconEnum for typesafe icons. Merge branch 'inventoryTab' Bugfix for previous commit: 413c72e Merge branch 'inventoryTabViewNameConsolidation' [BZ 682255] Inconsistent titlebars. [BZ 682255] Inconsistent titlebars. Use 24x24 size icons for titles. [BZ 682255] Inconsistent titlebars. Added Inventory tab common titlebars. Added Group and admin section. UXD Change To Move Inventory Groups Ordering. [BZ 682255] Inconsistent titlebars. Administration topology and Configuration sections. [BZ 801910] Enable Obfusicated (OBF) GWT output for reduced application size. Remove unused gwt dependencies from coregui pom.xml. UXD: Add new Icons for top level tab titles. UXD: Add new last icon for reports top level tab. Csv Export start CSV export. Jax-RS stubs. CSV export register jax-rs resources (jndi for SLSB). CSV export refactor for REST reports. CSV export Suspect Metrics first pass. More Iterations on csv exports. Csv export: refactor. Bean jndi registration. Addition of new reports. Csv export: refactor. Add more reports. Csv export: Fix Dates. Migrate reports from Response based model to Streaming. Csv export: Make configuration history and Alerts follow Streaming REST model instead of Response model. [BZ 800453] Export Csv Reports. Added Recent Operations report. [BZ 800453] Export Csv Reports. Apply appropriate naming conventions. [BZ 800453] Export Csv Reports. Add Recent Drift csv report. [BZ 800453] Export Csv Reports. Add Recent Drift csv report. [BZ 800453] Export Csv Reports. Add More columns to Suspect Metrics report. [BZ 800453] Export Csv Reports. Add setPaging method to BaseCriteria and change Criteria to BaseCriteria in query templates: CriteriaQuery and CriteriaQueryExecutor. DriftCriteria then needed to implement setPaging() in GenericDriftCriteria and GenericDriftChangeSetCriteria. [BZ 800453] Export Csv Reports. Add Recent Drift Handler. [BZ 800453] Export Csv Reports. Add Recent Drift Report. Minor corrections to other reports. [BZ 800453] Export Csv Reports. Added First Draft ExportModalWindow. [BZ 800453] Export Csv Reports. ExportModalWindow hookup to UI, restful reports. [BZ 800453] Export Csv Reports. Recent Operations: operation name column fix. [BZ 800453] Export Csv Reports. Add Detail and Date range to export Dialog. Changed InventorySummary report to use detail flag. [BZ 800453] Export Csv Reports. Use static factory initializers to call Reports. [BZ 800453] Export Csv Reports. Check the filters and pass filtered request to RESTful urls. [BZ 800453] Export Csv Reports. ReportUrlBuilder for typesafe urls - concept. [BZ 800453] Export Csv Reports. Add Cancel Button, adjust spacing in ExportModalWindow. [BZ 800453] Export Csv Reports. Visually clean up the ExportDialogWindow. [BZ 800453] Export Csv Reports. Add TitleBar to ExportModalWindow [BZ 800453] Export Csv Reports. Use GWT.getHostPageBaseURL() to calc report urls [BZ 800453] Export Csv Reports. Allow filtering on both Recent Alerts and Recent Operations. Rebase, Merge. [BZ 800453] Export Csv Reports. Add filtering to Recent Operations and Recent Alerts. [BZ 800453] Export Csv Reports. Add filtering to Recent Drift. [BZ 800453] Export Csv Reports. Add path and snapshot filters to REST Api. [BZ 800453] Export Csv Reports. Remove export window and replace with direct calling of reports (in new window). [BZ 800453] Export Csv Reports. Removal of ExportModalWindow and replace with non-visual ReportExporter to call streaming RESTful reports from backend. [BZ 800453] Export Csv Reports. Fix bugs after rebase/merge where classes/packages have changed. [BZ 800453] Export Csv Reports. Changed ReportHelper to ReportFormatHelper. Added proper handling of null dates. [BZ 800453] Export Csv Reports. Added UI portion of date filtering. [BZ 800453] Export Csv Reports. Craft urls for date filtering reports. [BZ 800453] Export Csv Reports. First draft hooking up backend restful reports. [BZ 800453] Export Csv Reports. Import fix. [BZ 800453] Export Csv Reports. Fix url params. Logging of export report urls. [BZ 800453] Export Csv Reports. DRY up code. [BZ 800453] Export Csv Reports. Hook up datasources to Date Filters for Recent Drift, Recent Alerts and Recent Operations. [BZ 800453] Export Csv Reports. Remove openCSV dependency from main jar (still used in testing). [BZ 800453] Export Csv Reports. Add support for Recent Drift Definition filter on CSV reports via REST. [BZ 800453] Export Csv Reports. Undo changes to RPCDataSource -- back to normal. [BZ 800453] Delete unused ReportUrlBuilder. [BZ 800453] Enable Date filtering on report views. [BZ 800453] Fix Prod mode date format different from dev mode date formats. [BZ 800453] Change Configuration History column orders to match screen (as per meeting). [BZ 800453] Move date filters to after other filters (instead of first). Validate Dates. [BZ 800453] Remove Export All and Export column for detail export on Inventory Summary and Drift Compliance reports. [BZ 800453] Fix i18n for Date Filters. [BZ 800453] Rearrange Date Filter grouping for Alert History. [BZ 800453] Rearrange Date Filter grouping for Operation History. [BZ 800453] Bugfix DateFilter ordering for Operation History. [BZ 800453] Group Date filters on right hand side for DriftHistory. Trivial: Make form item name match variable name. [BZ 800453] Created DateFilterItem that eliminates the problematic date formatting issues with timezones as Integer offsets of the date are used instead. [BZ 800453] Handle reports where start date and end date are the same. And Make date boundaries inclusive instead of exclusive. Trivial: Deprecation comment. [BZ 800453] Handle new null boundary conditions from changing Date to Integer. [BZ 800453] Make Date Range filters work with inclusive ranges instead of exclusive ranges. [BZ 800453] Changed CSV reports Date format to '4/9/12 8:10 AM EST' Trivial: Remove date formatter from RPCDataSource as we no longer need to parse Date formats. [BZ 800453] i18n the Export Button in the reports screens. Keep title from wrapping on Edit Portlets screen. In response to japanese translations making title wrap vertically. Keep Tags on same line in Resource Detail view. [BZ 811554] Operation out come exception is right aligned and truncated. [BZ 811554] Operation out come exception is right aligned and truncated. Add underline back in on link. Fix formatting issues with Tags taking up multiple lines if the tag is long. Fixing another use case found. Add more type safety around String representations of Icons (replace with IconEnum). [BZ 809516] The "View Group Definition" column in Alert Definitions report does not take you to the alert def. [BZ 805545] Improved the usability of the Resource Metric Collection Schedule table. Configuring GWT stack traces to show filenames and line numbers while preserving the OBF (obfuscated) javascript. This is done by adding the emulated stack mode to the CoreGUI.gwt.xml. Merge branch 'master' into BZ805545 [BZ 805545] Improve the usability of the Resource Metric Collection Schedule table. Make the collection intervals update properly after in-place edit. Merge branch 'BZ805545' Revert "[BZ 805545] Improve the usability of the Resource Metric Collection Schedule table. Make the collection intervals update properly after in-place edit." Revert "[BZ 805545] Improved the usability of the Resource Metric Collection Schedule table." Change the GWT compile style to not use the emulated stack traces as we will use the DETAILED style instead. CSV Reports - disable export button if there is no records to export. [BZ 814232] Resource summary->Resource metrics portlet content does not use space nicely. Platform Utilization - Labels for graphs was spilling over onto two lines. [BZ 825230] Eliminate some of the space in the layout between the resource measurement sparkline graphs and the resource name link. [BZ 825230] Some measure names are not readable in JON EPP plugin. This is actually a global layout issue in the resource measurements portlet. Mohamed Hamza Ben Mansour (1): BZ 744262 - add resource lineage to SNMP traps. Rafael Soares (5): still working on pt translation... Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq adding OAuth support to microblog alert-sender plugin adding OAuth support to microblog alert-sender plugin Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Robert Buck (52): Add rpc timeout capability so users can specify an override timeout via query string parameters. The new query string parameter is rpcTimeout, the type an integer, and the units are expressed in seconds. Re rpcTimeout, trap numeric exceptions and fallback if a user does not provide an integer value. Merge branch 'master' into rbuck/rpctimeout [BZ 722600] Add index to RHQ_MEASUREMENT_SCHED.RESOURCE_ID column as recommended by Oracle EM to improve performance. Hide Eclipse plugin .metadata directory from Git. [BZ 726524] Consider adding an index for the RHQ_ALERT_CONDITION_LOG.CONDITION_ID to optimize queries. Merge branch 'master' into feature/performance Merge branch 'master' into feature/performance Merge branch 'master' into feature/performance Merge branch 'master' into feature/performance Merge branch 'master' into code-smell [BZ 726434] Fix io stream resource leak; also fixed a javadoc issue that caused code-red. [BZ 726435][coverity 13283] Fix Coverity identified RESOURCE_LEAK; close some IO streams. [BZ 726435][coverity 13112, 13113, 13276, 13277, 13041, 13025, 13005, 13012] Fix Coverity identified RESOURCE_LEAK; close some IO streams. [BZ 726435][coverity 13231,13284,13288,13343,13344,13361,13417,13424,13504,13521,13527,13542,14054] Fix Coverity identified RESOURCE_LEAK; close some IO streams. [BZ 726435][coverity 13171] Fix Coverity identified REVERSE_INULL. Fix unnecessary boxing of '0' to Integer object returns. [BZ 726435][coverity 13546 12979 12996] Fix Coverity identified FORWARD_NULL. Also, fixed several bitwise-and uses on booleans, switching to logical-and. [BZ 726435] Fixed several bitwise-or uses on booleans, switching to logical-or. [BZ 726435][coverity] Fix Coverity identified RESOURCE_LEAK; close some IO streams. [BZ 726435][coverity 13064, 13106, 13115, 13231, 13232, 13283, 13346] Fix Coverity identified RESOURCE_LEAK; close some IO streams. merged Merge branch 'master' into feature/performance Merge branch 'master' into feature/performance [BZ 734599] Change notification of schedule updates to agents so it uses quartz, reducing the time to update a metric schedule on a compat group with 1,000 members from 14s to 1.5s. oracle em cites lots of open cursor issues; fix open cursor leaks by closing result sets and prepared statements in finally blocks. [bz 734599] fix schedule update changes per code review [bz 734599] fix schedule update changes per code review; added doc and renamed method [BZ 734599] Change notification of schedule updates to agents so it uses quartz, reducing the time to update a metric schedule on a compat group with 1,000 members from 14s to 1.5s. [BZ 734599] Change notification of schedule updates to agents so it uses quartz; use unique quartz job and trigger names to avoid conflicts. merged master to feature/performance merge master to code-smell revert some inlining; some folks seem to prefer non-inlined returns as a breakpoint spot revert inlined returns to non-inlined returns so folks can place a breakpoint on the return Merge branch 'master' into code-smell [BZ 741971] Agent measurement schedules list becomes broken after a change on the UI; the resource container code replaced the prior collection with the subset. Instead, we simply need to update (always). remove unnecessary workaround for jdk 1.5 as we no longer support that and later jdks have the patch that resolves the underlying issues in priority queue remove methods remove unnecessary workaround for jdk 1.5 as we no longer support that and later jdks have the patch that resolves the underlying issues in priority queue remove methods Remove redundant groupId declarations; these declarations are bound to the parent so they are unnecessary. The redundant declarations reduces the IntelliJ usage solely as an editor, unable to use most of its features that best Eclipse. [BZ 721121] Fix IO stream resource leak. [BZ 721117] Fix IO stream resource leak; I fixed this previously, but as I was in here I fixed a few minor issues, making it code-green. Remove redundant groupId declarations; these declarations are bound to the parent so they are unnecessary. The redundant declarations reduces the IntelliJ usage solely as an editor, unable to use most of its features that best Eclipse. fix an obvious mistake in some old code; missing a throw before construction of an exception type [BZ 736802] Improve displayed message in GUI when outstanding autogroup async configuration updates are pending. [BZ 720794] Decrease user perceived latency when importing lots of resources by scheduling all server-agent communication as a background quartz task. [BZ 728547] Make SEQID cache sizes configurable; the new solution supports NOCACHE and CACHE semantics, it supports factory default sizes; for cases where factory default sizes are larger than the previous default value of 10, we opt for the factory default sizes. [BZ 751873] Prevent JBoss log spew and undeploy issues; w/o this fix after a bundle is deployed to an EAP cluster and a war is updated, it is no longer possible to undeploy via rm -fr on the command line. [BZ 748483] Make dbsetup sequence id cache size configurable. [BZ 748483] Make dbsetup sequence id cache size configurable. Here the fallback size is the legacy value of 10 when unspecified. [BZ 751065] - Add EAP monicker to EAP6 server resource names. [BZ 751065] - Add EAP monicker to EAP6 server resource names. Merge branch 'bug/751065' add support for authentication; reproduce profile service bug with Simeon Pinder (158): [maven-release-plugin] prepare for next development iteration disabling mongodb server side plugin for a)cause problematic brew Merge branch 'release_jon3.0.0-test-build' of ssh://git.fedorahosted.org/git/rhq/rhq into release_jon3.0.0-test-build [maven-release-plugin] prepare release RHQ_4_1_1-BETA1 [maven-release-plugin] prepare for next development iteration Revert "[maven-release-plugin] prepare for next development iteration" Disabling 'plugindoc' plugin which generated DocBook and Confluence docs off the plugin.xmls. Causing brew dependency issues and doesn't appear to be used. -applying missing brew patches to master. Somehow these got lost in translation. Merge branch 'jon3_test-build' into track_master4 removing JAVA5 backwards compatiblity support. Only commenting out logic as similar logic needed for JDK6 vs JDK7 in the near future. also removing JAVA5 logic from publish_release. Same reason as earlier commit. reverting back to SNAPSHOT version. inserting missing profile. Make sure release number gets included in BZ:733019: changed i)plugin display name to be more consistent with AS4 and AS5 refactor to use one build-property file. Update to use the right build property for brew. BZ 736077: applied patches from bz and one other fix(to disable TitleBar from hardcoding RHQ) to get JON and not RHQ in browser titles. BZ 735403 : repackaging to avoid signed jar issues causing ClassNotFound errors. Reverting CustomJaasDeploymentService logic to use string values again. use exact matching value check. BZ 747995: Making findSubjectByName deterministic by enabling strict query criteria for usernames. trivial comment cleanup. BZ 707047: merging LDAP group member search escape logic to master. disable test for now. Needs more work. BZ 748966: moving LDAP test and utils into server/jar instead. Fixing productization issue for new LDAP registration. [BZ 746658] reverting RHQ-1415 as it lays down unsigned elements to file system which breaks signed builds for portal.war. moving build number logic out of profiles and back into core build since brew now supports access to git exe. [BZ 753211] removing remote agent install from non-rhq builds. [BZ 731864] Enable Tags removal from RHQ. Requires CoreGUI enable/disable in src, but rest is maven command line parameter configurable. Fixing a number of lingering productization strings. [BZ 743986] insert branded content in mashup portlet for product releases. missed a translation file. add tag removal parameters for enterprise runs. [BZ 754693] ensure load of lazy references and update LDAP role relationship purge. [BZ 760139] have live data requests return empty lists even when random runtime exceptions occur to avoid serialization issues in UI. [BZ 760139] additionally modifying MeasurmentManager to always return non-null values even for erroneous runtime conditions. [BZ 767734] conditionally disabling remaining tags references from Bundles. [BZ 781621] fixing ldap ssl issue. Users unable to configure SSL support. BZ[784873] fixing issue displaying LDAP registration screen with clean browser cache. [BZ 759137] fix installer to say JBoss ON instead of JON. [BZ 751447] add plugin pack reminder to installer. [BZ 759137] fix installer to say JBoss ON instead of JON. [BZ 751447] add plugin pack reminder to installer. i)Modifying as7 plugin to generate plugin config exceptions when credentials are not set correctly. fix a few hard coded file separators. Rename NetworkInterface to 'Network Interface' as that name shows up in UI and should have spaces for readability like other tree nodes. i)Modifying as7 plugin to generate plugin config exceptions when credentials are not set correctly. fix a few hard coded file separators. Rename NetworkInterface to 'Network Interface' as that name shows up in UI and should have spaces for readability like other tree nodes. - ignore this diff. No functional changes just ide formatting. Use constants where possible for EAP/EDG identifiers. [BZ 785128] unable to remove managed server. Have to remove EAP/EDG Removing extra JSON segment returned with some results from AS7. Modifying connection class to handle 'failure-description' responses from AS7 as we were currently detecting as invalid json. Return failure Result for unexpected errors instead of null. adding more context for unparsable json change. Fix copy paste mistake. fix unit test failures for as7 configuration. [BZ 798637] fix ldap module to load anyway as long as ldap properties correctly available/set. [BZ 798465] ldap users unable to login due to permissions changes. Revert "Renaming script to be consistent with naming conventions" Remove logic to parse for unexpected JSON and the mapper is not configured to ignore those parts. [BZ 785128] fixed remove managed-server bug. populate resource config for mod_cluster -enable modcluster config loading adding include-defaults on all operation requests to include some missing components/values. Updating ModCluster discovery for domain configurations as well. Remove operations from mod_cluster for now until more relevant operations determined. -Move modcluster server -> service. enable http-proxy operations. -remove add/remove operations from modcluster server as both seem to be lifecycle operations for container enable remaing operations for modcluster. Enable operations for modcluster domain mode. Some cleanup and more docs. Exclude a few more shared operations from generated operations descriptor list. Update configuration data for webservices subsystem afer attribute changes. fix invalid webservice component attributes. Remove duplicate ThreadPool and Cache elements from plugin descriptor. Add WebServiceComponent class. Move plugin configuration exception code into IOException block to correctly detects unauthorized/401 Add note about how pluginExceptions is a valid deviation from normal JSON details exceptions usually Remove attributes no longer a part of enpoint model. Adding more webservice node handlers, but Handler descriptor component not discovered. More work here. reorganize modcluster settings into appropriate functionality groups. Duplicate Modcluster service to support separate operations list for Domain and Standalone modes. i)Add AS7 Property type support to Domain2Descriptor Move the standalone/domain Modcluster components into their respective containers Support default <c:group functionality for better ui organization. Better define discovery for Domain modcluster node. Cleanup property support in Domain2Descriptor and doc reason for changes. Add default values and fix issue with displaying values for adding metrics. Add missing resource config for webservices service and pre/post services for handler chains. Enable osgi subsystem. Oops. Mangled the refactor. One more service tag needed. Escape apostrophe as well. Refactor modcluster to reuse shared description where possible for domain/standalone Add mail subsystem to the descriptor. Modify domain2descriptor to support -object- and available property-options. Marking property as not required for Endpoint. Clean up list of resource config properties for VHost. Add missing JBossWeb rewrite child. Add missing filter type from root-logger. Fix indentatation for propery-option lists. Add new operation for console-handler. Update resource config for console-handler. A few more fixes for Domain2Descriptor with object type. Mark filter as not required for ConsoleHandler. i)add 'required' status attributes for map types. Update resource-config for periodic-rotating-file handlers. Numerous plugin format layout an object mapping fixes for DomainDescriptor -Fix issue with -object- in the resource-config Update htmlEscape logic and characters. Also modifed all description and defaultValue attributes to use the same logic. Fix unescaped characters in resource-configuration and moved shared definition code for reuse. Add new logging handlers and renamed all existing from camel hump to distinct words. Add support for allowed property values for -object- with -p mode. Add logger category support service with initial configuration. Add operations for logging categories and have D2D treat -list- as strings in the descriptor. i)Moving handlers property to not required ii)Modifying D2D to add required flag for lists. trivial, spacing for d2d. trivial, more spacing for d2d. i)update list of excluded operations -too aggressive. ii)more spacing changes. Merge branch 'track_master' Moving list components to not required for JVM Definition. Update 'security domain' with currrent config/operation values. -Add support for as7 child types that don't have *map nodes Cleanup recurse method. Modify recursive operation on D2D to display metrics and operations as well. Modified d2d to support recursive generation of small nodes. Metrics not done.. more work there. Add most of security subsystem. Missing a few metrics. Added empty node detection and fixed a number of formatting issues. trivial, spacing/layout changes. More D2D fixes: fix empty resource-configuration nodes and incorrect map types with allowed values. Update logging handler node details. Remove redundant server component for Root Loggers. Adding security section for hornetq. More updates to Logging Console handler. Remove redundant opertions and more cleanup in Logging subsystem. More logging subystem cleanup and initial support for file property. Trivial, remove commented out node no longer used. Initial changes to convert as7Json to more standard json. Moving root logger configuration into it's own sub node and updating available operations. Modify d2d to show when properties required and to detect 'nillable' for required object types. Couple of more fixes to the logging subsystem Define only allowed values and update parameter when changing log level. -support reads of name-value property maps Root logger operations fix and more cleanup of redundant operations. Disabling Logging Handler filter usage pending [BZ 815378]. Reapply logging subsystem cleanup removed by revert. [BZ 817813] add new property available in mod-cluster-config and disable grouping as not working. [BZ 818952] adding the rest of support for c:group load and edits for BaseComponent for as7. [BZ 818952] adding Config Load and Update itests for regular cgroups. [BZ 823624] i)finish code changes except for jvmRoute population. [BZ 823624] refactor to no longer depend upon presence or components from mod_cluster for various reasons. [BZ 826542] Adding support for security-domain child nodes (authentication=classic,authentication=jaspi,audit=classic,audit=classic,acl=classic,authorization=classic,identity-trust=classic,mapping=classic]. -Explicitly allows the creation of and update of N ModuleOptionType instances and support of N module options for each type instance. add support for EAP 6.0.0 (GA) and remove support for all the EAP 6.0 ER's [BZ 826542] disable incorrect unit tests. More work necessary to get this to pass with Arquillian properly. [BZ 826542] add a few tests to exercise crud of Security Domain and some of Module Option framework. Stefan Negrea (366): Get the integration tests to compile and run again by creating the maven module and deploying the correct resources to target folder. Add jar dependencies for testing with JBoss 5&6. With JBoss 5, the timeout is blocking the operation call for the period set. Reduce this period for these integration tests. Enable mod_cluster support for JBoss 5&6 with simple and HA configuration listeners. Also, added metric collections and configuration save to bean file. The JBoss server home directory is now correctly retrieved from the parent resource component. Included some other minor code tweaks and refactorings. Updates to support integration with JBoss' mod_cluster module for AS6 and EAP5.1.x Renaming mod_cluster components to match their explicit purpose. More updates to the naming of each plugin component to match the intent and purpose. Also updated the integration tests to test each resource type. Added the proxyInfo metric back to Catalina service context since it is readly available. Small refactoring and code formating change to make the class easier to read and understand. Get the integration tests to compile and run again by creating the maven module and deploying the correct resources to target folder. Add jar dependencies for testing with JBoss 5&6. With JBoss 5, the timeout is blocking the operation call for the period set. Reduce this period for these integration tests. Enable mod_cluster support for JBoss 5&6 with simple and HA configuration listeners. Also, added metric collections and configuration save to bean file. The JBoss server home directory is now correctly retrieved from the parent resource component. Included some other minor code tweaks and refactorings. Updates to support integration with JBoss' mod_cluster module for AS6 and EAP5.1.x Renaming mod_cluster components to match their explicit purpose. More updates to the naming of each plugin component to match the intent and purpose. Also updated the integration tests to test each resource type. Added the proxyInfo metric back to Catalina service context since it is readly available. Small refactoring and code formating change to make the class easier to read and understand. Merge branch 'mod_cluster_plugin' of ssh://git.fedorahosted.org/git/rhq/rhq into mod_cluster_plugin Merge branch 'mod_cluster_plugin' Moved private method at the bottom fo the file to follow standard java file structure. Add property persistance functionality to catalina JMX listener for mod_cluster by saving the configuration directly into the server.xml file. All the node lists are zero based index. Fixing for the incorrect indexing of lists. Refactoring configuration file classes to accept files in the constructor to allow testing. Also, added basic configuration files for testing. Merge branch 'mod_cluster_plugin' BZ728621 - The correct procedure to update mod_cluster properties for JBoss 42 is: Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq BZ729051 - Extended the default MBean resource component implementation to support TimeUnit arguments. BZ727963 - Updated the code to declare the logger locally before using it. The logger declared at parent level was issuing usage warnings on the agent container. BZ733775 - Update the plugin configuration file to have correct descriptions for each service available. Also added a new class to verify the availability of a className mbean resource. Add proxy information metric to make the mod_cluster component dyna group friendly for complex queries (eg. group based on httpd proxy). Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq BZ684320 - Updated permissions only for the zip archives of server and agent to 744. BZ684320 - Updated default permissions one more time to match JBoss AS defaults. Clip an unnecessary system.out statement that was forgotten from unit testing. Adding wsprovide to the list of libs for Eclipse. Abstract and simplify a couple of portions of the publish release script. No need to cleanout maven repos from within the script. This should be done at system level. Move more parts around to allow function declarations at the start of the script. Move argument validation to its own function. Maven purge interval no longer needed. Moving environment variable setup into its own function. Integration tests for mod_cluster should be run on JBoss AS6 Final going forward. First set of wildcard generic updates. The change was mainly done in the plugin-api module but updated all the code directly affected by the change. Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq More wildcard updates propagated upwards from the agent api. More refactoring for the publish and release scripts. Added two ignores required by the release scripts to prevent environment files to get committed to the repo. One more ignore added to git to avoid committing files used only for ci. Merge branch 'master' into mod_cluster_plugin Format messy pom.xml file in preparation for more updates. Enable mod_cluster plugin for Tomcat. Also added a couple of integration tests for the resource. Add SSL configuration for JBoss 5.x and 6.0. Without this configuration the SSL boolean property is not usable. Take out the settings file from the actual release script. No reason to override anything, the settings have should have been pre-configured to support a release. Move environment setup in a function to make the code more readable. Removed the git cloning option from the scripts. The scripts do not exist unless the git repo was already cloned. Update the git script to function on the assumption that the current folder is a git folder and the folder to build from. Replace maven release plugin with versions plugin. Also removed all the code that will not be use going forward. Added documentation for existing functions. Also, done a little refactoring to make the main script more legible. Introduce the concept of script mode and add it to the command line arguments. Abort the script if local or remote tags already exist. This should never happen regardless of the script mode. Added rough tagging and versioning algorithm for cases when tagging is the only operation to be performed. Small updates to get the script ready for live test runs. Make an explicit call to pull the release branch and not the entire repo. Updating if/then statements after a bash syntax error. Remove WORKING_DIR concept, the current folder is working folder. Simplify the assumptions for maven to run either Hudson or default local methods. The work is done on the build branch, so push the build branch when everything is done. Update the code to remove local tags. If the tag is just local that means there were errors during the build process and the tag was published. Add code to push the tag too. Since the original push was just for the build branch the tag was not pushed to the git. Added standard option parsing to the script. Updated the usage text. Create a function for tag verification. A couple more updates to make the script more readable. Move some sections of code to applicable functions to clean the main script flow. Moved the release info to its own function. Updated the script documentation and formatting. Moved the last two pieces of the release script into functions. Split the tagging and development version updates into two separate functions. Verify the tags before doing anything. Add support for branching for release. Add support to change the development version on the originating branch. A couple more updates and cleanup around variable setup. Simplify tag only option to just tag. Make the community release default. Added scm-strategy as a supertype for branch and tag options to accommodate running this script from Hudson. Updated script mode options to support Hudson builds by adding a supertype. Also, changed the default script mode to the more conservative test value. Take into account the script mode before updating the release branch for developments updates. Minor formatting updates to replace tabs with spaces. Updates to the usage text after updating the actual option parsing. Git username no longer need after all the updates and changes to the initial script assumptions. First, perform a clean install instead of clean and then an install. Added an option to allow users to augment the set of maven profiles used by the script. Fix a small variable naming mistake. Enable tests for the maven builds run from this script. Cleanup local variables that are no longer needed. Moved variables next to the context where they are used. Updated function names to be more descriptive of what they do. Move abort function to the common library. The function is identical in the two scripts. Create local maven folder and explicitly set it in the maven arguments. Added a script option to be enable maven debug mode. Modified sed to replace dots and dashes with underscore for the tag version. Fix a syntax error. Merge branch 'stefan/release_updates' Merge branch 'mod_cluster_plugin' Added comments for each function in the bash library. The script was testing the wrong directory before attempting to create the maven local repo dir. This was a non-issue because the hudson workspace was empty. Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq BZ564514 - Updated the JMX plugin code to gracefully handle the case when the ems connection is null due to missing JMX credentials. Also, updated mod_cluster plugin code that was using a similar implementation of loadBean method. Update usage of generics after refactoring loadBean method. BZ564543 - Updated the description for Script Prefix to clarify the concept. Replaced unreliable and recursive resource discovery method with a linear tree traversal method. Updated script usage documentation, extra profile was missing argument. BZ564538 - Removed broken View link from the Content page since the functionality is not supported. Also, removed a relative path link that was pointing to the old UI. Make the entire path to mod_cluster configuration file configurable by the user. Add debug mode support to the bash library. Update script to avoid platforms compatibility issues. Add debug mode support for the release script. Add parsing for debug mode. Activate profiles in a consistent order with other the build environments. Update the publish script to use a maven repo folder under the workspace folder. Checkout the release branch regardless... Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Revert "development RHQ_4.3.0-SNAPSHOT" Avoid having the settings file wiped out because of git clean commands. Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Add tag override to the release script to replace an existing tag with this new one. Improve release script output/debug by echoing the function being executed. Echo out the steps being executed by the complicated release specific functions to facilitate debug. Add workspace override option to better facilitate local script runs. Move publishing code out of the release script. The code is commented out in the publish release script to include it at a later time. When branching the name of the branch should be similar to the release version and not tag version. [BZ 743437] Transformed Type Mapping into a simple text box. All the other implementations considered are currently not supported by the underlying structure. [BZ 743437] Add default type mappings to the property description to make it easier for users to select a predefined type mapping. Remove Git ignores for essential Eclipse files. Added a pull from origin right before pushing changes. The script will fail in the event a manual merge is required. Make push commands to use explicit refs for branch and tag disambiguation. Also simplify the checkout command to allow automatic branch name resolution. Remove version information from the actual plugin descriptor. Remove all the scm tags and related properties from the poms. The tags are no longer in use. Removing the last maven scm and release references. [BZ 747430] Add support for loading help view content from product info file. [BZ 747430] Update the code that defaults the icon to document.png to check for nulls. The exception path is specific to I18N implementation. Have a fallback method if the remote branch is already tracked in the local repo. Make the output a little bit nicer by adding a function execution marker. [BZ 765795] Removed the recursive call that was creating StackOverflowError and added the correct call to create a resource. Use a more direct approach to disable tests. The tests will now run only oracle-test profile is explictly invoked. Revert "Updating the installer test to:" Revert "DBInstallationTest needs to use its own dedicated database" Add code to reset and reinstall the database after an overwrite or upgrade test is run. [BZ 758753] Use a single bean method for all deployment requests. A single point of entry simplifies design and allows adding post installation processing code in a single place. [BZ 758753] If a package is successfully installed and the resource is a cotennt resource then update the installed package information in the database (delete old entry and add a new entry). [BZ 761593] Add SHA to manifest for exploded WAR deployments. [BZ 761593] The war component was not using the content delegate to redeploy applications. Because of this any redeployments were missing the SHA manifest attribute. [BZ 761593] The plugin was not obtaining the SHA from the manifest file. Since the deployment is exploded the existing code would just fail. [BZ 761593] Update the code to correctly compute SHA 265 for the exploded war file. The existing code was computing MD5 sums. [BZ 758753] Use SHA as the identifier for package discovery. The version is unreliable and not correctly updated between server and agent. [BZ 758753] Use SHA as the version for the package; the format is consistent with the existing versioning scheme. [BZ 761593] Compute SHA256 for content that was deployed outside RHQ or for default content delivered with the server. [BZ 761593] Move all the code for computation and retrieval of SHA256 to file content delegate. This way the manifest and digest code is in one location only. [BZ 767247] Updated the JBoss AS4 plugin to use the same design as Tomcat plugin with regards to version and SHA256. [BZ 767393] Updated the plugin code to use SHA256 as the version and persist it inside the manifest file. Also, add directory based SHA computation for default server applications. [BZ 761593] Make use of display version to extract/report the version from the actual manifest of the deployment. [BZ 767247] Update JBoss AS4 plugin to use display version for manifest set version. [BZ 767393] Update JBoss AS5 plugin to use display version for manifest versions. [BZ 769986] Updated JSF content view to correctly display the version of packages. [BZ 769986] The version field is no longer required when uploading a package. If the user types a version then the display version is used to capture that information. [BZ 771418] updateBackingContent now requires a version from the user. This version will be used as a display version for the uploaded package. [BZ 771777] If there are multiple installed packages associated with an application then return the one with the latest timestamp. [BZ 758753] Revert to using version for querying packages during the merge process. This is possible because the version is now SHA256 across all the plugins. [BZ 772722] Fixes for Yum and disk remote content plugins to use SHA256 for the version and corretly set the display version. [BZ 772722] Updates for the url remote repository server side plugin. SHA256 is now used for checksum and version. [BZ 772722] Update the CSP server side plugin for remote package sources to use SHA256 for version and save the actual version information in the display version field. [BZ 773061] Ignore subfolders discovered in the repo folder. This will prevent attempts to import full folders and/or import packages from sub repos. [BZ 758753] Adding back old deployPackages method to keep the remote interface backwards compatible. The old method was set to deprecated and no longer used in internal code. [BZ 771418] Added back delete methods for backward compatibility and created a new version of the method that takes the display version as an argument. [BZ 772722] Updates for the URL parser to correctly load MD5. Also, fixed a couple of failing unit tests due to changed functionality. [BZ 535720] Adding back commented line that was causing failures due to content system discovery failure. Also, update the test code to match current CLI interface and resource structure. [BZ 782207] Removed the rhnhosted server plugin directory and all the pom and classpath references. [BZ 771418] Mark old updateBackingContent method (with no display version) as deprecated. [BZ 771418] Adding java docs for deprecated CLI method. [BZ 781763] Added extra code to check if the directory for the JBoss server even exists before attempting to perform content discovery. If the folder is not there then the list will be empty since nothing is discovered. [BZ 771418] Adding unit tests for changed functionality around display version and existing package version selection. [BZ 772722] Added unit tests for updated functionality of the disk source repository. [BZ 772722] Adding unit tests for the JBoss CSP server plugin to ensure sha256 and version are correctly populated during sync. [BZ 771418] Corrected incorrect import of junit dependencies. Testng is the framework of choice. [BZ 761593] Add unit tests for changed content system code. [BZ 767393] Add unit tests for content system changed functionality in JBoss AS5 plugin. [BZ 767247] Unit tests for content system changed functionality for JBoss AS4. [BZ 772722] Updated comments in unit tests to better match the story of the test. [BZ 727959] The script path was not using the bin subdirectory of the server home directory. Updated the code to point to the correct file before attempting to compute the SHA256. [BZ 761593] SHA256 computation is now identical irrespective of default operating system implementation for list files & sorting. [BZ 767247] SHA256 computation is now identical irrespective of default operating system implementation for list files & sorting. [BZ 767393] SHA256 computation is now identical irrespective of default operating system implementation for list files & sorting. [BZ 761593] Unit test updates after changes to the SHA256 computation algorithm for exploded deployments. Add pom setting to correctly set the hibernate dialect for embedded container. Cleanup the script to match the release.sh structure. Renamed publish script file to match actual purpose. Add publishing to maven repositories specified in the project pom. Also included argument parsing. Updates to the script in preparation for the sourceforge publishing code. Clip unused and unneeded variable. Prelim code to scp sourceforge files. Move powermock version to root pom file. [BZ 749315] Set max and min values for integer validators to corresponding integer limits when they are not specified other config properties. No need to enable tests based on a local private variable. Delete only changesets directory to preserve classes and resource created by the build process. Avoid merging remote branch into local code when using branching strategy because the branch does not exist yet remotely. Light refactoring on JBoss AS4 plugin code. Turn off maven publishing. Not fully implemented ... [BZ 799163] Correctly deploy new content based on the current state (exploded or zipped) of the application on the filesystem. Fixing failing test with hardcoded value for plugin version. Completely remove unused FileContentDelegate functionality. Align functionality with similar file content classes. Add the scm tag back for the root pom because it is required for publishing by the JBoss.org Nexus repository. [BZ 790753] Move file and jar content delegates to core plugin-api because a single class should be used accross all the plugins that make use of the content system. [BZ 790753] Save the SHA256 for deployed content in the data directory in a properties files. No more updates to the manifest of the updated application. [BZ 790753] Added documentation and a minor refactoring to keep code consistent. [BZ 790753] Do not expose the uuid directly in ResourceContext. The api now provides the resource data directory (which is based on the uuid). [BZ 801997] Set the version of the discovered script to the SHA256 of the content. [BZ 802793] Use part of a random UUID for temp file and folder names to avoid clashes for (almost) simulatenously deployments. [BZ 802787] Added code to correctly remove temporary files after successful or failed deployments. Fix test failures after ResourceContext updates. Sort entries in alphabetical order. This would make the matching between actual descriptor and output easier. Add support for JacORB subsystem in the AS7 plugin. The discovery process would fail if AS7 was started using non-default configuration file. The argument parser places the file name on the next line after --server-config argument. Cleanup old configuration for JacORB properties. The property is a list of maps. Adding test cases for list of map as map. Added default value in the description text for Domain2Descriptor. Also updated JacORB subystem configuration with default values. Add assertions to the configuration load test for list of map as map. Add support for updating properties that are a list of map as map. Updated/created unit tests for this type of property. Update remoting subsystem property descriptions to include default values. Added JDR subsystem definition. Only one operation is available but more work is required for execution. Partial support for JCA subsystem. BootstrapContext and Workmanager are not singletons, multiple resources can be defined. Add support for JDR operation execution. The operation typically takes more than 10 second, so increased the timeout to 120 seconds. Move singleton JCA subsystems as group configuration to simplify structure. Add subsystems for workmanager as resource configuration since they are singletons too. Add support for JAXR subsystem. Add support for JPA subsystem. Move the transactions subsystem from server to service. Commit for matching service end tag. Add support for singleton subsystems with identically named properties to be configured from the grouped properties section of the main resource. Preliminary support for cmp subsystem. Added support for EE subsystem. Update CMP subsystems to allow multiple Hilo Keygenerators. Added support for JDNI bindings in the naming subsystem. Add support resource-adapter sub-subsystems. Also moved resource-adapters from server to service. Add rhq-core-util to the classpath for d2d tool. Update properties for security subsystem and moved the subsystem from server to service. Update support for threads subsystem. Also moved the subsystem from server to service. Threadfactory and threadpool are not singletons. Add partial support for the ejb3 subsystem. Re-enable two sub-service for EJB3 subsystem. Remove keepalive-time:unit metric, it is not needed nor useful. Prevent formatting the entire file on save, just format code changed. This will avoid having a complicated diff just for formatting purposes. Decouple property parsing from the composite operation creation for basic property types. Refactor private methods (group all the parsing and write attribute operation creation methods). Move method documenatation in javadoc. Added create resource delegate. This delegate is similar to the configuration write delegate but will be used create resource requests. The property parsing is almost identical to the configuration write delegate. Removed accessor methods for parent properties, refactorings based on code review input. If the property is an expression, just write null if the property itself is null. Use the resource configuration definition from the report, and not the one from the parent resource. Update JCA subsystem configuration to allow creating of child sub-subsystem. Update hilo-keygenerator configuration to allow creation/deletion and also move datasource to dependent value. Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Add support for the JMX subsystem. Enhance support for resource-adapters subsystem. connections-definitions sub-subsystem needs more properties to be added. Add support for a few deployment runtime resources. Avoid throwing an exception when retrieving an Object type without a map. Move infinispan from server to service. Add support for EJB3 subsystem in deployments. Add support deployment webservices subsystem. Servlet is not a singleton subsystem. There is a subsystem for each monitored servlet. Move JGroups from server to service. Move Remoting subsystem from server to service. Add support for subdeployments of deployments. Add resource configuration and metrics to deployment. Fix unit test failure. The root logger does not have a map in the config. The child: moniker maps the entire subsystem on property by property basis. [BZ 810332] Change aliases sub-property to a simpler alias. [BZ 810332] Moving aliases property to not required since it can be set to null on AS7 side. [BZ 809933] Set the property to required=false since it can be set to null on AS7 side. Move webservices subsystem from server to service. Move datagrid endpoints subsystem from server to service. Move logging subsystem from server to service. Update web subsystem from server to service. Update jca and datasources subsystems from server to service. Partial update for the web subsystem. All the properties have been updated to match the new resource defintion. [BZ 809626] Split transactions subsystem configuration into three services based on server profile. This was the only options since conditionals are not allowed in the plugin descriptor. Allow creation of bindings for the naming subsystem. [BZ 811525] Updated the code to parse the entire tree of each resource. This will ensure that all the resouces that are children of another resource (anywhere on the resource tree, not just first level) are removed from the list of top level resources to be imported. Such resource will be imported when is a direct child of a resource. [BZ 811525] Add unit tests for the change in the order of resource import and top level resource detection. Binding type is a required subsystem property, it can never be set to null. Update resource-adapters children properties. [BZ 811720] Add extra (unneeded) parent resources to avoid plugin import problems on older plugin containers. Fix D2D utility to support collapsed maps for operation arguments. Additional support for resource adapters subsystem. Additional updates to the resource-adapters, connection definitions subsystem. Update create resource delegate to omit from the request any properties not required and not set by the user. Allo :expr moniker to be used with long values too. Remove unnecessary remove operation. Update messaging provider from server to service. Update operation names to flag that they apply to the subsystem. Add support EJB3 service subsystems. Add support for more services for the web subsystem. Remove individual servlet metrics from the web runtime subsystem. The discovery and monitor process would require an excessive amount of resources. Update support for runtime datasources. Add support for JPA runtime subsystem for deployments. Add support for creating thread pools and thread factories for the threads subsystem. Enhance support for OSGi subsystem. Update runtime datasource subsystem configuration to match server datasources configuration. Enhance support for mail subsystem. Update create resource delegate to support creation of true singleton subsystems. In that case the complete address should be picked up exclusively from the resource descriptor. A good usage example is the mail subsystem. Long options are the same as short options (with space or equals between argument and argument value). [BZ 812765] Added two missing metrics from the web runtime subsystem. [BZ 812765] Add restart operation of deployment web subsystem as a composite of disable+enable. Master host and port can be parametrized like the rest of the configuration values. Add code to find the actual value set at runtime. [BZ 806240] Split Datasources subsystem into three resources based on the parent server. Add subsystems to Managed Server tree. Add managed runtime property for discovery purposes for managed servers. Hardened the detection for managed servers runtime. And removed unneeded Host Controller parents. Subsystem updates for discovery on the resource tree. Complete json from :read-resource-description(recursive=true,operations=true) for standalone, full-ha profile, ER4. Updated file to ER5. Updated to ER6. Complete json from :read-resource-description(recursive=true,operations=true) for domain from ER4. Updated domain json to ER5. Update domain json to ER6. [BZ 817811] Added all available properties to hornetq-server sub-resource. Remoting interceptors are not a required field. It can be undefined. [BZ 817808] Messaging subsystem updates for server. [BZ 820757] Update descriptor for HornetQ server subresource of deployments. [BZ 817802] Added sub-resources (log-store, transactions, and participants) for trasactions subsystems. [BZ 817805] Updated resource definition for JAXR subsystem to match current AS7 configuration properties. [BZ 817814] Updated resource descriptor for Infinispan subsystem and sub-resources. [BZ 821878] Added managed server as parent for the web subsystem resource. [BZ 821904] Add the two missing classes back to the JBossAS5 plugin for backwards compatibility with embedded versions of the plugin container. [BZ 646631, 790753, 820650] Updated AS5 deployer use a unique temp folder instead of a unique temp war name. The war name is used as-is by the AS5 deployer to determine the name of the application be deployed. [BZ 646631, 790753, 820650] Add unit tests for resource context and deployer code changes. [BZ 811288] Updated various subsystems to match the definition for stanadlone, profile, and managed server. Where applicable a single resource definition was split into two or three resources based on the parent type and available properties, metrics, and operations. BZ 824889 support outbound sockets [BZ 811288] Updated various subsystems to match the definition for stanadlone, profile, and managed server. Where applicable a single resource definition was split into two or three resources based on the parent type and available properties, metrics, and operations. [BZ 811288] Module property can be undefined for security subsystem's subresources. Fixing one merge error from the large AS7 plugin descriptor merge. [BZ 824869]Add option-set values for some more resource-configurations for Security subsystem. [BZ 824869]Missed one more option-set update. [BZ 811288] Split the messaging subsystem into three resources based on parent resource. [BZ 811288] Adding back missing run-inside configuration for Profile. [BZ 811288] Add a separate descriptor for the logging subsystem only to managed server. The same descriptor will be shared by standalone and profile. [BZ 828464] Adding the two argument constructor back for backwards compatibility with the ESB plugin. [BZ 826066] Path resource has now templates and a property to allow users to create all four types. [BZ 827636] Updated Cache component and parents to use generic component code since the functionality required was implemented in a generic fashion. BZ 828349 - a server-group of a managed server can now be changed. BZ 827652 - fix a typo. [BZ 826066] Created unit tests and integration for the generic components that support templated resources. BZ 829394 Use the name from resource key, as this is available in UI and CLI [BZ 829751] - Make sure deploying a package updates the internal info [BZ 831369] Use :whoami to retrieve server state because it does not require any parameters and is present on all resources. This will avoid warnings printed by using :read-attribute. [BZ 831377] Updated the plugin descriptor to allow decimal numbers for retry-interval-multiplier of a HornetQ cluster connection because AS7 allows it. [BZ 812755] Added memory pool and garbage collector sub-resources to JVM information. [BZ 831757] Mark memory-pool-names list property as read-only. [BZ 833089] Created a separate Local Cache resource descriptor with properties only applicable to this resource type. [BZ 833089] Remove more unneeded properties from Local Cache resource. [BZ 833187] Updates to support nullable lists. If a nullable list is empty then send back to the AS7 the null value instead of an empty list. [BZ 816593][BZ 816587] - Adding unit tests for content retrieval and detection delete the itest AS7 home dir before, as well as after, the itests run [BZ 835710] Removed WebservicesComoponent class and moved the two resources using it to the generic BaseComponent. Fix a merge error that introduced unnecessary characters. Increase the wait time to allow all subresources to get committed to inventory. BZ 837903 - remove thread ids from configuration and add an operation to retrieve them. BZ 844217 - Use the correct name for the deployments directory (for bundles). [BZ 832090] - Make sure to activate the resource only after it has been [BZ 832090] - adding an integration test for checking that all the PC add a test that checks if discovery is run more than once per child type ensure tests run in a predictable order Ted Won 원종석 (4): First batch of Korean translations for the installer. More translations for Korean language More Korean translations Final translations to Korean. Make them display via charset = UTF-8 Torben Jaeger (4): Enable gathering of server logs. BZ 791126 - Enable transactions subsystem. BZ 791126 - Enable transactions subsystem. BZ 803882 Support generation of <metric> tags for attributes with complex content Torben Jäger (1): BZ 803882 provide memory metrics; make getValues() support metrics with sub-elements (as7 returing ips (1): BZ 818673 Rename the plugin to 'JBossAS7'. jkremser (1): [BZ 821100] Adding new metrics into currently selected view using the user's preferences --- .classpath | 303 .gitignore | 37 .settings/org.eclipse.jdt.core.prefs | 3 .settings/org.eclipse.jdt.ui.prefs | 6 LICENSE | 3 dev/null |binary etc/apt/pom.xml | 11 etc/apt/src/test/java/org/rhq/plugins/apt/AptSourcesComponentTest.java | 2 etc/cli-scripts/create_files.js | 186 etc/cli-scripts/drift.js | 164 etc/cli-scripts/measurement_utils.js | 134 etc/cli-scripts/util.js | 95 etc/dev-utils/setup-rest/setup.sh | 17 etc/eclipse-tools/maven/RHQ | 70 etc/m2/settings-bugfixes.xml | 54 etc/m2/settings-content.xml | 58 etc/m2/settings-linux-config.xml | 73 etc/m2/settings-rawconfig.xml | 54 etc/m2/settings.xml | 624 etc/m2/smartgwt-war-archetype/pom.xml | 29 etc/m2/smartgwt-war-archetype/src/main/resources/archetype-resources/pom.xml | 31 etc/samples/cli-scripts/alert-drift-remediation.js | 68 etc/samples/perspectives/sample-perspective/app/pom.xml | 7 etc/samples/perspectives/sample-perspective/perspective/pom.xml | 4 etc/samples/perspectives/sample-perspective/pom.xml | 9 etc/samples/provisioning/sample-bundle/pom.xml | 5 etc/samples/skeleton-plugin/pom.xml | 2 etc/samples/skeleton-plugin/src/main/resources/META-INF/rhq-plugin.xml | 5 etc/scripts/create-jbossas-bundle.sh | 95 etc/scripts/jboss-as-spawn.sh | 131 modules/cli-tests/pom.xml | 2 modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_RepoManager.js | 9 modules/common/ant-bundle/pom.xml | 12 modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/DeployPropertyNames.java | 22 modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/AbstractBundleType.java | 4 modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java | 17 modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/AntLauncherTest.java | 30 modules/common/ant-bundle/src/test/java/org/rhq/bundle/ant/type/AbstractBundleTypeTest.java | 26 modules/common/drift/pom.xml | 12 modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetReaderImpl.java | 72 modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriter.java | 35 modules/common/drift/src/main/java/org/rhq/common/drift/ChangeSetWriterImpl.java | 28 modules/common/drift/src/main/java/org/rhq/common/drift/FileEntry.java | 62 modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java | 50 modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetReaderImplTest.java | 72 modules/common/drift/src/test/java/org/rhq/common/drift/ChangeSetWriterImplTest.java | 90 modules/common/filetemplate-bundle/pom.xml | 12 modules/common/jboss-as/pom.xml | 17 modules/common/jboss-as/src/test/java/com/jboss/jbossnetwork/product/jbpm/handlers/test/CompareDigestActionHandlerTest.java | 52 modules/common/pom.xml | 9 modules/core/arquillian-integration/archive/pom.xml | 50 modules/core/arquillian-integration/archive/src/main/java/org/rhq/test/shrinkwrap/AndFilter.java | 77 modules/core/arquillian-integration/archive/src/main/java/org/rhq/test/shrinkwrap/FilteredView.java | 46 modules/core/arquillian-integration/archive/src/main/java/org/rhq/test/shrinkwrap/FilteredViewImpl.java | 399 modules/core/arquillian-integration/archive/src/main/java/org/rhq/test/shrinkwrap/RhqAgentPluginArchive.java | 13 modules/core/arquillian-integration/archive/src/main/java/org/rhq/test/shrinkwrap/RhqAgentPluginArchiveImpl.java | 344 modules/core/arquillian-integration/archive/src/main/java/org/rhq/test/shrinkwrap/RhqAgentPluginDescriptorContainer.java | 102 modules/core/arquillian-integration/archive/src/main/resources/META-INF/services/org.rhq.test.shrinkwrap.FilteredView | 1 modules/core/arquillian-integration/archive/src/main/resources/META-INF/services/org.rhq.test.shrinkwrap.RhqAgentPluginArchive | 1 modules/core/arquillian-integration/container/pom.xml | 151 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/AfterDiscovery.java | 51 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/BeforeDiscovery.java | 51 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/DiscoveredResources.java | 45 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java | 581 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/MockingServerServices.java | 78 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/PluginContainerInstance.java | 27 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/ResourceComponentInstances.java | 50 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/ResourceContainers.java | 38 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/RunDiscovery.java | 44 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/ServerServicesSetup.java | 52 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/AbstractAnnotatedMethodExecutor.java | 172 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/AbstractAroundDiscoveryExecutor.java | 44 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/AfterDiscoveryRemedy.java | 49 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/BeforeDiscoveryPreparator.java | 50 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/DiscoveryResultsTestEnricher.java | 233 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/PluginContainerConfigurationProvider.java | 49 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/PluginContainerOperationExecutor.java | 55 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/PluginContainerPreparatorExecutor.java | 56 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/PluginContainerProvider.java | 50 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/PluginContainerRemedyExecutor.java | 55 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/PostPrepareEnricherExecutor.java | 45 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/RhqAgentPluginContainer.java | 459 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/RhqAgentPluginContainerConfiguration.java | 117 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/RhqAgentPluginContainerExtension.java | 64 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/RunDiscoveryExecutor.java | 69 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/ServerServicesPreparator.java | 59 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/ServerServicesProvider.java | 60 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/EnrichmentHook.java | 165 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/PluginContainerClassEnhancer.java | 77 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java | 140 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/spi/PluginContainerOperation.java | 40 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/spi/PluginContainerOperationRemedy.java | 48 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/spi/PluginContainerPreparator.java | 34 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/spi/PostPrepareEnricher.java | 37 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/spi/events/PluginContainerCuredFromOperations.java | 40 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/spi/events/PluginContainerDiscovered.java | 38 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/spi/events/PluginContainerOperationsExecuted.java | 37 modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/spi/events/PluginContainerPrepared.java | 37 modules/core/arquillian-integration/container/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension | 1 modules/core/arquillian-integration/container/src/test/java/org/rhq/test/arquillian/InsideAgentSimulationTest.java | 117 modules/core/arquillian-integration/container/src/test/java/org/rhq/test/arquillian/NativeSystemInfoEnablementTest.java | 71 modules/core/arquillian-integration/container/src/test/java/org/rhq/test/arquillian/RhqAgentPluginContainerTest.java | 135 modules/core/arquillian-integration/container/src/test/java/org/rhq/test/arquillian/TestDiscoveryComponent.java | 47 modules/core/arquillian-integration/container/src/test/java/org/rhq/test/arquillian/TestResourceComponent.java | 47 modules/core/arquillian-integration/container/src/test/java/org/rhq/test/arquillian/avail/AvailDiscoveryComponent.java | 54 modules/core/arquillian-integration/container/src/test/java/org/rhq/test/arquillian/avail/AvailResourceComponent.java | 42 modules/core/arquillian-integration/container/src/test/java/org/rhq/test/arquillian/avail/AvailTest.java | 140 modules/core/arquillian-integration/container/src/test/resources/arquillian.launch | 4 modules/core/arquillian-integration/container/src/test/resources/arquillian.xml | 29 modules/core/arquillian-integration/container/src/test/resources/avail-rhq-plugin.xml | 49 modules/core/arquillian-integration/container/src/test/resources/log4j.xml | 56 modules/core/arquillian-integration/container/src/test/resources/test-deep-rhq-plugin.xml | 22 modules/core/arquillian-integration/container/src/test/resources/test-dependent-rhq-plugin.xml | 20 modules/core/arquillian-integration/container/src/test/resources/test-manual-rhq-plugin.xml | 20 modules/core/arquillian-integration/container/src/test/resources/test-rhq-plugin.xml | 18 modules/core/arquillian-integration/container/src/test/resources/test-systeminfo-rhq-plugin.xml | 18 modules/core/arquillian-integration/pom.xml | 27 modules/core/client-api/pom.xml | 2 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/configuration/ConfigurationUtility.java | 239 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/discovery/DiscoveryAgentService.java | 26 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java | 68 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/measurement/MeasurementAgentService.java | 10 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/ConfigurationMetadataParser.java | 117 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/DriftMetadataParser.java | 41 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/MetricsMetadataParser.java | 43 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataManager.java | 153 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/PluginMetadataParser.java | 111 modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/metadata/i18n/PropertiesGenerator.java | 18 modules/core/client-api/src/main/java/org/rhq/core/clientapi/descriptor/AgentPluginDescriptorUtil.java | 2 modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationResults.java | 2 modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/CoreServerService.java | 222 modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/PingRequest.java | 77 modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/discovery/DiscoveryServerService.java | 15 modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/drift/DriftServerService.java | 95 modules/core/client-api/src/main/java/org/rhq/core/clientapi/util/TimeUtil.java | 1 modules/core/client-api/src/main/java/org/rhq/core/clientapi/util/units/DurationFormatter.java | 2 modules/core/client-api/src/main/resources/rhq-configuration.xsd | 15 modules/core/client-api/src/main/resources/rhq-plugin.xsd | 44 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/configuration/ConfigurationUtilityTest.java | 322 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ConfigurationMetadataParserTest.java | 2 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/ExtensionModelTest.java | 28 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/MetadataManagerTest.java | 31 modules/core/client-api/src/test/java/org/rhq/core/clientapi/agent/metadata/test/PluginMetadataParserTest.java | 143 modules/core/client-api/src/test/resources/test-extension.xml | 21 modules/core/comm-api/pom.xml | 11 modules/core/dbutils/pom.xml | 96 modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseType.java | 57 modules/core/dbutils/src/main/java/org/rhq/core/db/DbUtil.java | 7 modules/core/dbutils/src/main/java/org/rhq/core/db/ExtendedSQLException.java | 43 modules/core/dbutils/src/main/java/org/rhq/core/db/H2DatabaseType.java | 11 modules/core/dbutils/src/main/java/org/rhq/core/db/OracleDatabaseType.java | 37 modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java | 16 modules/core/dbutils/src/main/java/org/rhq/core/db/PostgresqlDatabaseType.java | 11 modules/core/dbutils/src/main/java/org/rhq/core/db/SQLServerDatabaseType.java | 18 modules/core/dbutils/src/main/java/org/rhq/core/db/TypeMap.java | 6 modules/core/dbutils/src/main/java/org/rhq/core/db/ant/Base64.java | 319 modules/core/dbutils/src/main/java/org/rhq/core/db/ant/DbAntI18NFactory.java | 4 modules/core/dbutils/src/main/java/org/rhq/core/db/ant/DbAntI18NResourceKeys.java | 7 modules/core/dbutils/src/main/java/org/rhq/core/db/ant/MD5Task.java | 10 modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/DBUpgrader.java | 1 modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/SST_CreateSequence.java | 22 modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/SST_DropTable.java | 14 modules/core/dbutils/src/main/java/org/rhq/core/db/builders/CreateSequenceExprBuilder.java | 265 modules/core/dbutils/src/main/java/org/rhq/core/db/reset/DBReset.java | 145 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/Column.java | 22 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/ConstraintImpl_PK.java | 2 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/DBSetup.java | 12 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/DataSet.java | 12 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/H2Column.java | 9 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/OracleColumn.java | 8 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/PostgresColumn.java | 7 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/Table.java | 27 modules/core/dbutils/src/main/java/org/rhq/core/db/setup/View.java | 12 modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/AbstractConfigurationObfuscationUpgradeTask.java | 313 modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/ContentSourceConfigurationObfuscationUpgradeTask.java | 57 modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftPathDirectoryDatabaseUpgradeTask.java | 71 modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/DriftTemplateMapDatabaseUpgradeTask.java | 116 modules/core/dbutils/src/main/scripts/dbsetup-build.xml | 9 modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml | 9 modules/core/dbutils/src/main/scripts/dbsetup/authz-data.xml | 2 modules/core/dbutils/src/main/scripts/dbsetup/cluster-schema.xml | 1 modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 77 modules/core/dbutils/src/main/scripts/dbsetup/dbsetup-schema.xsd | 1 modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml | 2 modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml | 42 modules/core/dbutils/src/main/scripts/dbsetup/obsolete-schema.xml | 5 modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 686 modules/core/dbutils/src/test/java/org/rhq/core/db/AbstractDatabaseTestUtil.java | 2 modules/core/dbutils/src/test/java/org/rhq/core/db/DatabaseTest.java | 30 modules/core/dbutils/src/test/java/org/rhq/core/db/ant/dbupdate/SchemaVersionTest.java | 2 modules/core/domain/pom.xml | 32 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java | 69 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionCategory.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java | 15 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionOperator.java | 88 modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java | 52 modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionDriftCategoryComposite.java | 40 modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionRangeCategoryComposite.java | 48 modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java | 10 modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleVersion.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/common/EntityContext.java | 20 modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java | 12 modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java | 200 modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSettings.java | 100 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/AbstractConfigurationUpdate.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java | 92 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationUtility.java | 334 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java | 138 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PluginConfigurationUpdate.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Property.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyMap.java | 5 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/ConfigurationDefinition.java | 17 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionMap.java | 53 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionSimple.java | 3 modules/core/domain/src/main/java/org/rhq/core/domain/content/InstalledPackage.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageBits.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java | 18 modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/PackageListItemComposite.java | 17 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractConfigurationUpdateCriteria.java | 28 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AbstractGroupConfigurationUpdateCriteria.java | 8 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertCriteria.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AvailabilityCriteria.java | 131 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BaseCriteria.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftChangeSetCriteria.java | 159 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftConfigurationCriteria.java | 87 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftCriteria.java | 13 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionCriteria.java | 96 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DriftDefinitionTemplateCriteria.java | 63 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftChangeSetCriteria.java | 77 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GenericDriftCriteria.java | 64 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupPluginConfigurationUpdateCriteria.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupResourceConfigurationUpdateCriteria.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftChangeSetCriteria.java | 111 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/JPADriftCriteria.java | 53 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/MeasurementDataTraitCriteria.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceCriteria.java | 19 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java | 12 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java | 27 modules/core/domain/src/main/java/org/rhq/core/domain/discovery/AvailabilityReport.java | 25 modules/core/domain/src/main/java/org/rhq/core/domain/drift/Drift.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSet.java | 63 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftChangeSetCategory.java | 2 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComplianceStatus.java | 37 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftComposite.java | 33 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfiguration.java | 390 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationComparator.java | 136 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftConfigurationDefinition.java | 342 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinition.java | 543 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionComparator.java | 162 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionComposite.java | 60 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDefinitionTemplate.java | 283 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftDetails.java | 126 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshot.java | 184 modules/core/domain/src/main/java/org/rhq/core/domain/drift/DriftSnapshotRequest.java | 187 modules/core/domain/src/main/java/org/rhq/core/domain/drift/Filter.java | 8 modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADrift.java | 22 modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftChangeSet.java | 141 modules/core/domain/src/main/java/org/rhq/core/domain/drift/JPADriftSet.java | 69 modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftChangeSetDTO.java | 28 modules/core/domain/src/main/java/org/rhq/core/domain/drift/dto/DriftDTO.java | 12 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/Availability.java | 603 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/AvailabilityType.java | 98 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/DataType.java | 49 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementData.java | 8 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric.java | 10 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataRequest.java | 61 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataTrait.java | 5 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDefinition.java | 19 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementSchedule.java | 5 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementScheduleRequest.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementUnits.java | 5 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/ResourceAvailability.java | 40 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/ResourceMeasurementScheduleRequest.java | 68 modules/core/domain/src/main/java/org/rhq/core/domain/plugin/PluginKey.java | 23 modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPluginControlDefinition.java | 73 modules/core/domain/src/main/java/org/rhq/core/domain/plugin/ServerPluginControlResults.java | 93 modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java | 34 modules/core/domain/src/main/java/org/rhq/core/domain/resource/CannotConnectToAgentException.java | 52 modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 157 modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceError.java | 4 modules/core/domain/src/main/java/org/rhq/core/domain/resource/ResourceType.java | 72 modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/AgentLastAvailabilityPingComposite.java | 99 modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/AgentLastAvailabilityReportComposite.java | 99 modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/PlatformMetricsSummary.java | 221 modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceAvailabilitySummary.java | 247 modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceInstallCount.java | 48 modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceTypeTemplateCountComposite.java | 19 modules/core/domain/src/main/java/org/rhq/core/domain/resource/flyweight/FlyweightCache.java | 37 modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java | 132 modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java | 245 modules/core/domain/src/main/java/org/rhq/core/domain/server/EntitySerializer.java | 296 modules/core/domain/src/main/java/org/rhq/core/domain/server/ExternalizableStrategy.java | 64 modules/core/domain/src/main/java/org/rhq/core/domain/server/H2CustomDialect.java | 45 modules/core/domain/src/main/java/org/rhq/core/domain/server/PersistenceUtility.java | 563 modules/core/domain/src/main/java/org/rhq/core/domain/sync/ImportReport.java | 44 modules/core/domain/src/main/java/org/rhq/core/domain/util/MeasurementDefinitionFilter.java | 44 modules/core/domain/src/main/java/org/rhq/core/domain/util/PageControl.java | 44 modules/core/domain/src/main/java/org/rhq/core/domain/util/PasswordObfuscationUtility.java | 136 modules/core/domain/src/main/java/org/rhq/core/domain/util/ResourceFilter.java | 43 modules/core/domain/src/main/java/org/rhq/core/domain/util/ResourceTypeUtility.java | 81 modules/core/domain/src/main/java/org/rhq/core/domain/util/ResourceUtility.java | 74 modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java | 15 modules/core/domain/src/main/java/org/rhq/core/domain/util/TypeAndKeyResourceFilter.java | 25 modules/core/domain/src/main/java/org/rhq/core/domain/util/UnlimitedPageControl.java | 2 modules/core/domain/src/main/java/org/rhq/core/server/EntitySerializer.java | 281 modules/core/domain/src/main/java/org/rhq/core/server/ExternalizableStrategy.java | 64 modules/core/domain/src/main/java/org/rhq/core/server/H2CustomDialect.java | 45 modules/core/domain/src/main/java/org/rhq/core/server/PersistenceUtility.java | 563 modules/core/domain/src/main/resources/META-INF/persistence.xml | 2 modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationUtilityTest.java | 363 modules/core/domain/src/test/java/org/rhq/core/domain/configuration/test/ConfigurationDefinitionTest.java | 2 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java | 298 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDataAccessTest.java | 62 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDefinitionTemplateTest.java | 326 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDefinitionTest.java | 397 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftFileTest.java | 63 modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftSnapshotTest.java | 469 modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java | 157 modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java | 390 modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/CompositeLoadingTest.java | 28 modules/core/domain/src/test/java/org/rhq/core/domain/measurement/test/MeasurementTest.java | 11 modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java | 6 modules/core/domain/src/test/java/org/rhq/core/domain/resource/ResourceTypeTest.java | 4 modules/core/domain/src/test/java/org/rhq/core/domain/resource/composite/ResourceAvailabilitySummaryTest.java | 519 modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/AgentTest.java | 88 modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ProblemResourceTest.java | 4 modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java | 4 modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceGroupTest.java | 6 modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceTest.java | 3 modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java | 13 modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java | 5 modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java | 2 modules/core/domain/src/test/java/org/rhq/core/domain/test/SerializableTest.java | 18 modules/core/domain/src/test/java/org/rhq/core/domain/util/PasswordObfuscationUtilityTest.java | 144 modules/core/domain/src/test/resources/log4j.xml | 1 modules/core/gui/pom.xml | 15 modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractPropertyBagUIComponentTreeFactory.java | 2 modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java | 42 modules/core/gui/src/main/java/org/rhq/core/gui/configuration/MapInConfigurationUIComponentTreeFactory.java | 67 modules/core/gui/src/main/java/org/rhq/core/gui/configuration/MapInListUIComponentTreeFactory.java | 65 modules/core/gui/src/main/java/org/rhq/core/gui/configuration/propset/ConfigurationSet.java | 4 modules/core/native-system/ant-run.xml | 3 modules/core/native-system/pom.xml | 69 modules/core/native-system/src/main/java/org/rhq/core/system/FileSystemInfo.java | 22 modules/core/native-system/src/main/java/org/rhq/core/system/NativeSystemInfo.java | 35 modules/core/native-system/src/main/java/org/rhq/core/system/ProcessExecution.java | 6 modules/core/native-system/src/main/java/org/rhq/core/system/ProcessInfo.java | 160 modules/core/native-system/src/test/java/org/rhq/core/system/JavaTest.java | 2 modules/core/native-system/src/test/java/org/rhq/core/system/NativeSystemInfoTest.java | 8 modules/core/native-system/src/test/java/org/rhq/core/system/WindowsTest.java | 2 modules/core/plugin-api/pom.xml | 66 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityCollectorRunnable.java | 21 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityContext.java | 101 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/availability/AvailabilityFacet.java | 3 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/bundle/BundleDeployRequest.java | 1 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/bundle/BundleDeployResult.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/bundle/BundleFacet.java | 3 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/bundle/BundleManagerProvider.java | 3 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/bundle/BundlePurgeRequest.java | 8 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/bundle/BundlePurgeResult.java | 1 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ConfigurationFacet.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ListPropertySimpleWrapper.java | 69 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/MapPropertySimpleWrapper.java | 87 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ResourceConfigurationFacet.java | 3 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/configuration/ResourceConfigurationUpdateException.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/content/FileContentDelegate.java | 373 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/content/JarContentDelegate.java | 147 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/EventContext.java | 7 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessor.java | 26 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventPoller.java | 112 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/event/log/LogFileEventResourceComponentHelper.java | 188 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ClassLoaderFacet.java | 3 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/CreateResourceReport.java | 13 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DiscoveredResourceDetails.java | 94 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/InvalidPluginConfigurationException.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ManualAddFacet.java | 3 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/PluginContainerDeployment.java | 3 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceComponent.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceContext.java | 318 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryComponent.java | 7 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceDiscoveryContext.java | 22 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/ResourceTypeProcesses.java | 57 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/measurement/MeasurementFacet.java | 37 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/operation/OperationResult.java | 5 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/plugin/PluginContext.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/plugin/PluginLifecycleListener.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/support/SnapshotReportRequest.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/support/SnapshotReportResults.java | 2 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/support/SupportFacet.java | 1 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext.java | 47 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/upgrade/ResourceUpgradeFacet.java | 5 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/CommandLineOption.java | 97 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/JavaCommandLine.java | 418 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ProcessExecutionUtility.java | 100 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/SelectiveSkippingEntityResolver.java | 80 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/ServerStartScriptDiscoveryUtility.java | 308 modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/util/StartScriptConfiguration.java | 217 modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/content/FileContentDelegateTest.java | 209 modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/content/JarContentDelegateTest.java | 85 modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/event/log/Log4JLogEntryProcessorTest.java | 251 modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/inventory/ResourceContextTest.java | 409 modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/JavaCommandLineTest.java | 163 modules/core/plugin-api/src/test/java/org/rhq/core/pluginapi/util/StartScriptConfigurationTest.java | 136 modules/core/plugin-api/src/test/resources/sampleWithImplementation.war |binary modules/core/plugin-api/src/test/resources/sampleWithManifest.war |binary modules/core/plugin-api/src/test/resources/sampleWithSpecification.war |binary modules/core/plugin-api/src/test/resources/sampleWithSpecificationImplementation.war |binary modules/core/plugin-api/src/test/resources/sampleWithoutManifest.war |binary modules/core/plugin-container-itest/pom.xml | 77 modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/avail/AvailTest.java | 551 modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/DiscoveryTest.java | 221 modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/InventoryManagerTest.java | 202 modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/getnativeprocess/NativeProcessRetrievalTest.java | 165 modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/getnativeprocess/testplugin/TestComponent.java | 88 modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/getnativeprocess/testplugin/TestDiscoveryComponent.java | 53 modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/getnativeprocess/testprocess/Main.java | 38 modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/testplugin/ManualAddDiscoveryComponent.java | 34 modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/testplugin/TestResourceComponent.java | 150 modules/core/plugin-container-itest/src/test/java/org/rhq/core/pc/inventory/testplugin/TestResourceDiscoveryComponent.java | 64 modules/core/plugin-container-itest/src/test/java/org/rhq/plugins/test/avail/AvailDiscoveryComponent.java | 54 modules/core/plugin-container-itest/src/test/java/org/rhq/plugins/test/avail/AvailResourceComponent.java | 56 modules/core/plugin-container-itest/src/test/resources/arquillian.launch | 4 modules/core/plugin-container-itest/src/test/resources/arquillian.xml | 31 modules/core/plugin-container-itest/src/test/resources/avail-rhq-plugin.xml | 49 modules/core/plugin-container-itest/src/test/resources/getnativeprocess-rhq-plugin.xml | 24 modules/core/plugin-container-itest/src/test/resources/log4j.xml | 36 modules/core/plugin-container-itest/src/test/resources/test-great-grandchild-discovery-plugin.xml | 60 modules/core/plugin-container-itest/src/test/resources/test-rhq-plugin.xml | 21 modules/core/plugin-container/pom.xml | 61 modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java | 379 modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainerConfiguration.java | 114 modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java | 199 modules/core/plugin-container/src/main/java/org/rhq/core/pc/availability/AvailabilityCollectorThreadPool.java | 7 modules/core/plugin-container/src/main/java/org/rhq/core/pc/availability/AvailabilityContextImpl.java | 89 modules/core/plugin-container/src/main/java/org/rhq/core/pc/bundle/BundleManager.java | 43 modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationCheckExecutor.java | 69 modules/core/plugin-container/src/main/java/org/rhq/core/pc/configuration/ConfigurationManager.java | 6 modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/ContentManager.java | 8 modules/core/plugin-container/src/main/java/org/rhq/core/pc/content/RetrieveContentBitsRunner.java | 13 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManager.java | 28 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ChangeSetManagerImpl.java | 74 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftClient.java | 19 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSchedule.java | 23 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetectionSummary.java | 108 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java | 794 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftFilesSender.java | 134 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftInputStream.java | 93 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java | 627 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/FilterFileVisitor.java | 10 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueue.java | 74 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/ScheduleQueueImpl.java | 167 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/SnapshotGenerator.java | 7 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSyncManager.java | 174 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSynchronizer.java | 92 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/DriftSynchronizerFactory.java | 37 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/RuntimeSynchronizer.java | 140 modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/sync/StartupSynchronizer.java | 137 modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventContextImpl.java | 94 modules/core/plugin-container/src/main/java/org/rhq/core/pc/event/EventManager.java | 14 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AutoDiscoveryExecutor.java | 38 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java | 447 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ForceAvailabilityExecutor.java | 45 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryFile.java | 46 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 930 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 129 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceFactoryManager.java | 6 modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/RuntimeDiscoveryExecutor.java | 147 modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementCollectorRunner.java | 172 modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 112 modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementSenderRunner.java | 27 modules/core/plugin-container/src/main/java/org/rhq/core/pc/operation/OperationServicesAdapter.java | 2 modules/core/plugin-container/src/main/java/org/rhq/core/pc/operation/OperationThreadPoolGateway.java | 8 modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginClassLoader.java | 32 modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java | 42 modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java | 82 modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/Command.java | 50 modules/core/plugin-container/src/main/java/org/rhq/core/pc/standaloneContainer/History.java | 24 modules/core/plugin-container/src/main/java/org/rhq/core/pc/support/SupportManager.java | 3 modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java | 30 modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/DiscoveryComponentProxyFactory.java | 28 modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/InventoryPrinter.java | 59 modules/core/plugin-container/src/main/java/org/rhq/core/pc/util/LoggingThreadFactory.java | 9 modules/core/plugin-container/src/test/java/org/rhq/core/pc/PluginContainerTest.java | 51 modules/core/plugin-container/src/test/java/org/rhq/core/pc/bundle/BundleManagerTest.java | 33 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java | 28 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftClientTestStub.java | 53 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java | 929 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftFilesSenderTest.java | 172 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftManagerTest.java | 278 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftTest.java | 80 modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/FilterFileVisitorTest.java | 71 modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java | 11 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/AbstractResourceUpgradeHandlingTest.java | 133 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeFailureHandlingTest.java | 100 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeProgressHandlingTest.java | 46 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTest.java | 25 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/ResourceUpgradeTestBase.java | 2 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/duplicate/v2/rhq-plugin.xml | 2 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/failing/DiscComponent.java | 14 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/failing/ResComponent.java | 14 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/BaseDiscoveryComponent.java | 2 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/BaseResourceComponent.java | 54 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/BaseUpgradingDiscoveryComponent.java | 10 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/multi/base/NothingDiscoveringDiscoveryComponent.java | 3 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v1/DiscComponent.java | 4 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v1/ResComponent.java | 4 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v2/DiscComponent.java | 8 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/plugins/v2/ResComponent.java | 4 modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerTest.java | 146 modules/core/plugin-test-api/pom.xml | 103 modules/core/plugin-test-util/pom.xml | 40 modules/core/plugin-test-util/src/main/java/org/rhq/core/plugin/testutil/AbstractAgentPluginTest.java | 590 modules/core/plugin-validator/pom.xml | 2 modules/core/plugindoc/pom.xml | 40 modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/PluginDocGenerator.java | 171 modules/core/plugindoc/src/main/java/org/rhq/core/tool/plugindoc/VelocityTemplateProcessor.java | 14 modules/core/plugindoc/src/main/resources/common-macros.vm | 5 modules/core/pom.xml | 30 modules/core/util/pom.xml | 12 modules/core/util/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java | 16 modules/core/util/src/main/java/org/rhq/core/clientapi/util/StringUtil.java | 547 modules/core/util/src/main/java/org/rhq/core/util/Base64.java | 319 modules/core/util/src/main/java/org/rhq/core/util/ByteUtil.java | 59 modules/core/util/src/main/java/org/rhq/core/util/PropertiesFileUpdate.java | 78 modules/core/util/src/main/java/org/rhq/core/util/StringUtil.java | 556 modules/core/util/src/main/java/org/rhq/core/util/ZipUtil.java | 33 modules/core/util/src/main/java/org/rhq/core/util/exception/ThrowableUtil.java | 32 modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java | 165 modules/core/util/src/main/java/org/rhq/core/util/jdbc/JDBCUtil.java | 15 modules/core/util/src/main/java/org/rhq/core/util/maven/MavenArtifactProperties.java | 12 modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java | 102 modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java | 172 modules/core/util/src/main/java/org/rhq/core/util/updater/Deployer.java | 211 modules/core/util/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java | 78 modules/core/util/src/test/java/org/rhq/core/util/PropertiesFileUpdateTest.java | 30 modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java | 98 modules/core/util/src/test/java/org/rhq/core/util/stream/StreamUtilTest.java | 18 modules/core/util/src/test/java/org/rhq/core/util/updater/DeployerTest.java | 49 modules/core/util/src/test/java/org/rhq/core/util/updater/SimpleDeployerTest.java | 197 modules/enterprise/agent/ant-run.xml | 18 modules/enterprise/agent/pom.xml | 52 modules/enterprise/agent/src/etc/product_connectors/README.txt | 20 modules/enterprise/agent/src/etc/rhq-agent-env.bat | 30 modules/enterprise/agent/src/etc/rhq-agent-env.sh | 9 modules/enterprise/agent/src/etc/rhq-agent-wrapper-ec2 | 173 modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh | 43 modules/enterprise/agent/src/etc/rhq-agent.bat | 10 modules/enterprise/agent/src/etc/rhq-agent.sh | 80 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfiguration.java | 22 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentConfigurationConstants.java | 20 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 293 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/ExternalizableStrategyCommandPreprocessor.java | 2 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 51 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentSetupInstructions.java | 11 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/AvailabilityPromptCommand.java | 22 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/DiscoveryPromptCommand.java | 26 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/PluginContainerPromptCommand.java | 11 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/SetupPromptCommand.java | 6 modules/enterprise/agent/src/main/resources/agent-configuration.xml | 32 modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm1Test.java | 2 modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm2Test.java | 2 modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm3Test.java | 2 modules/enterprise/agent/src/test/java/org/rhq/enterprise/agent/AgentComm4Test.java | 2 modules/enterprise/agentupdate/pom.xml | 10 modules/enterprise/agentupdate/src/main/java/org/rhq/enterprise/agent/update/AgentUpdate.java | 25 modules/enterprise/binding/pom.xml | 113 modules/enterprise/binding/src/main/java/org/rhq/bindings/SandboxedScriptEngine.java | 3 modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java | 177 modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java | 58 modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java | 6 modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java | 13 modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java | 69 modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManagers.java | 73 modules/enterprise/binding/src/main/java/org/rhq/bindings/engine/JsEngineInitializer.java | 43 modules/enterprise/binding/src/main/java/org/rhq/bindings/engine/ScriptEngineInitializer.java | 15 modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java | 130 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/NoTopLevelIndirection.java | 41 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ResourceTypeFingerprint.java | 2 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptAssert.java | 443 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptAssertionException.java | 32 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptUtil.java | 12 modules/enterprise/binding/src/test/java/org/rhq/bindings/ScriptEngineTest.java | 9 modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java | 170 modules/enterprise/binding/src/test/java/org/rhq/bindings/util/ScriptAssertTest.java | 171 modules/enterprise/comm/pom.xml | 9 modules/enterprise/comm/src/main/java/org/rhq/enterprise/communications/command/client/ClientCommandSender.java | 16 modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/command/client/ClientCommandSenderTest.java | 2 modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/command/client/PersistentFifoTest.java | 2 modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/command/client/RemotingTest.java | 4 modules/enterprise/comm/src/test/java/org/rhq/enterprise/communications/command/client/SendThrottleTest.java | 2 modules/enterprise/gui/base-perspective-jar/pom.xml | 7 modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java | 2 modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java | 2 modules/enterprise/gui/base-perspective-war/pom.xml | 7 modules/enterprise/gui/content_http-war/pom.xml | 11 modules/enterprise/gui/coregui/pom.xml | 125 modules/enterprise/gui/coregui/src/main/java/org/rhq/core/client/RHQDomain.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 81 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ErrorMessageWindow.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/IconEnum.java | 136 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 280 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/InitializableView.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 177 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 458 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/PopupWindow.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 118 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewChangedException.java | 43 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewPath.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 132 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java | 152 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java | 408 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java | 131 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java | 252 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java | 432 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java | 436 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java | 702 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 115 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 44 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 66 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java | 208 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java | 220 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java | 183 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeNodeBuilder.java | 43 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java | 389 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesDataSource.java | 159 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesView.java | 113 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/SubjectRoleSelector.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java | 71 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 56 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java | 88 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java | 248 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java | 83 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertPortletConfigurationDataSource.java | 79 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java | 362 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java | 43 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java | 135 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsDataSource.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java | 735 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsDataSource.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java | 30 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/selection/SingleCompatibleResourceGroupSelector.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 58 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java | 21 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 26 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleVersionDataSource.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 21 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesDataSource.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesWithLatestVersionDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/GetRevertInfoStep.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 26 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 74 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/EnhancedListGrid.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/HeaderLabel.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/ReportExporter.java | 259 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java | 217 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java | 1121 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/CarouselMember.java | 35 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/CarouselWidget.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/AggregateConfigurationBuilder.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java | 97 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 302 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java | 622 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/PropertyMapListGridRecord.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DateFilterItem.java | 115 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java | 27 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/IsLongValidator.java | 127 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/NumberWithUnitsValidator.java | 112 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/RadioGroupWithComponentsItem.java | 52 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SimpleEditableFormItem.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 42 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java | 45 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java | 126 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java | 67 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java | 133 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableAction.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java | 37 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AuthorizedTableAction.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/BooleanCellFormatter.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/EscapedHtmlCellFormatter.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/ResourceAuthorizedTableAction.java | 37 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/StringIDTableSection.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/SubjectRecordCellFormatter.java | 32 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 502 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java | 27 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java | 515 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackForm.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/DynamicCallbackFormImplIE6.java | 43 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PluginFileUploadForm.java | 34 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java | 24 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/HasViewName.java | 30 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/NavigationItem.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/ViewName.java | 35 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizard.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/Wizard.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java | 38 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 96 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardContainer.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 72 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 147 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletHelpWindow.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java | 148 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/FavoriteGroupsPortlet.java | 151 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java | 25 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java | 61 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java | 44 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 73 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java | 89 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java | 24 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupGraphPortlet.java | 41 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 62 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceGraphPortlet.java | 46 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java | 83 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 443 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java | 73 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/AbstractRecentDriftsPortlet.java | 42 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/drift/RecentDriftsPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourceDS.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java | 118 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/AbstractOperationHistoryPortlet.java | 60 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java | 65 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 88 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java | 26 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java | 88 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java | 38 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 69 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java | 25 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java | 32 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/AbstractDriftChangeSetsTreeDataSource.java | 212 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/AbstractDriftChangeSetsTreeView.java | 419 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java | 256 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 374 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftChangeSetsView.java | 86 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftConfigurationDataSource.java | 268 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftConfigurationEditView.java | 194 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftConfigurationView.java | 240 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDataSource.java | 68 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java | 464 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java | 198 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateDataSource.java | 312 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java | 186 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateSnapshotView.java | 50 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java | 485 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java | 284 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java | 316 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java | 128 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDataSource.java | 200 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDriftDetailsView.java | 82 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java | 532 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftChangeSetsTreeDataSource.java | 84 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftChangeSetsTreeView.java | 99 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftChangeSetsView.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftConfigurationView.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftDefinitionsView.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java | 30 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/util/DiffUtility.java | 112 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/AbstractDriftAddConfigWizard.java | 93 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/AbstractDriftAddDefinitionWizard.java | 104 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/AbstractDriftPinTemplateWizard.java | 110 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizard.java | 159 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardConfigStep.java | 76 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardInfoStep.java | 125 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizard.java | 193 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardConfigStep.java | 111 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddDefinitionWizardInfoStep.java | 162 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizard.java | 166 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardConfigStep.java | 126 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftPinTemplateWizardInfoStep.java | 238 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertTemplateGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AvailabilityGWTService.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/DriftGWTService.java | 90 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 25 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/PlatformUtilizationGWTService.java | 36 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/PluginGWTService.java | 189 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java | 38 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java | 37 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/TestGWTService.java | 34 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java | 81 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/i18n/TestMessages.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 195 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java | 39 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListDetailView.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleCompositeDataSource.java | 202 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleDataSource.java | 229 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java | 152 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java | 158 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/SchedulesDataSource.java | 212 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java | 21 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 37 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java | 68 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java | 29 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java | 39 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 60 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 50 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 98 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupDataSourceField.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 89 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionDataSource.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java | 30 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 42 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java | 31 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java | 74 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 253 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 48 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 37 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java | 36 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java | 36 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java | 25 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/ResourceGroupSchedulesView.java | 139 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java | 160 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java | 56 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java | 54 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java | 42 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDataSource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 61 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/AbstractGroupCreateWizard.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java | 63 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java | 63 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AvailabilityTypeResourceAuthorizedTableAction.java | 70 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 104 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 268 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/OverviewForm.java | 57 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 225 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceErrorsView.java | 43 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 77 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeDatasource.java | 68 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 450 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java | 206 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java | 176 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java | 176 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java | 101 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 41 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryDataSource.java | 179 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java | 110 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java | 103 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryView.java | 103 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/AvailabilityBarView.java | 158 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java | 22 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/AvailabilityBarView.java | 161 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java | 399 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/ResourceSchedulesView.java | 143 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java | 159 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesView.java | 56 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDataSource.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/AutodiscoveryQueueDataSource.java | 24 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 94 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 46 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryImportWizard.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourcePicker.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java | 17 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 244 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java | 53 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java | 63 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 101 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java | 191 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 92 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java | 256 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java | 38 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigurationHistoryListView.java | 37 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceDataSource.java | 89 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java | 113 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReportTable.java | 73 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/InventorySummaryDataSource.java | 130 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/InventorySummaryReportTable.java | 203 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java | 112 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java | 55 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 23 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java | 38 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java | 111 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestDataSourceResponseStatisticsView.java | 22 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java | 78 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRemoteServiceStatisticsView.java | 24 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRpcView.java | 52 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java | 37 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java | 23 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CriteriaUtility.java | 125 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java | 35 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/GwtRelativeDurationConverter.java | 38 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/Log.java | 87 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/MeasurementConverterClient.java | 69 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 188 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/StringUtility.java | 35 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/TreeUtility.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/WidgetUtility.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/async/CompoundAsyncOperationException.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/measurement/GwtMeasurementConverter.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/measurement/MeasurementParser.java | 121 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java | 23 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 24 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCTracker.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRemoteServiceProxy.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/TrackingRequestCallback.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AbstractGWTServiceImpl.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AgentGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertTemplateGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AuthorizationGWTServiceImpl.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AvailabilityGWTServiceImpl.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleDistributionFileUploadServlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleFileUploadServlet.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/BundleGWTServiceImpl.java | 40 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ClusterGWTServiceImpl.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ContentGWTServiceImpl.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/DashboardGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/DriftGWTServiceImpl.java | 155 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/FileUploadServlet.java | 24 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/GroupAlertDefinitionGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/GroupDefinitionExpressionBuilderGWTServiceImpl.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/LdapGWTServiceImpl.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementChartsGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java | 33 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementScheduleGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ObjectFilter.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PackageVersionFileUploadServlet.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PlatformUtilizationGWTServiceImpl.java | 48 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PluginFileUploadServlet.java | 113 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PluginGWTServiceImpl.java | 508 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RemoteInstallGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RepoGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceBossGWTServiceImpl.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 79 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceTypeGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/RoleGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 78 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java | 85 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/TagGWTServiceImpl.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/TestGWTServiceImpl.java | 43 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/core/RHQDomain.gwt.xml | 14 modules/enterprise/gui/coregui/src/main/resources/org/rhq/core/gwtoverrides/org/rhq/core/domain/configuration/ObfuscatedPropertySimple.java | 66 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 136 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties | 40 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties | 34 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties | 31 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties | 35 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 434 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 2052 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1553 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 564 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 893 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 2455 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 404 modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 27 modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 79 modules/enterprise/gui/coregui/src/main/webapp/css/search.css | 7 modules/enterprise/gui/coregui/src/main/webapp/images/availBar/disabled.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/global/Admin_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/global/Admin_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/global/Help_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/global/Help_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/global/Inventory_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/global/Inventory_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/global/permission_checked_disabled_11.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/header/rhq_logo_40px.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/resources/all_resources.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_orange_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_orange_16_Disabled.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/availability/availability_orange_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Pinned_active.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/drift/Pinned_inactive.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/CreateChild_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/CreateChild_failed_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/CreateChild_success_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/DeleteChild_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/DeleteChild_failed_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/inventory/DeleteChild_success_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/report/Document_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/report/Document_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/types/Cluster_disabled_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/types/Cluster_disabled_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/types/Group_disabled_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/types/Group_disabled_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/types/Server_disabled_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/types/Server_disabled_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_disabled_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_disabled_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_unknown_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_unknown_24.png |binary modules/enterprise/gui/coregui/src/main/webapp/org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/standard/images/blank.gif |binary modules/enterprise/gui/installer-war/pom.xml | 16 modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java | 38 modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/PropertyItem.java | 17 modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java | 119 modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerProperties.java | 9 modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/i18n/InstallerI18NResourceKeys.java | 377 modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_ko.properties | 256 modules/enterprise/gui/installer-war/src/main/resources/InstallerMessages_pt.properties | 1 modules/enterprise/gui/installer-war/src/main/resources/org/rhq/enterprise/installer/ProductInfo.properties | 9 modules/enterprise/gui/installer-war/src/main/webapp/WEB-INF/faces-config.xml | 1 modules/enterprise/gui/installer-war/src/main/webapp/header.jsp | 34 modules/enterprise/gui/installer-war/src/main/webapp/start.jsp | 17 modules/enterprise/gui/installer-war/src/main/webapp/welcome.jsp | 1 modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java | 99 modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-2.3.0.xml | 661 modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-2.3.1.xml | 663 modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-3.0.0.xml | 690 modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.2.0.xml | 396 modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml | 398 modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-2.3.0.xml | 1916 modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-2.3.1.xml | 1916 modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-3.0.0.xml | 2649 modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.2.0.xml | 2642 modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.3.0.xml | 2649 modules/enterprise/gui/pom.xml | 17 modules/enterprise/gui/portal-war/pom.xml | 14 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java | 15 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/config/SystemConfigForm.java | 18 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/InstalledPluginsUIBean.java | 6 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/plugin/ServerPluginControlUIBean.java | 9 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java | 24 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/AuthenticateUserAction.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java | 34 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/client/RemoteClientServlet.java | 32 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/error/GenericErrorUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/upload/FileUploadUIBean.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java | 134 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/DeployPackagesUIBean.java | 17 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/download/DownloadServlet.java | 12 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java | 108 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/DisambiguatedResourceLineageRenderer.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/Portal.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/WebUserPreferences.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/BaseDispatchAction.java | 7 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/events/EventDetailsAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/PortalAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/PortalAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/MetricsDisplayAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/MetricsFilterForm.java | 3 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewDesignatedChartAction.java | 147 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/inventory/GroupForm.java | 38 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/hub/HubForm.java | 14 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/beans/OptionItem.java | 3 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/RemovePrefixTag.java | 3 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/DisambiguatedResourceNameTag.java | 8 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/util/ContextUtils.java | 18 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/graphs/IndicatorChartsUIBean.java | 17 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/ExternalizableStrategyCommandListener.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/StartupServlet.java | 169 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/StatisticsUtility.java | 2 modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 4 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/struts-config.xml | 81 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml | 9 modules/enterprise/gui/portal-war/src/main/webapp/admin/test/browser.jsp | 2 modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp | 30 modules/enterprise/gui/portal-war/src/main/webapp/admin/test/hibernate.jsp | 2 modules/enterprise/gui/portal-war/src/main/webapp/admin/test/sql.jsp | 2 modules/enterprise/gui/portal-war/src/main/webapp/common/Error.jsp | 2 modules/enterprise/gui/portal-war/src/main/webapp/common/GenericError.jsp | 46 modules/enterprise/gui/portal-war/src/main/webapp/images/icn_create_child.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icn_create_child_failed.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icn_create_child_success.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icn_delete_child.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icn_delete_child_failed.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icn_delete_child_success.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Drift_16.png |binary modules/enterprise/gui/portal-war/src/main/webapp/images/timeline_orange.gif |binary modules/enterprise/gui/portal-war/src/main/webapp/index.html | 6 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventAlertJSON.jsp | 12 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventConfigJSON.jsp | 7 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventContentJSON.jsp | 15 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventCreateDeleteChildJSON.jsp | 28 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp | 64 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventEventsJSON.jsp | 40 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventInventoryJSON.jsp | 52 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventOperationsJSON.jsp | 20 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventPluginConfigJSON.jsp | 10 modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp | 54 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/error.xhtml | 20 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/availability/data.xhtml | 143 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/graphs-plain.xhtml | 65 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/measurement/data-plain.xhtml | 17 modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/monitor/response-plain.xhtml | 63 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml | 3 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml | 4 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item-plain.xhtml | 7 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item.xhtml | 7 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml | 19 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create.xhtml | 19 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml | 7 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/view-plain.xhtml | 2 modules/enterprise/gui/rest-war/pom.xml | 289 modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/AuthFilter.java | 86 modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/jboss-web.xml | 6 modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml | 92 modules/enterprise/gui/rest-war/src/main/webapp/bars_simple.html | 131 modules/enterprise/gui/rest-war/src/main/webapp/index.html | 37 modules/enterprise/gui/rest-war/src/main/webapp/js/d3.behavior.js | 198 modules/enterprise/gui/rest-war/src/main/webapp/js/d3.chart.js | 984 modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js | 92 modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js | 938 modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js | 835 modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js | 4695 modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js | 1889 modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js | 687 modules/enterprise/gui/rest-war/src/main/webapp/js/jquery.js | 9266 modules/enterprise/gui/rest-war/src/main/webapp/js/resource_tree.js | 65 modules/enterprise/gui/rest-war/src/main/webapp/js/rhq.js | 120 modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html | 184 modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html | 225 modules/enterprise/gui/rest-war/src/main/webapp/stacked1.html | 145 modules/enterprise/gui/rest-war/src/main/webapp/stacked2.html | 139 modules/enterprise/gui/rest-war/src/main/webapp/stacked3.html | 95 modules/enterprise/gui/rest-war/src/main/webapp/tree.html | 44 modules/enterprise/gui/rest-war/src/main/webapp/whisker.html | 53 modules/enterprise/gui/rest-war/src/main/webapp/whisker2.html | 35 modules/enterprise/gui/webdav-war/pom.xml | 12 modules/enterprise/pom.xml | 14 modules/enterprise/remoting/cli/pom.xml | 17 modules/enterprise/remoting/cli/src/etc/rhq-cli.sh | 66 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java | 387 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/InteractiveJavascriptCompletor.java | 51 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ClientCommand.java | 2 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java | 36 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java | 49 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LogoutCommand.java | 11 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/QuitCommand.java | 5 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/RecordCommand.java | 21 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java | 98 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/VersionCommand.java | 51 modules/enterprise/remoting/cli/src/main/samples/README.txt | 25 modules/enterprise/remoting/cli/src/main/samples/add-as7-standalone-server-to-cluster.js | 583 modules/enterprise/remoting/cli/src/main/samples/bundles.js | 154 modules/enterprise/remoting/cli/src/main/samples/deploy-to-and-restart-JBAS.js | 244 modules/enterprise/remoting/cli/src/main/samples/drift.js | 243 modules/enterprise/remoting/cli/src/main/samples/measurement_utils.js | 144 modules/enterprise/remoting/cli/src/main/samples/util.js | 286 modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml | 14 modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java | 2 modules/enterprise/remoting/client-api/pom.xml | 25 modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java | 499 modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java | 96 modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java | 506 modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClientProxy.java | 101 modules/enterprise/remoting/client-deps/pom.xml | 2 modules/enterprise/remoting/pom.xml | 3 modules/enterprise/remoting/webservices/pom.xml | 8 modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsRepoManagerTest.java | 2 modules/enterprise/server/client-api/pom.xml | 78 modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java | 277 modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java | 20 modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java | 101 modules/enterprise/server/container-lib/pom.xml | 17 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java | 251 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java | 36 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java | 110 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java | 264 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java | 75 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java | 187 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java | 69 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java | 96 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java | 85 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java | 33 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java | 222 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java | 76 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java | 71 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java | 185 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java | 81 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java | 104 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java | 94 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java | 45 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java | 32 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java | 55 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java | 195 modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java | 59 modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java | 145 modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java | 180 modules/enterprise/server/container/pom.xml | 108 modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh | 27 modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js | 484 modules/enterprise/server/container/src/main/downloadable-resources/connectors/README.txt | 22 modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt | 17 modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-log4j.xml | 6 modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/jboss-service.xml | 7 modules/enterprise/server/container/src/main/resources/jbossas/server/default/conf/login-config.xml | 16 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/alert-cache-service.xml | 11 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jbossws.sar/jbossws-management.war/WEB-INF/web.xml | 78 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/jmx-console.war.rej/WEB-INF/web.xml | 107 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-cache-service.xml | 173 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-mdb-service.xml | 40 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/index.html | 6 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/start.jsf | 2 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf | 2 modules/enterprise/server/container/src/main/scripts/rhq-container.assembly.xml | 5 modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 89 modules/enterprise/server/ear/pom.xml | 109 modules/enterprise/server/itests/pom.xml | 340 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java | 215 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java | 238 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginService.java | 146 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginServiceMBean.java | 25 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java | 614 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/InitDB.java | 32 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java | 311 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java | 326 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java | 276 modules/enterprise/server/itests/src/test/resources/META-INF/ejb-jar.xml | 28 modules/enterprise/server/itests/src/test/resources/binary-blob-sample.jar |binary modules/enterprise/server/itests/src/test/resources/default.persistence.properties | 22 modules/enterprise/server/itests/src/test/resources/ejb3-interceptors-aop.xml | 360 modules/enterprise/server/itests/src/test/resources/embedded-jboss-beans.xml | 168 modules/enterprise/server/itests/src/test/resources/jboss-jms-beans.xml | 132 modules/enterprise/server/itests/src/test/resources/jms-ra.rar |binary modules/enterprise/server/itests/src/test/resources/jndi.properties | 2 modules/enterprise/server/itests/src/test/resources/log4j.xml | 74 modules/enterprise/server/itests/src/test/resources/login-config.xml | 72 modules/enterprise/server/itests/src/test/resources/rhq-mdb-beans.xml | 25 modules/enterprise/server/itests/src/test/resources/security-beans.xml | 13 modules/enterprise/server/itests/src/test/resources/security.policy | 10 modules/enterprise/server/itests/src/test/resources/test-assist-color-number.txt | 46 modules/enterprise/server/itests/src/test/resources/test-ldap.properties | 2 modules/enterprise/server/itests/src/test/resources/test-scheduler.properties | 29 modules/enterprise/server/itests/src/test/resources/testng.xml | 12 modules/enterprise/server/jar/pom.xml | 350 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/RHQConstants.java | 73 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/agentclient/impl/AgentClientImpl.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertConditionManagerBean.java | 19 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 553 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 20 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerBean.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/AlertConditionCacheManagerLocal.java | 18 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AbstractConditionCache.java | 27 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AgentConditionCache.java | 146 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheCoordinator.java | 59 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/AlertConditionCacheUtils.java | 114 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java | 118 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitor.java | 87 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/mbean/AlertConditionCacheMonitorMBean.java | 32 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AbstractCacheElement.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AbstractEnumCacheElement.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AlertConditionOperator.java | 78 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityCacheElement.java | 57 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java | 171 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationComposite.java | 66 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/CallTimeDataCacheElement.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/DriftCacheElement.java | 104 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/EventCacheElement.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/MeasurementBaselineCacheElement.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/MeasurementNumericCacheElement.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/MeasurementRangeNumericCacheElement.java | 97 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/MeasurementTraitCacheElement.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/NumericDoubleCacheElement.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/ResourceConfigurationCacheElement.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/ResourceOperationCacheElement.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/StringCacheElement.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/i18n/AlertI18NResourceKeys.java | 221 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java | 36 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 131 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerRemote.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/prefs/SubjectPreferencesBase.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/prefs/SubjectPreferencesCache.java | 16 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 30 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 165 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerLocal.java | 72 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerRemote.java | 27 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/PartitionEventManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/CacheConsistencyManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/instance/ServerManagerBean.java | 11 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 321 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java | 76 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/util/ConfigurationMaskingUtility.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/AdvisoryManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 81 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java | 34 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java | 53 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java | 36 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentUIManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java | 143 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java | 66 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java | 102 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentService.java | 56 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/concurrency/LatchedServiceController.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/LdapLoginModule.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScanner.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScannerMBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java | 33 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ServerPluginScanner.java | 41 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/AgentInventoryStatusUpdateJob.java | 94 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 167 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossRemote.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryServerServiceImpl.java | 55 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftChangesetBean.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftFileBean.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 672 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerLocal.java | 145 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerRemote.java | 92 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftServerServiceImpl.java | 94 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBean.java | 223 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerLocal.java | 34 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftTemplateManagerRemote.java | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUploadRequest.java | 19 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftUtil.java | 59 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerBean.java | 370 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/JPADriftServerLocal.java | 34 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/ResourceListAdapter.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/jaxb/adapter/WsResource.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java | 411 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerLocal.java | 39 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerRemote.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityPoint.java | 59 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java | 23 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 72 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementPreferences.java | 33 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementProblemManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 298 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerLocal.java | 112 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerRemote.java | 71 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/NotifyAgentsOfScheduleUpdatesJob.java | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/DataInserter.java | 19 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/DataReader.java | 84 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementDataManagerUtility.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 28 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsBean.java | 48 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/ServerPluginsLocal.java | 24 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/AbstractTypeServerPluginContainer.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginClassLoader.java | 36 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginManager.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftChangeSetSummary.java | 129 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/drift/DriftServerPluginFacet.java | 79 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/perspective/PerspectiveServerPluginManager.java | 24 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteWsInvocationHandler.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java | 171 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerLocal.java | 45 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAvailabilityManagerBean.java | 24 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceAvailabilityManagerLocal.java | 11 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 41 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 339 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerLocal.java | 24 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerRemote.java | 53 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBean.java | 16 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerRemote.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LDAPStringUtil.java | 100 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/LdapGroupManagerBean.java | 99 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 250 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 20 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/framework/ExpressionEvaluator.java | 37 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBean.java | 97 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginConfigurationMetadataManagerBean.java | 18 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java | 82 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerLocal.java | 19 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 208 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java | 379 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerBean.java | 185 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerLocal.java | 84 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java | 111 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java | 286 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerLocal.java | 78 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java | 678 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java | 185 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java | 315 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerLocal.java | 94 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ParameterMissingException.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RHQApplication.java | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ReportsInterceptor.java | 163 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java | 335 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java | 114 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/SetCallerInterceptor.java | 124 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerBean.java | 77 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerLocal.java | 41 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StuffNotFoundException.java | 34 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerBean.java | 147 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerLocal.java | 56 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AlertDefinitionRest.java | 84 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AlertRest.java | 148 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/AvailabilityRest.java | 83 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Baseline.java | 58 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/GroupRest.java | 82 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Link.java | 50 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricAggregate.java | 180 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/MetricSchedule.java | 169 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/NumericDataPoint.java | 65 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/OperationDefinitionRest.java | 52 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/OperationHistoryRest.java | 72 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/OperationRest.java | 117 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/RHQErrorWrapper.java | 28 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithChildren.java | 65 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/ResourceWithType.java | 135 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Status.java | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/StringValue.java | 28 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionHandler.java | 140 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/AlertDefinitionLocal.java | 16 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryHandler.java | 100 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ConfigurationHistoryLocal.java | 18 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/CsvWriter.java | 68 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/CsvWriterException.java | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DateConverter.java | 39 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceHandler.java | 104 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/DriftComplianceLocal.java | 41 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryHandler.java | 202 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/InventorySummaryLocal.java | 52 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/MeasurementConverter.java | 252 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationHandler.java | 135 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PlatformUtilizationLocal.java | 40 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/PropertyConverter.java | 31 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertHandler.java | 441 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentAlertLocal.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftHandler.java | 164 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentDriftLocal.java | 27 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsHandler.java | 132 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/RecentOperationsLocal.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/ReportFormatHelper.java | 96 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SimpleConverter.java | 47 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricHandler.java | 100 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/reporting/SuspectMetricLocal.java | 19 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedScheduler.java | 29 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/EnhancedSchedulerImpl.java | 44 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/SchedulerBean.java | 13 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/AlertAvailabilityDurationJob.java | 88 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/AsyncResourceDeleteJob.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java | 121 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java | 29 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/subsystem/AlertSubsystemManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/subsystem/ConfigurationSubsystemManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/subsystem/OperationHistorySubsystemManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/DefaultImportConfigurationDescriptor.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/ExportingInputStream.java | 100 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/MetricTemplateSynchronizer.java | 17 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationConstants.java | 112 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationManagerBean.java | 250 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationManagerLocal.java | 16 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizationManagerRemote.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizedEntity.java | 10 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SynchronizerFactory.java | 42 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/SystemSettingsSynchronizer.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/importers/Importer.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/importers/MetricTemplateImporter.java | 56 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/importers/SystemSettingsImporter.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/ConsistencyValidator.java | 36 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/DeployedAgentPluginsValidator.java | 14 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/EntityValidator.java | 52 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/MaxCountValidator.java | 52 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/MetricTemplateValidator.java | 121 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/SystemSettingsValidator.java | 48 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/validators/UniquenessValidator.java | 50 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerBean.java | 132 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemInfoManagerLocal.java | 48 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 325 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerRemote.java | 36 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/CoreTestBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/DiscoveryTestBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/MeasurementTestBean.java | 19 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQuery.java | 90 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryExecutor.java | 30 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 29 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/HibernatePerformanceMonitor.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/HibernateStatisticsStopWatch.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java | 93 modules/enterprise/server/jar/src/main/resources/rest_templates/group.ftl | 49 modules/enterprise/server/jar/src/main/resources/rest_templates/listGroup.ftl | 32 modules/enterprise/server/jar/src/main/resources/rest_templates/listMetricSchedule.ftl | 32 modules/enterprise/server/jar/src/main/resources/rest_templates/listResourceWithType.ftl | 32 modules/enterprise/server/jar/src/main/resources/rest_templates/metricData.ftl | 67 modules/enterprise/server/jar/src/main/resources/rest_templates/metricSchedule.ftl | 55 modules/enterprise/server/jar/src/main/resources/rest_templates/resourceWithType.ftl | 53 modules/enterprise/server/jar/src/main/resources/rest_templates/status.ftl | 36 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/engine/model/MeasurementRangeNumericCacheElementTest.java | 98 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 626 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertManagerBeanTest.java | 518 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/DeleteAlertsTest.java | 123 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/auth/test/SubjectManagerBeanTest.java | 105 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/BundleManagerBeanTest.java | 89 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java | 14 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java | 124 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/LargeGroupPluginConfigurationTest.java | 243 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/LargeGroupResourceConfigurationTest.java | 227 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBeanTest.java | 91 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanMockTest.java | 456 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentManagerBeanTest.java | 22 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentSourceManagerBeanTest.java | 23 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanEligiblePackagesTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java | 538 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java | 223 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/db/DbSetupTest.java | 70 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/db/DbUpgradeTest.java | 98 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java | 77 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 229 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java | 76 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/TestDefService.java | 72 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.java | 83 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java | 48 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AbstractMeasurementScheduleManagerTest.java | 129 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 626 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java | 54 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementScheduleManagerTest.java | 366 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementViewManagerTest.java | 9 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/operation/OperationManagerBeanTest.java | 132 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java | 10 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncContentProviderTest.java | 123 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderManagerSyncRepoTest.java | 107 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/cluster/ClusterManagerBeanTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/GroupWithUncommittedTest.java | 280 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LDAPStringUtilTest.java | 50 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LargeGroupCriteriaTest.java | 296 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/LdapGroupManagerBeanTest.java | 511 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/RecursiveResourceGroupTest.java | 118 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ContentMetadataManagerBeanTest.java | 137 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/EventMetadataManagerBeanTest.java | 75 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest.java | 205 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java | 125 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest.java | 152 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest.java | 169 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest.java | 407 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 88 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java | 224 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 338 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/PluginDescriptorValidationTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/SubcategoryTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateConfigurationSubsystemTest.java | 26 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateContentSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateEventsSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateMeasurementSubsystemTest.java | 22 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateNativesSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateOperationsSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 454 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceSubsystemTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateResourceTypeSubsystemTest.java | 16 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java | 407 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java | 22 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceGroupManagerBeanTest.java | 15 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceManagerBeanTest.java | 141 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceStorageTest.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJobTest.java | 33 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/DeployedAgentPluginsValidatorTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/ExportingInputStreamTest.java | 32 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MaxCountValidatorTest.java | 52 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MetricTemplateExporterTest.java | 26 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MetricTemplateImporterTest.java | 42 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/MetricTemplateValidatorTest.java | 161 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SynchronizationManagerBeanTest.java | 740 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SystemSettingsExporterTest.java | 5 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SystemSettingsImporterTest.java | 3 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/SystemSettingsValidatorTest.java | 22 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/UniquenessValidatorTest.java | 51 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/system/SystemManagerBeanTest.java | 98 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 186 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/DataAccessTest.java | 8 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/LargeGroupTestBase.java | 411 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java | 39 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java | 2 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java | 113 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestServerPluginServiceMBean.java | 25 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapContext.java | 2950 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeLdapCtxFactory.java | 61 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/ldap/FakeNamingEnumeration.java | 76 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/CriteriaQueryTest.java | 125 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/DbSetupUtility.java | 259 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/JaxbTest.java | 38 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/LoggerAntBuildListener.java | 105 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/ResourceTreeHelper.java | 53 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java | 63 modules/enterprise/server/jar/src/test/resources/embedded-jboss-beans.xml | 187 modules/enterprise/server/jar/src/test/resources/jboss-jms-beans.xml | 102 modules/enterprise/server/jar/src/test/resources/jms-ra.rar |binary modules/enterprise/server/jar/src/test/resources/log4j.xml | 45 modules/enterprise/server/jar/src/test/resources/login-config.xml | 9 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v1.xml | 16 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/configuration/metadata/configuration_metadata_manager_bean_test_v2.xml | 17 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml | 2 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml | 3 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v1.xml | 6 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MeasurementMetadataManagerBeanTest/plugin_v2.xml | 11 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataTest.xml | 36 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child1_plugin_v1.xml | 19 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/child2_plugin_v1.xml | 19 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v1.xml | 18 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionMetadataTest/parent_plugin_v2.xml | 18 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/child_plugin_v1.xml | 29 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v1.xml | 24 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/MultiplePluginExtensionSinglePluginDescriptorMetadataTest/parent_plugin_v2.xml | 24 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/child_plugin_v1.xml | 17 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v1.xml | 49 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginExtensionMetadataTest/parent_plugin_v2.xml | 67 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest/child1_plugin_v1.xml | 19 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest/child2_plugin_v1.xml | 19 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest/parent_plugin_v1.xml | 18 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest/parent_plugin_v2.xml | 18 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml | 8 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/parent_resource_type-plugin.xml | 29 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml | 8 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml | 8 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml | 4 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/util/db-data-combined-2.3.1.xml | 663 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/util/db-schema-combined-2.3.1.xml | 1916 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/util/test-ds.properties | 7 modules/enterprise/server/jar/src/test/resources/rhq-mdb-beans.xml | 25 modules/enterprise/server/jar/src/test/resources/test-ldap.properties | 2 modules/enterprise/server/jar/src/test/resources/test/metadata/alerts/type-with-metric.xml | 14 modules/enterprise/server/jar/src/test/resources/testng.bak.xml | 12 modules/enterprise/server/jar/src/test/resources/testng.xml | 12 modules/enterprise/server/plugins/alert-cli/pom.xml | 13 modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java | 27 modules/enterprise/server/plugins/alert-email/pom.xml | 13 modules/enterprise/server/plugins/alert-irc/pom.xml | 17 modules/enterprise/server/plugins/alert-log4j/pom.xml | 14 modules/enterprise/server/plugins/alert-microblog/pom.xml | 21 modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogSender.java | 107 modules/enterprise/server/plugins/alert-microblog/src/main/java/org/rhq/enterprise/server/plugins/alertMicroblog/MicroblogServerPluginComponent.java | 183 modules/enterprise/server/plugins/alert-microblog/src/main/resources/META-INF/rhq-serverplugin.xml | 41 modules/enterprise/server/plugins/alert-mobicents/pom.xml | 13 modules/enterprise/server/plugins/alert-operations/pom.xml | 10 modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/PrintTokens.java | 11 modules/enterprise/server/plugins/alert-roles/pom.xml | 10 modules/enterprise/server/plugins/alert-scriptlang/pom.xml | 18 modules/enterprise/server/plugins/alert-sms/pom.xml | 12 modules/enterprise/server/plugins/alert-snmp/pom.xml | 17 modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpSender.java | 16 modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java | 58 modules/enterprise/server/plugins/alert-subject/pom.xml | 20 modules/enterprise/server/plugins/ant-bundle/pom.xml | 17 modules/enterprise/server/plugins/cloud/pom.xml | 12 modules/enterprise/server/plugins/cobbler/pom.xml | 12 modules/enterprise/server/plugins/disk/pom.xml | 27 modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java | 35 modules/enterprise/server/plugins/disk/src/test/java/org/rhq/enterprise/server/plugins/disk/test/DiskSourceTest.java | 263 modules/enterprise/server/plugins/drift-mongodb/pom.xml | 29 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/Mapper.java | 65 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBDriftServer.java | 400 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/CategoryFilter.java | 42 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetDAO.java | 211 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetEntryFilter.java | 28 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetEntryFilters.java | 45 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/CreatedAfterFilter.java | 37 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/CreatedBeforeFilter.java | 36 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/DirectoryFilter.java | 17 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/FileDAO.java | 72 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/PathFilter.java | 37 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSet.java | 70 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBChangeSetEntry.java | 110 modules/enterprise/server/plugins/drift-mongodb/src/main/java/org/rhq/enterprise/server/plugins/drift/mongodb/entities/MongoDBFile.java | 33 modules/enterprise/server/plugins/drift-mongodb/src/main/resources/META-INF/rhq-serverplugin.xml | 8 modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/GridFSTest.java | 63 modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/MapperTest.java | 99 modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBDriftServerTest.java | 1106 modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/MongoDBTest.java | 152 modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/ChangeSetDAOTest.java | 923 modules/enterprise/server/plugins/drift-mongodb/src/test/java/org/rhq/enterprise/server/plugins/drift/mongodb/dao/FileDAOTest.java | 161 modules/enterprise/server/plugins/drift-rhq/pom.xml | 11 modules/enterprise/server/plugins/drift-rhq/src/main/java/org/rhq/enterprise/server/plugins/drift/JPADriftServerPluginComponent.java | 36 modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 15 modules/enterprise/server/plugins/filetemplate-bundle/src/main/java/org/rhq/enterprise/server/plugins/filetemplate/BundleServerPluginComponent.java | 16 modules/enterprise/server/plugins/filetemplate-bundle/src/main/resources/META-INF/rhq-serverplugin.xml | 8 modules/enterprise/server/plugins/groovy-script/pom.xml | 10 modules/enterprise/server/plugins/jboss-software/pom.xml | 14 modules/enterprise/server/plugins/jboss-software/src/main/java/org/rhq/enterprise/server/plugins/jboss/software/RssFeedParser.java | 17 modules/enterprise/server/plugins/jboss-software/src/test/java/org/rhq/enterprise/server/plugins/jboss/software/test/RssFeedParserTest.java | 13 modules/enterprise/server/plugins/packagetype-cli/pom.xml | 20 modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 modules/enterprise/server/plugins/perspectives/core/pom.xml | 12 modules/enterprise/server/plugins/perspectives/policy/app/pom.xml | 7 modules/enterprise/server/plugins/perspectives/policy/perspective/pom.xml | 2 modules/enterprise/server/plugins/perspectives/policy/pom.xml | 7 modules/enterprise/server/plugins/pom.xml | 14 modules/enterprise/server/plugins/rhnhosted/.gitignore | 1 modules/enterprise/server/plugins/rhnhosted/README.testing | 24 modules/enterprise/server/plugins/rhnhosted/pom.xml | 350 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXML.java | 369 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivator.java | 155 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNConstants.java | 33 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelper.java | 490 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProvider.java | 386 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReader.java | 138 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactory.java | 78 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSummary.java | 65 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/Certificate.java | 438 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/CertificateFactory.java | 145 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyDescriptor.java | 84 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/ChannelFamilyExtractor.java | 58 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/FieldExtractor.java | 41 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/PublicKeyRing.java | 137 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/RhnSecurityProvider.java | 67 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/SimpleExtractor.java | 97 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/certificate/XmlTag.java | 210 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/ApacheXmlRpcExecutor.java | 43 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransport.java | 174 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/CustomReqPropTransportFactory.java | 82 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnComm.java | 120 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnDownloader.java | 179 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnHttpURLConnectionFactory.java | 55 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransport.java | 114 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnJaxbTransportFactory.java | 29 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransport.java | 75 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnSSLTransportFactory.java | 75 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutor.java | 44 modules/enterprise/server/plugins/rhnhosted/src/main/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/XmlRpcExecutorFactory.java | 100 modules/enterprise/server/plugins/rhnhosted/src/main/resources/META-INF/rhq-serverplugin.xml | 42 modules/enterprise/server/plugins/rhnhosted/src/main/xsd/genSchema.sh | 4 modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channel_families.xml | 1 modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.channels.xml | 1 modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.errata.xml | 74 modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.kickstartable_trees.xml | 1 modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages.xml | 431 modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.packages_short.xml | 1 modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.product_names.xml | 1 modules/enterprise/server/plugins/rhnhosted/src/main/xsd/sample/sample-rhnhosted-dump.source_packages.xml | 5 modules/enterprise/server/plugins/rhnhosted/src/main/xsd/schema0.xsd | 403 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/BaseRHNTest.java | 107 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/PrimaryXMLTest.java | 154 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNActivatorTest.java | 75 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNHelperTest.java | 83 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNProviderTest.java | 233 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLCertReaderTest.java | 83 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/RHNSSLSocketFactoryTest.java | 104 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/BasicRHNTest.java | 627 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnHttpURLConnection.java | 51 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/MockRhnXmlRpcExecutor.java | 274 modules/enterprise/server/plugins/rhnhosted/src/test/java/org/rhq/enterprise/server/plugins/rhnhosted/xmlrpc/RhnCommTest.java | 399 modules/enterprise/server/plugins/rhnhosted/src/test/resources/test-log4j.xml | 464 modules/enterprise/server/plugins/url/pom.xml | 14 modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/FullRemotePackageInfo.java | 4 modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/RemotePackageInfo.java | 12 modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/SimpleIndexParser.java | 52 modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/UrlProvider.java | 6 modules/enterprise/server/plugins/url/src/main/java/org/rhq/enterprise/server/plugins/url/XmlIndexParser.java | 69 modules/enterprise/server/plugins/url/src/test/java/org/rhq/enterprise/server/plugins/url/XmlIndexParserTest.java | 8 modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 12 modules/enterprise/server/plugins/yum/pom.xml | 11 modules/enterprise/server/plugins/yum/src/main/java/org/rhq/enterprise/server/plugins/yum/Repo.java | 13 modules/enterprise/server/pom.xml | 14 modules/enterprise/server/safe-invoker/pom.xml | 11 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/EJB3SafeEndpointInvoker.java | 58 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/EJB3SafeEndpointInvokerDeploymentAspect.java | 59 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtility.java | 610 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/EJB3SafeEndpointInvoker.java | 58 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/EJB3SafeEndpointInvokerDeploymentAspect.java | 59 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java | 569 modules/enterprise/server/safe-invoker/src/test/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtilityTest.java | 142 modules/enterprise/server/safe-invoker/src/test/java/org/rhq/enterprise/server/util/HibernateDetachUtilityTest.java | 141 modules/enterprise/server/sars/agent-sar/pom.xml | 8 modules/enterprise/server/sars/agent-sar/src/main/resources/META-INF/embedded-agent-configuration.xml | 13 modules/enterprise/server/sars/pom.xml | 7 modules/enterprise/server/xml-schemas/pom.xml | 11 modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtil.java | 744 modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ServerPluginDescriptorMetadataParser.java | 2 modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ServerPluginDescriptorUtil.java | 2 modules/enterprise/server/xml-schemas/src/test/java/org/rhq/enterprise/server/xmlschema/ConfigurationInstanceDescriptorUtilTest.java | 212 modules/helpers/bundleGen/pom.xml | 4 modules/helpers/bundleGen/src/main/java/org/rhq/helpers/bundleGen/BundleGen.java | 39 modules/helpers/inventory-serializer/pom.xml | 8 modules/helpers/jeeGen/pom.xml | 95 modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/JeeGen.java | 71 modules/helpers/jeeGen/src/main/java/org/rhq/helpers/jeegen/ejb/EjbArchive.java | 628 modules/helpers/jeeGen/src/main/java/test/ejb/EntityBean.java | 64 modules/helpers/jeeGen/src/main/java/test/ejb/EntityEJBHome.java | 27 modules/helpers/jeeGen/src/main/java/test/ejb/EntityEJBObject.java | 20 modules/helpers/jeeGen/src/main/java/test/ejb/MessageDrivenBean.java | 109 modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionBean.java | 71 modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionEJBHome.java | 15 modules/helpers/jeeGen/src/main/java/test/ejb/StatefulSessionEJBObject.java | 16 modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionBean.java | 35 modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionEJBHome.java | 14 modules/helpers/jeeGen/src/main/java/test/ejb/StatelessSessionEJBObject.java | 13 modules/helpers/jeeGen/src/main/resources/org/rhq/helpers/jeegen/ejb/v2/ejb-jar.xml.ftl | 110 modules/helpers/perftest-support/data.sh | 2 modules/helpers/perftest-support/pom.xml | 4 modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/Exporter.java | 13 modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/dbsetup/DbSetup.java | 15 modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/dbunit/EntityRelationshipFilter.java | 98 modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/jpa/mapping/MappingTranslator.java | 4 modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/testng/DatabaseSetupInterceptor.java | 8 modules/helpers/perftest-support/src/test/java/org/rhq/helpers/perftest/test/DummyTest.java | 1 modules/helpers/perftest-support/src/test/java/org/rhq/helpers/perftest/test/ExcelExporterTest.java | 27 modules/helpers/pluginAnnotations/pom.xml | 5 modules/helpers/pluginGen/pom.xml | 6 modules/helpers/pluginGen/src/main/java/org/rhq/helpers/pluginGen/PluginGen.java | 1 modules/helpers/pluginGen/src/main/resources/pom.ftl | 1 modules/helpers/pom.xml | 15 modules/helpers/rtfilter-subsystem/pom.xml | 108 modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterExtension.java | 223 modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemAdd.java | 69 modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemDefinition.java | 45 modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/RtFilterSubsystemRemove.java | 44 modules/helpers/rtfilter-subsystem/src/main/java/org/rhq/helpers/rtfilter/subsystem/deployment/RtFilterDeploymentUnitProcessor.java | 141 modules/helpers/rtfilter-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension | 1 modules/helpers/rtfilter-subsystem/src/main/resources/module/main/module.xml | 27 modules/helpers/rtfilter-subsystem/src/main/resources/org/rhq/helpers/rtfilter/subsystem/LocalDescriptions.properties | 3 modules/helpers/rtfilter-subsystem/src/main/resources/schema/rtfilter-subsystem.xsd | 129 modules/helpers/rtfilter-subsystem/src/main/scripts/module-assembly.xml | 31 modules/helpers/rtfilter-subsystem/src/test/java/org/rhq/helpers/rtfilter/subsystem/SubsystemXmlParsingTest.java | 68 modules/helpers/rtfilter/pom.xml | 54 modules/helpers/rtfilter/src/main/java/org/rhq/helpers/rtfilter/filter/RtFilter.java | 44 modules/helpers/rtfilter/src/main/resources/module/main/module.xml | 15 modules/helpers/rtfilter/src/main/scripts/module-assembly.xml | 31 modules/integration-tests/apache-plugin-test/pom.xml | 12 modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/setup/ApacheTestSetup.java | 14 modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java | 3 modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java | 2 modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java | 43 modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java | 28 modules/integration-tests/jboss-as-7-plugin-test/pom.xml | 84 modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/AbstractIntegrationTest.java | 178 modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/ConfigurationTest.java | 149 modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/DatasourceDeployTest.java | 429 modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/MiscTest.java | 49 modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/ServerGroupTest.java | 89 modules/integration-tests/jboss-as-7-plugin-test/src/test/java/org/rhq/modules/integrationTests/jbossas7plugin/UploadAndDeployTest.java | 431 modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 327 modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java | 186 modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/hibernate.properties | 26 modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/jms-ra.rar |binary modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/log4j.xml | 78 modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/security.policy | 10 modules/integration-tests/jndi-access/pom.xml | 21 modules/integration-tests/jndi-access/remote-server/pom.xml | 72 modules/integration-tests/jndi-access/remote-server/src/main/java/org/rhq/jndi/test/Server.java | 79 modules/integration-tests/jndi-access/remote-server/src/main/resources/jndi.properties | 2 modules/integration-tests/jndi-access/remote-server/src/main/resources/log4j.properties | 5 modules/integration-tests/mod_cluster-plugin-test/pom.xml | 368 modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModClusterPluginIntegrationTest.java | 250 modules/integration-tests/mod_cluster-plugin-test/src/test/java/org/rhq/plugins/modcluster/test/ModclusterPluginTest.java | 210 modules/integration-tests/pom.xml | 53 modules/integration-tests/rest-api/README.md | 13 modules/integration-tests/rest-api/pom.xml | 56 modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/GetStatusTest.java | 78 modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java | 104 modules/jopr/dist/agent/pom.xml | 9 modules/jopr/dist/pom.xml | 9 modules/jopr/dist/server/pom.xml | 11 modules/jopr/etc/jbas5-jnp-client/README | 16 modules/jopr/etc/jbas5-jnp-client/client.sh | 26 modules/jopr/etc/jbas5-jnp-client/src/main/java/test/RmiClient.java | 27 modules/jopr/modules-plugins-pom.xml | 157 modules/jopr/modules-pom.xml | 255 modules/jopr/pom.xml | 10 modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml | 7 modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java | 17 modules/plugins/JBossOSGi/pom.xml | 7 modules/plugins/JBossOSGi/src/main/java/org/jboss/on/plugins/jbossOsgi/JBossOSGi/BundleComponent.java | 6 modules/plugins/aliases/pom.xml | 10 modules/plugins/ant-bundle/pom.xml | 15 modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 51 modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java | 268 modules/plugins/ant-bundle/src/test/resources/test-bundle-manage-root-dir.xml | 16 modules/plugins/apache/pom.xml | 18 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java | 22 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryDiscoveryComponent.java | 6 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheErrorLogEntryProcessor.java | 3 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheFilesComponent.java | 14 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleComponent.java | 17 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryComponent.java | 9 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDirectoryDiscoveryComponent.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheIfModuleDiscoveryComponent.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheLocationComponent.java | 14 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApachePluginLifecycleListener.java | 129 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java | 179 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 255 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerOperationsDelegate.java | 41 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 128 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java | 141 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ModJKComponent.java | 78 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ModJKDiscoveryComponent.java | 27 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/SNMPConstants.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/ApacheAugeasNode.java | 24 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/ApacheAugeasTree.java | 16 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java | 81 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasTreeBuilderApache.java | 10 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMap.java | 9 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingDirectivePerMapIndex.java | 3 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingParamPerMap.java | 6 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingPositionToConfiguration.java | 86 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMap.java | 187 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectivePerMapIndex.java | 286 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasDirectiveToSimple.java | 88 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/MappingToAugeasParamPerMap.java | 248 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/mappingImpl/Util.java | 11 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheAugeasMapping.java | 57 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheDirectiveRegExpression.java | 155 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ConfigurationToAugeasApacheBase.java | 11 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/DirectiveMapping.java | 77 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/SpecificParams.java | 92 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheConfigReader.java | 72 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheConfigWriter.java | 102 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirective.java | 176 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirectiveStack.java | 36 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheDirectiveTree.java | 66 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParser.java | 6 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserException.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java | 128 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/ApacheBinaryInfo.java | 29 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeSearch.java | 191 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/AugeasNodeValueUtil.java | 11 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/ConfigurationTimestamp.java | 33 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java | 168 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdConfParser.java | 53 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/OsProcessUtility.java | 52 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/PluginUtility.java | 46 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/RuntimeApacheConfiguration.java | 368 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java | 38 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java | 110 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/MIBLookupException.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPCacheObject.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPClient.java | 42 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPConnectException.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPException.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPSession.java | 34 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPSessionCache.java | 9 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPSession_v1.java | 50 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPSession_v2c.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPSession_v3.java | 2 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPTimeoutException.java | 30 modules/plugins/apache/src/main/java/org/rhq/plugins/www/snmp/SNMPValue.java | 6 modules/plugins/apache/src/main/java/org/rhq/plugins/www/util/WWWUtils.java | 222 modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 67 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasTest.java | 236 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasUtil.java | 257 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java | 18 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheTestConstants.java | 37 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/Components.java | 149 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/RuntimeConfigurationTest.java | 130 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/SnmpMappingTest.java | 55 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UnitTestException.java | 30 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/helper/LensFilter.java | 16 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/helper/LensHelper.java | 127 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheConfigurationUtil.java | 329 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/MockApacheBinaryInfo.java | 30 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/MockProcessInfo.java | 6 modules/plugins/augeas/pom.xml | 8 modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/AugeasNodeBuffer.java | 2 modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationComponent.java | 31 modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasConfigurationDiscoveryComponent.java | 10 modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/AugeasPluginLifecycleListener.java | 7 modules/plugins/augeas/src/main/java/org/rhq/plugins/augeas/test/AbstractAugeasConfigurationComponentTest.java | 9 modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/AugeasToConfigurationSimple.java | 7 modules/plugins/augeas/src/main/java/org/rhq/rhqtransform/impl/ConfigurationToAugeasSimple.java | 13 modules/plugins/byteman/pom.xml | 15 modules/plugins/byteman/src/main/resources/META-INF/rhq-plugin.xml | 15 modules/plugins/cobbler/pom.xml | 14 modules/plugins/cron/pom.xml | 12 modules/plugins/database/pom.xml | 2 modules/plugins/database/src/main/java/org/rhq/plugins/database/AbstractDatabaseComponent.java | 3 modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableComponent.java | 56 modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableDiscoveryComponent.java | 37 modules/plugins/database/src/main/java/org/rhq/plugins/database/CustomTableRowDiscoveryComponent.java | 26 modules/plugins/database/src/main/java/org/rhq/plugins/database/DatabaseComponent.java | 3 modules/plugins/database/src/main/java/org/rhq/plugins/database/DatabaseQueryUtility.java | 6 modules/plugins/filetemplate-bundle/pom.xml | 13 modules/plugins/grub/pom.xml | 10 modules/plugins/grub/src/main/java/org/rhq/plugins/grub/GrubComponent.java | 11 modules/plugins/hadoop/pom.xml | 6 modules/plugins/hardware/pom.xml | 2 modules/plugins/hardware/src/main/java/org/rhq/plugins/hardware/SmartDiskComponent.java | 2 modules/plugins/hardware/src/main/resources/META-INF/rhq-plugin.xml | 28 modules/plugins/hibernate/pom.xml | 17 modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/EntityComponent.java | 48 modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/EntityDiscoveryComponent.java | 50 modules/plugins/hibernate/src/main/java/org/rhq/plugins/hibernate/StatisticsComponent.java | 60 modules/plugins/hibernate/src/main/resources/META-INF/rhq-plugin.xml | 24 modules/plugins/hibernate/src/test/java/org/rhq/plugins/hibernate/test/HibernatePluginTest.java | 13 modules/plugins/hosts/pom.xml | 10 modules/plugins/hudson/pom.xml | 4 modules/plugins/hudson/src/main/java/org/rhq/plugins/hudson/HudsonServerComponent.java | 14 modules/plugins/iis/pom.xml | 15 modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISServerComponent.java | 9 modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostComponent.java | 10 modules/plugins/iis/src/main/java/org/rhq/plugins/iis/IISVHostDiscoveryComponent.java | 4 modules/plugins/iis/src/main/resources/META-INF/rhq-plugin.xml | 38 modules/plugins/iptables/pom.xml | 11 modules/plugins/irc/pom.xml | 5 modules/plugins/irc/src/main/java/org/rhq/plugins/irc/IRCServerComponent.java | 2 modules/plugins/irc/src/main/resources/META-INF/rhq-plugin.xml | 3 modules/plugins/jboss-as-5/pom.xml | 1315 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractEjbBeanComponent.java | 22 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedComponent.java | 26 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentComponent.java | 17 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/AbstractManagedDeploymentDiscoveryComponent.java | 115 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 31 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerContentFacetDelegate.java | 10 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 196 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java | 152 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/DatasourceOrConnectionFactoryComponent.java | 77 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java | 14 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingComponent.java | 17 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossMessagingDiscoveryComponent.java | 4 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebComponent.java | 22 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JBossWebDiscoveryComponent.java | 4 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/JmsDestinationDiscoveryComponent.java | 2 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 230 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentDiscoveryComponent.java | 13 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedDeploymentDiscoveryComponent.java | 4 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformComponent.java | 397 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/PlatformDiscoveryComponent.java | 128 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ProfileServiceComponent.java | 2 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/StandaloneManagedDeploymentComponent.java | 170 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java | 14 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/WebApplicationContextComponent.java | 217 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToCompositeValueSupportAdapter.java | 49 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToGenericValueAdapter.java | 87 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/PropertyMapToTableValueAdapter.java | 2 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/adapter/impl/configuration/custom/JMSSecurityConfigAdapter.java | 82 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java | 53 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java | 9 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstallationInfo.java | 12 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/JBossInstanceInfo.java | 19 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java | 85 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptDiscoveryComponent.java | 23 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/ManagerComponent.java | 13 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/serviceBinding/SetComponent.java | 8 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ConversionUtils.java | 241 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/FileContentDelegate.java | 349 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JBossConfigurationUtility.java | 2 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JarContentDelegate.java | 88 modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/JnpConfig.java | 86 modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 340 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/itest/AbstractJBossAS5PluginTest.java | 47 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/itest/ApplicationServerComponentTest.java | 292 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/AbstractPluginTest.java | 8 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/GeneralPluginTest.java | 2 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/QueueResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ScriptComponentTest.java | 110 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/StandaloneManagedDeploymentComponentTest.java | 183 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/TopicResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/AbstractEjb2ResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/Ejb2EntityBeanResourceTest.java | 12 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/Ejb2JarResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/Ejb2MDBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/Ejb2SFSBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb2/Ejb2SLSBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/AbstractEjb3ResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3EmbeddedMDBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3EmbeddedSFSBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3EmbeddedSLSBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3LocalInterfaceSFSBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3LocalInterfaceSLSBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3MDBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3SFSBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/ejb3/Ejb3SLSBResourceTest.java | 4 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/sbm/ServiceBindingManagerResourceTest.java | 2 modules/plugins/jboss-as-5/src/test/java/org/rhq/plugins/jbossas5/test/sbm/ServiceBindingSetResourceTest.java | 8 modules/plugins/jboss-as-5/src/test/resources/itest/arquillian.xml | 18 modules/plugins/jboss-as-5/src/test/resources/log4j.xml | 96 modules/plugins/jboss-as-5/testsuite/pom.xml | 11 modules/plugins/jboss-as-7/d2d.sh | 9 modules/plugins/jboss-as-7/json-api/domain.txt |153653 ++++++++ modules/plugins/jboss-as-7/json-api/standalone_full_ha.txt |173393 ++++++++++ modules/plugins/jboss-as-7/pom.xml | 832 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Authenticator.java | 26 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7CommandLine.java | 226 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Component.java | 26 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java | 65 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java | 412 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java | 67 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java | 299 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 783 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 694 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 602 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadDelegate.java | 267 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ConfigurationWriteDelegate.java | 583 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/CreateResourceDelegate.java | 119 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java | 211 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java | 364 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java | 1071 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DomainDeploymentComponent.java | 98 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HornetQComponent.java | 74 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostComponent.java | 70 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerComponent.java | 204 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java | 93 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java | 139 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JDRComponent.java | 62 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDefinitionComponent.java | 67 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JVMDiscoveryComponent.java | 51 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JmsComponent.java | 100 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/LoggerComponent.java | 20 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASComponent.java | 241 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ManagedASDiscovery.java | 243 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterComponent.java | 254 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterConfigurationDiscovery.java | 191 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextComponent.java | 84 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterContextDiscoveryComponent.java | 130 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModClusterDiscoveryComponent.java | 79 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModuleOptionsComponent.java | 867 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ModuleOptionsDiscoveryComponent.java | 188 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NamingComponent.java | 96 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/NetworkInterfaceComponent.java | 93 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java | 35 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SocketBindingGroupComponent.java | 40 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASComponent.java | 138 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java | 103 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/SubsystemDiscovery.java | 142 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/TemplatedComponent.java | 90 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/TemplatedSubResourcesComponent.java | 72 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ThreadingComponent.java | 61 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/VHostComponent.java | 66 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebConnectorComponent.java | 129 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java | 115 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostConfiguration.java | 306 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/HostPort.java | 47 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/helper/ServerPluginConfiguration.java | 141 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Address.java | 80 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Operation.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/PROPERTY_VALUE.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadAttribute.java | 9 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadChildrenResources.java | 2 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/ReadResource.java | 19 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/Result.java | 59 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/json/serializer/PropertyValueDeserializer.java | 1 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/modcluster/ProxyInfo.java | 349 modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml |14653 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AS7CommandLineTest.java | 58 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/AbstractConfigurationHandlingTest.java | 107 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/CompositeOperationTest.java | 2 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationLoadingTest.java | 571 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/ConfigurationUpdatingTest.java | 707 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/OperationJsonTest.java | 223 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/PathHandlingTest.java | 116 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/TemplatedComponentTest.java | 310 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/TemplatedSubResourcesComponentTest.java | 177 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/XmlFileReadingTest.java | 156 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractJBossAS7PluginTest.java | 142 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/AbstractServerComponentTest.java | 313 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java | 65 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainServerComponentTest.java | 126 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java | 217 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ManagedServerTest.java | 108 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/AbstractIntegrationTest.java | 193 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/ConfigurationTest.java | 148 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/DatasourceDeployTest.java | 397 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/MiscTest.java | 46 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/ServerGroupTest.java | 86 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/nonpc/UploadAndDeployTest.java | 407 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/package.html | 21 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/DeploymentTest.java | 320 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SecurityModuleOptionsTest.java | 525 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java | 237 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/StandaloneServerComponentTest.java | 175 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/TemplatedResourcesTest.java | 151 modules/plugins/jboss-as-7/src/test/resources/collapsedMapTest.json | 7 modules/plugins/jboss-as-7/src/test/resources/collapsedMapTest2.json | 7 modules/plugins/jboss-as-7/src/test/resources/expressionTest.json | 12 modules/plugins/jboss-as-7/src/test/resources/groupedproperties.json | 24 modules/plugins/jboss-as-7/src/test/resources/host1.xml | 92 modules/plugins/jboss-as-7/src/test/resources/host2.xml | 91 modules/plugins/jboss-as-7/src/test/resources/host3.xml | 91 modules/plugins/jboss-as-7/src/test/resources/itest/arquillian.xml | 18 modules/plugins/jboss-as-7/src/test/resources/itest/jbossas7-arquillian.xml | 19 modules/plugins/jboss-as-7/src/test/resources/itest/test-simple-2.war |binary modules/plugins/jboss-as-7/src/test/resources/itest/test-simple.war |binary modules/plugins/jboss-as-7/src/test/resources/listofplainmaps.json | 11 modules/plugins/jboss-as-7/src/test/resources/log4j.xml | 65 modules/plugins/jboss-as-7/src/test/resources/standalone70.xml | 433 modules/plugins/jboss-as-7/src/test/resources/standalone71.xml | 453 modules/plugins/jboss-as-7/src/test/resources/standalone711.xml | 325 modules/plugins/jboss-as-7/src/test/resources/system-props.json | 10 modules/plugins/jboss-as-7/src/test/resources/test-plugin.xml | 165 modules/plugins/jboss-as-7/src/test/resources/web.json | 62 modules/plugins/jboss-as/pom.xml | 58 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingComponent.java | 58 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingDiscoveryComponent.java | 6 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationComponent.java | 154 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ApplicationDiscoveryComponent.java | 16 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/ConnectionFactoryComponent.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/DatasourceComponent.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EJB2BeanComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EJB3BeanComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/EmbeddedWarDiscoveryComponent.java | 19 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBMDestinationDiscoveryComponent.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java | 146 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 62 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorComponent.java | 20 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatConnectorDiscoveryComponent.java | 26 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatDiscoveryComponent.java | 56 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatServerComponent.java | 8 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatVHostDiscoveryService.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASTomcatVHostService.java | 46 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMQDiscoveryComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMessagingComponent.java | 49 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossMessagingDiscoveryComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JMSComponent.java | 53 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarComponent.java | 127 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/WarDiscoveryComponent.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstallationInfo.java | 75 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/helper/JBossInstanceInfo.java | 9 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/script/ScriptComponent.java | 18 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/script/ScriptDiscoveryComponent.java | 75 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/AbstractMessagingConfigurationEditor.java | 9 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/ConnectionFactoryConfigurationEditor.java | 12 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DatasourceConfigurationEditor.java | 16 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/DeploymentUtility.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/FileContentDelegate.java | 181 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossConfigurationUtility.java | 2 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JBossMessagingConfigurationEditor.java | 6 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JMSConfigurationEditor.java | 4 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JarContentDelegate.java | 139 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/JnpConfig.java | 75 modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/util/WarDiscoveryHelper.java | 64 modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 189 modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/ApplicationComponentTest.java | 113 modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/FileContentDelegateTest.java | 269 modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JBossASPluginTest.java | 9 modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/JarContentDelegateTest.java | 86 modules/plugins/jboss-as/src/test/java/org/rhq/plugins/jbossas/test/util/DatasourceConfigurationEditorTest.java | 2 modules/plugins/jboss-as/src/test/resources/sampleWithImplementation.war |binary modules/plugins/jboss-as/src/test/resources/sampleWithManifest.war |binary modules/plugins/jboss-as/src/test/resources/sampleWithSpecification.war |binary modules/plugins/jboss-as/src/test/resources/sampleWithSpecificationImplementation.war |binary modules/plugins/jboss-as/src/test/resources/sampleWithoutManifest.war |binary modules/plugins/jboss-cache-v3/pom.xml | 75 modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheComponent.java | 60 modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailComponent.java | 206 modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDetailDiscoveryComponent.java | 4 modules/plugins/jboss-cache-v3/src/main/java/org/rhq/plugins/jbosscache3/JBossCacheDiscoveryComponent.java | 6 modules/plugins/jboss-cache-v3/src/main/resources/META-INF/rhq-plugin.xml | 8 modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/CacheComponentTest.java | 21 modules/plugins/jboss-cache-v3/src/test/java/org/rhq/plugins/jbosscache3/test/TestHelper.java | 2 modules/plugins/jboss-cache/pom.xml | 31 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/CacheConfigurationHelper.java | 93 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheComponent.java | 47 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheDiscoveryComponent.java | 6 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheSubsystemComponent.java | 2 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JBossCacheSubsystemDiscovery.java | 4 modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java | 4 modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml | 49 modules/plugins/jdbctrace/pom.xml | 14 modules/plugins/jira/pom.xml | 18 modules/plugins/jmx/pom.xml | 80 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/EmbeddedJMXServerDiscoveryComponent.java | 17 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/InternalJMXServerDiscoveryComponent.java | 30 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXComponent.java | 2 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java | 624 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java | 194 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java | 41 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceDiscoveryComponent.java | 47 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ObjectNameQueryUtility.java | 218 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/ParentDefinedJMXServerNamingUtility.java | 57 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ConnectionProviderFactory.java | 222 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmResourceKey.java | 179 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/JvmUtility.java | 152 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ObjectNameQueryUtility.java | 218 modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/util/ParentDefinedJMXServerNamingUtility.java | 57 modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 34 modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java | 211 modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/ObjectNameQueryUtilityTest.java | 2 modules/plugins/kickstart/pom.xml | 2 modules/plugins/lsof/pom.xml | 15 modules/plugins/mod-cluster/pom.xml | 79 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/CatalinaServiceComponent.java | 121 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanComponent.java | 63 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ClassNameMBeanDiscoveryComponent.java | 87 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextComponent.java | 102 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextDiscoveryComponent.java | 118 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/FileConfiguredMBeanResourceComponent.java | 153 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/LoadMetricDiscoveryComponent.java | 59 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterDiscoveryComponent.java | 85 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServerComponent.java | 70 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModClusterServiceComponent.java | 51 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ModclusterServerComponent.java | 45 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ProxyInfo.java | 310 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextComponent.java | 117 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/WebappContextDiscoveryComponent.java | 117 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/config/AbstractConfigurationFile.java | 85 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/config/JBossWebServerFile.java | 92 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/config/ModClusterBeanFile.java | 253 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/helper/JBossHelper.java | 49 modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/model/ProxyInfo.java | 310 modules/plugins/mod-cluster/src/main/resources/META-INF/rhq-plugin.xml | 616 modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ProxyInfoTest.java | 4 modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ServerConfigTest.java | 91 modules/plugins/mod-cluster/src/test/resources/xml_config/mod_cluster-jboss-beans.xml | 337 modules/plugins/mod-cluster/src/test/resources/xml_config/server.xml | 157 modules/plugins/mysql/pom.xml | 15 modules/plugins/mysql/src/main/java/org/rhq/plugins/mysql/MySqlComponent.java | 3 modules/plugins/mysql/src/main/resources/META-INF/rhq-plugin.xml | 26 modules/plugins/netservices/pom.xml | 17 modules/plugins/netservices/src/main/resources/META-INF/rhq-plugin.xml | 6 modules/plugins/onewire/pom.xml | 13 modules/plugins/onewire/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/oracle/pom.xml | 373 modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleServerComponent.java | 25 modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleUserComponent.java | 30 modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml | 53 modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/ComponentTest.java | 283 modules/plugins/oracle/src/test/java/org/rhq/plugins/oracle/OracleServerComponentTest.java | 95 modules/plugins/oracle/src/test/resources/log4j.xml | 35 modules/plugins/pattern-generator/pom.xml | 12 modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternComponent.java | 79 modules/plugins/pattern-generator/src/main/java/org/rhq/plugins/pattern/PatternDiscovery.java | 2 modules/plugins/pattern-generator/src/main/resources/META-INF/rhq-plugin.xml | 15 modules/plugins/perftest/pom.xml | 120 modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/PerfTestComponent.java | 19 modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/configuration/SimpleConfigurationFactory.java | 90 modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/event/PerfTestEventPoller.java | 2 modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/measurement/SimpleNumericMeasurementFactory.java | 16 modules/plugins/perftest/src/main/java/org/rhq/plugins/perftest/trait/SimpleTraitFactory.java | 20 modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml | 415 modules/plugins/perftest/src/main/resources/all-config.xml | 17 modules/plugins/perftest/src/main/resources/configurable-1.xml | 4 modules/plugins/perftest/src/main/resources/configurable-5.xml | 12 modules/plugins/platform/pom.xml | 19 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/CpuComponent.java | 11 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemComponent.java | 46 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/FileSystemDiscoveryComponent.java | 78 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/LinuxPlatformComponent.java | 51 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/NetworkAdapterComponent.java | 197 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/PlatformComponent.java | 7 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/PlatformDiscoveryComponent.java | 4 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/ProcessDiscoveryComponent.java | 11 modules/plugins/platform/src/main/java/org/rhq/plugins/platform/WindowsPlatformComponent.java | 21 modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml | 890 modules/plugins/pom.xml | 35 modules/plugins/postfix/pom.xml | 10 modules/plugins/postfix/src/main/java/org/rhq/plugins/postfix/PostfixAccessDiscoveryComponent.java | 5 modules/plugins/postgres/pom.xml | 17 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseComponent.java | 25 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseDiscoveryComponent.java | 10 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java | 31 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java | 28 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableComponent.java | 38 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableDiscoveryComponent.java | 2 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserComponent.java | 6 modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresUserDiscoveryComponent.java | 10 modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml | 20 modules/plugins/postgres/src/test/java/org/rhq/plugins/postgres/test/PostgresPluginTest.java | 2 modules/plugins/raw-config-test/pom.xml | 4 modules/plugins/rhq-agent/pom.xml | 29 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentDiscoveryComponent.java | 2 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentEnvironmentScriptComponent.java | 4 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentEnvironmentScriptDiscoveryComponent.java | 8 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentJavaServiceWrapperComponent.java | 8 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentJavaServiceWrapperDiscoveryComponent.java | 8 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentLauncherScriptComponent.java | 6 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentLauncherScriptDiscoveryComponent.java | 8 modules/plugins/rhq-agent/src/main/java/org/rhq/plugins/agent/AgentServerComponent.java | 5 modules/plugins/rhq-agent/src/main/resources/META-INF/rhq-plugin.xml | 74 modules/plugins/rhq-agent/src/test/java/org/rhq/plugins/agent/AgentPluginTest.java | 2 modules/plugins/rhq-server/pom.xml | 16 modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 90 modules/plugins/samba/pom.xml | 10 modules/plugins/samba/src/main/java/org/rhq/plugins/samba/SambaServerComponent.java | 39 modules/plugins/script/pom.xml | 11 modules/plugins/script/src/main/java/org/rhq/plugins/script/ScriptDiscoveryComponent.java | 2 modules/plugins/script/src/main/resources/META-INF/rhq-plugin.xml | 2 modules/plugins/script2/pom.xml | 14 modules/plugins/script2/src/main/java/org/rhq/modules/plugins/script2/ScriptComponent.java | 31 modules/plugins/services/pom.xml | 6 modules/plugins/snmptrapd/pom.xml | 14 modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapdComponent.java | 2 modules/plugins/snmptrapd/src/test/java/org/rhq/plugins/snmptrapd/ComponentTest.java | 22 modules/plugins/snmptrapd/src/test/java/org/rhq/plugins/snmptrapd/SnmpTrapdComponentTest.java | 46 modules/plugins/sshd/pom.xml | 10 modules/plugins/sshd/src/main/java/org/rhq/plugins/sshd/OpenSSHDComponent.java | 18 modules/plugins/sudoers/pom.xml | 12 modules/plugins/tomcat/pom.xml | 29 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorComponent.java | 64 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatConnectorDiscoveryComponent.java | 27 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceComponent.java | 35 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDatasourceDiscoveryComponent.java | 63 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatDiscoveryComponent.java | 47 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerComponent.java | 59 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatServerOperationsDelegate.java | 6 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java | 4 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostComponent.java | 20 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatVHostDiscoveryComponent.java | 11 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarComponent.java | 108 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatWarDiscoveryComponent.java | 4 modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/helper/FileContentDelegate.java | 178 modules/plugins/tomcat/src/main/resources/META-INF/rhq-plugin.xml | 122 modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/FileContentDelegateTest.java | 246 modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatPluginTest.java | 37 modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatVHostComponentTest.java | 155 modules/plugins/tomcat/src/test/java/org/jboss/on/plugins/tomcat/test/TomcatWarComponentTest.java | 270 modules/plugins/tomcat/src/test/resources/sampleWithImplementation.war |binary modules/plugins/tomcat/src/test/resources/sampleWithManifest.war |binary modules/plugins/tomcat/src/test/resources/sampleWithSpecification.war |binary modules/plugins/tomcat/src/test/resources/sampleWithSpecificationImplementation.war |binary modules/plugins/tomcat/src/test/resources/sampleWithoutManifest.war |binary modules/plugins/twitter/pom.xml | 8 modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/FeedComponent.java | 7 modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/TwitterComponent.java | 31 modules/plugins/twitter/src/main/resources/META-INF/rhq-plugin.xml | 6 modules/plugins/validate-all-plugins/pom.xml | 18 modules/plugins/virt/pom.xml | 10 modules/plugins/virt/src/main/java/org/rhq/plugins/virt/VirtualizationHostComponent.java | 2 modules/plugins/virt/src/main/resources/META-INF/rhq-plugin.xml | 12 modules/pom.xml | 49 modules/test-utils/pom.xml | 2 modules/test-utils/src/main/java/org/rhq/test/DuplicatePackagesDetector.java | 194 modules/test-utils/src/main/java/org/rhq/test/JPAUtils.java | 79 modules/test-utils/src/main/java/org/rhq/test/TransactionCallbackWithContext.java | 10 modules/test-utils/src/main/java/org/rhq/test/testng/StdoutReporter.java | 125 pom.xml | 588 publish.sh | 381 publish_release.sh | 318 release.sh | 984 rhq_bash.lib | 253 2508 files changed, 532421 insertions(+), 64096 deletions(-) ---

11 years, 10 months

1
0
0 / 0

[rhq] Branch 'rc/jon3.1.1.ER1' - modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml

by rhqci

modules/cli-tests/pom.xml | 2 +- modules/common/ant-bundle/pom.xml | 2 +- modules/common/drift/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/arquillian-integration/archive/pom.xml | 2 +- modules/core/arquillian-integration/container/pom.xml | 2 +- modules/core/arquillian-integration/pom.xml | 2 +- modules/core/client-api/pom.xml | 2 +- modules/core/comm-api/pom.xml | 2 +- modules/core/dbutils/pom.xml | 2 +- modules/core/domain/pom.xml | 2 +- modules/core/gui/pom.xml | 2 +- modules/core/native-system/pom.xml | 2 +- modules/core/plugin-api/pom.xml | 2 +- modules/core/plugin-container-itest/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-test-api/pom.xml | 2 +- modules/core/plugin-test-util/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/binding/pom.xml | 4 ++-- modules/enterprise/comm/pom.xml | 2 +- modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +- modules/enterprise/gui/base-perspective-war/pom.xml | 2 +- modules/enterprise/gui/content_http-war/pom.xml | 2 +- modules/enterprise/gui/coregui/pom.xml | 2 +- modules/enterprise/gui/installer-war/pom.xml | 2 +- modules/enterprise/gui/pom.xml | 2 +- modules/enterprise/gui/portal-war/pom.xml | 2 +- modules/enterprise/gui/rest-war/pom.xml | 2 +- modules/enterprise/pom.xml | 2 +- modules/enterprise/remoting/cli/pom.xml | 2 +- modules/enterprise/remoting/client-api/pom.xml | 2 +- modules/enterprise/remoting/client-deps/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/remoting/webservices/pom.xml | 2 +- modules/enterprise/server/client-api/pom.xml | 4 ++-- modules/enterprise/server/container-lib/pom.xml | 2 +- modules/enterprise/server/container/pom.xml | 2 +- modules/enterprise/server/ear/pom.xml | 2 +- modules/enterprise/server/itests/pom.xml | 2 +- modules/enterprise/server/jar/pom.xml | 2 +- modules/enterprise/server/plugins/alert-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++-- modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++-- modules/enterprise/server/plugins/disk/pom.xml | 2 +- modules/enterprise/server/plugins/drift-mongodb/pom.xml | 2 +- modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++-- modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +- modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +- modules/enterprise/server/plugins/pom.xml | 2 +- modules/enterprise/server/plugins/url/pom.xml | 2 +- modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +- modules/enterprise/server/plugins/yum/pom.xml | 2 +- modules/enterprise/server/pom.xml | 2 +- modules/enterprise/server/safe-invoker/pom.xml | 2 +- modules/enterprise/server/sars/agent-sar/pom.xml | 2 +- modules/enterprise/server/sars/pom.xml | 2 +- modules/enterprise/server/xml-schemas/pom.xml | 2 +- modules/helpers/bundleGen/pom.xml | 4 ++-- modules/helpers/jeeGen/pom.xml | 2 +- modules/helpers/perftest-support/pom.xml | 4 ++-- modules/helpers/pom.xml | 2 +- modules/helpers/rtfilter-subsystem/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/integration-tests/apache-plugin-test/pom.xml | 2 +- modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +- modules/integration-tests/jndi-access/pom.xml | 2 +- modules/integration-tests/jndi-access/remote-server/pom.xml | 2 +- modules/integration-tests/pom.xml | 2 +- modules/plugins/aliases/pom.xml | 2 +- modules/plugins/ant-bundle/pom.xml | 2 +- modules/plugins/apache/pom.xml | 2 +- modules/plugins/augeas/pom.xml | 2 +- modules/plugins/byteman/pom.xml | 2 +- modules/plugins/cobbler/pom.xml | 2 +- modules/plugins/cron/pom.xml | 2 +- modules/plugins/database/pom.xml | 2 +- modules/plugins/filetemplate-bundle/pom.xml | 2 +- modules/plugins/grub/pom.xml | 2 +- modules/plugins/hadoop/pom.xml | 2 +- modules/plugins/hibernate/pom.xml | 2 +- modules/plugins/hosts/pom.xml | 2 +- modules/plugins/hudson/pom.xml | 4 ++-- modules/plugins/iis/pom.xml | 2 +- modules/plugins/irc/pom.xml | 2 +- modules/plugins/jboss-as-5/pom.xml | 2 +- modules/plugins/jboss-as-7/pom.xml | 2 +- modules/plugins/jboss-as/pom.xml | 2 +- modules/plugins/jboss-cache-v3/pom.xml | 2 +- modules/plugins/jboss-cache/pom.xml | 2 +- modules/plugins/jmx/pom.xml | 2 +- modules/plugins/kickstart/pom.xml | 2 +- modules/plugins/mod-cluster/pom.xml | 2 +- modules/plugins/mysql/pom.xml | 2 +- modules/plugins/netservices/pom.xml | 2 +- modules/plugins/oracle/pom.xml | 2 +- modules/plugins/pattern-generator/pom.xml | 2 +- modules/plugins/perftest/pom.xml | 2 +- modules/plugins/platform/pom.xml | 2 +- modules/plugins/pom.xml | 2 +- modules/plugins/postfix/pom.xml | 2 +- modules/plugins/postgres/pom.xml | 2 +- modules/plugins/rhq-agent/pom.xml | 2 +- modules/plugins/rhq-server/pom.xml | 2 +- modules/plugins/samba/pom.xml | 2 +- modules/plugins/script/pom.xml | 2 +- modules/plugins/script2/pom.xml | 2 +- modules/plugins/snmptrapd/pom.xml | 2 +- modules/plugins/sshd/pom.xml | 2 +- modules/plugins/sudoers/pom.xml | 2 +- modules/plugins/tomcat/pom.xml | 2 +- modules/plugins/twitter/pom.xml | 2 +- modules/plugins/validate-all-plugins/pom.xml | 2 +- modules/plugins/virt/pom.xml | 2 +- modules/pom.xml | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 137 files changed, 155 insertions(+), 155 deletions(-) New commits: commit 6910991ab10568669957c540c6c86c05ddfb6b5e Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Wed Aug 1 14:12:15 2012 -0400 tag RHQ_4_4_0_JON311ER1 diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index 0f2b4a2..13fcb99 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 5bc696d..6aacccd 100644 --- a/modules/common/ant-bundle/pom.xml +++ b/modules/common/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index f3ab5cf..137bbe2 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 6960d31..b12769f 100644 --- a/modules/common/filetemplate-bundle/pom.xml +++ b/modules/common/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index db5a207..b2949a7 100644 --- a/modules/common/jboss-as/pom.xml +++ b/modules/common/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 19e6e60..379e203 100644 --- a/modules/common/pom.xml +++ b/modules/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index 54fd8c6..30f9fad 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index d6830f9..dcf6837 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index 1aa6b62..3761425 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 619d08e..c235bb9 100644 --- a/modules/core/client-api/pom.xml +++ b/modules/core/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 01a4798..eb2ec87 100644 --- a/modules/core/comm-api/pom.xml +++ b/modules/core/comm-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 9f6171f..0841143 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 8b5548a..6411525 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 96a76e1..17dd981 100644 --- a/modules/core/gui/pom.xml +++ b/modules/core/gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index eb5572d..2a5233b 100644 --- a/modules/core/native-system/pom.xml +++ b/modules/core/native-system/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index a839f3e..d6f49eb 100644 --- a/modules/core/plugin-api/pom.xml +++ b/modules/core/plugin-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 8374ac7..85fb102 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index b3cbeb4..24a3042 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index afabb42..4bab11d 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index 9f2839c..6cd4341 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index fd4ef54..0e7e497 100644 --- a/modules/core/plugin-validator/pom.xml +++ b/modules/core/plugin-validator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 73400dc..ccabf3f 100644 --- a/modules/core/plugindoc/pom.xml +++ b/modules/core/plugindoc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 6b11536..62f797d 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 30b5d95..d651463 100644 --- a/modules/core/util/pom.xml +++ b/modules/core/util/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 490a946..bafae5c 100644 --- a/modules/enterprise/agent/pom.xml +++ b/modules/enterprise/agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 8593b5f..f68d3fb 100644 --- a/modules/enterprise/agentupdate/pom.xml +++ b/modules/enterprise/agentupdate/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index f6857fd..768f792 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 65a624c..8f157ef 100644 --- a/modules/enterprise/comm/pom.xml +++ b/modules/enterprise/comm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index b577a02..17b712f 100644 --- a/modules/enterprise/gui/base-perspective-jar/pom.xml +++ b/modules/enterprise/gui/base-perspective-jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 28afb49..0d6a401 100644 --- a/modules/enterprise/gui/base-perspective-war/pom.xml +++ b/modules/enterprise/gui/base-perspective-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 592b93d..6fb7ef6 100644 --- a/modules/enterprise/gui/content_http-war/pom.xml +++ b/modules/enterprise/gui/content_http-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-gui-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 5f5cc15..1bba803 100644 --- a/modules/enterprise/gui/coregui/pom.xml +++ b/modules/enterprise/gui/coregui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 884dd66..ce0c800 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 2718943..46d09ca 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 1016580..608d7e5 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index e9752b4..d943a71 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index da2f14b..65ab867 100644 --- a/modules/enterprise/pom.xml +++ b/modules/enterprise/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index dc717d1..e75848a 100644 --- a/modules/enterprise/remoting/cli/pom.xml +++ b/modules/enterprise/remoting/cli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 5520a7a..899faab 100644 --- a/modules/enterprise/remoting/client-api/pom.xml +++ b/modules/enterprise/remoting/client-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index e035c0c..0bcd924 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index c62b1b8..32f387e 100644 --- a/modules/enterprise/remoting/pom.xml +++ b/modules/enterprise/remoting/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 0c20190..ae20950 100644 --- a/modules/enterprise/remoting/webservices/pom.xml +++ b/modules/enterprise/remoting/webservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 5ec2d40..f35e55f 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index f11a522..cb9d209 100644 --- a/modules/enterprise/server/container-lib/pom.xml +++ b/modules/enterprise/server/container-lib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 022eeed..59e23cd 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index eaa3875..abbc5ce 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index 240fa99..33f7ac6 100644 --- a/modules/enterprise/server/itests/pom.xml +++ b/modules/enterprise/server/itests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 33cdb96..78bab7d 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 18e6467..fa6ebfe 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index cf7b42a..9fa9b78 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 80d7fd8..e638422 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index e95c1e8..3940cfe 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index a5acda8..794ce80 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index e56a616..2a98645 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index fab20a6..aaf8175 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 0073cd3..452372c 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 62b8bb2..575cd1a 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 547e9d7..6431063 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 604f1d7..8c30cf4 100644 --- a/modules/enterprise/server/plugins/ant-bundle/pom.xml +++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml index 926933c..62baef9 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 385f158..75f47fa 100644 --- a/modules/enterprise/server/plugins/disk/pom.xml +++ b/modules/enterprise/server/plugins/disk/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-mongodb/pom.xml b/modules/enterprise/server/plugins/drift-mongodb/pom.xml index 176366c..b0efe9c 100644 --- a/modules/enterprise/server/plugins/drift-mongodb/pom.xml +++ b/modules/enterprise/server/plugins/drift-mongodb/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index c136a90..d1bfb24 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml index 9d1576f..cdf8a7b 100644 --- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml +++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 516a32d..548244d 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server Groovy Script Plugin</name> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index f0809a5..a5993bb 100644 --- a/modules/enterprise/server/plugins/jboss-software/pom.xml +++ b/modules/enterprise/server/plugins/jboss-software/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index ffc65aa..385e2b2 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index c16faed..776f8a9 100644 --- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 4503b40..e563c8f 100644 --- a/modules/enterprise/server/plugins/perspectives/core/pom.xml +++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 282303d..3b03252 100644 --- a/modules/enterprise/server/plugins/pom.xml +++ b/modules/enterprise/server/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index f476e2b..a0d2f9b 100644 --- a/modules/enterprise/server/plugins/url/pom.xml +++ b/modules/enterprise/server/plugins/url/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml index c7ff44f..379ff80 100644 --- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml +++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml index b4709ef..0e3170d 100644 --- a/modules/enterprise/server/plugins/yum/pom.xml +++ b/modules/enterprise/server/plugins/yum/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index 45e1948..88fa944 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 01d48b0..a72a97d 100644 --- a/modules/enterprise/server/safe-invoker/pom.xml +++ b/modules/enterprise/server/safe-invoker/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 042c1fe..be76c09 100644 --- a/modules/enterprise/server/sars/agent-sar/pom.xml +++ b/modules/enterprise/server/sars/agent-sar/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-sars-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 7e6a364..dc33feb 100644 --- a/modules/enterprise/server/sars/pom.xml +++ b/modules/enterprise/server/sars/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 080805b..b9e6261 100644 --- a/modules/enterprise/server/xml-schemas/pom.xml +++ b/modules/enterprise/server/xml-schemas/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index aa7b085..2b1b420 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index 34f4222..a8838bc 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index e19e745..365bf99 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index a5bb5e9..c988911 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index 885e816..40f95ff 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 77dd6b6..dff43bb 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 6866171..fdc0ab0 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 8f169aa..8937dc4 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index 85c7d55..58d02b6 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index 45358f7..cbee7a3 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index f06d7fc..5b6df97 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 2dc27d8..03767ce 100644 --- a/modules/plugins/aliases/pom.xml +++ b/modules/plugins/aliases/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 28601d2..c9b9cdb 100644 --- a/modules/plugins/ant-bundle/pom.xml +++ b/modules/plugins/ant-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index c58aa31..9fa3fb9 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 9e0fae7..742f869 100644 --- a/modules/plugins/augeas/pom.xml +++ b/modules/plugins/augeas/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 876f11b..ec9511d 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 3f53b80..5a8945c 100644 --- a/modules/plugins/cobbler/pom.xml +++ b/modules/plugins/cobbler/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 32645e9..1246df5 100644 --- a/modules/plugins/cron/pom.xml +++ b/modules/plugins/cron/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 6b82881..7f22350 100644 --- a/modules/plugins/database/pom.xml +++ b/modules/plugins/database/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 6b2212c..9093a78 100644 --- a/modules/plugins/filetemplate-bundle/pom.xml +++ b/modules/plugins/filetemplate-bundle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 06dd508..6e9aa0d 100644 --- a/modules/plugins/grub/pom.xml +++ b/modules/plugins/grub/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index f3efa17..f7ec728 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index cc7c484..201cd22 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index f5560cd..b63c007 100644 --- a/modules/plugins/hosts/pom.xml +++ b/modules/plugins/hosts/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index f2b7183..99e1a27 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index 10e3a19..3f977a6 100644 --- a/modules/plugins/iis/pom.xml +++ b/modules/plugins/iis/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 0602589..03b917c 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml index 4713193..33ea3ef 100644 --- a/modules/plugins/jboss-as-5/pom.xml +++ b/modules/plugins/jboss-as-5/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index ee6a9fb..2bf394e 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index a4dc8ca..b1b1cfa 100644 --- a/modules/plugins/jboss-as/pom.xml +++ b/modules/plugins/jboss-as/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml index 22f6691..8cd57ac 100644 --- a/modules/plugins/jboss-cache-v3/pom.xml +++ b/modules/plugins/jboss-cache-v3/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index ecc2252..04a65ff 100644 --- a/modules/plugins/jboss-cache/pom.xml +++ b/modules/plugins/jboss-cache/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index f0991dd..0f4b7b9 100644 --- a/modules/plugins/jmx/pom.xml +++ b/modules/plugins/jmx/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index dd5bea5..e9cc79e 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index a54b1f2..4e36748 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index 4f63ff9..02fcb44 100644 --- a/modules/plugins/mysql/pom.xml +++ b/modules/plugins/mysql/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 3f61a09..d86e3f6 100644 --- a/modules/plugins/netservices/pom.xml +++ b/modules/plugins/netservices/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 87b1507..b1f6bbb 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index aa64e16..6430e2b 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index b06a0c8..fd0d13f 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index cbecaf2..3b0b58c 100644 --- a/modules/plugins/platform/pom.xml +++ b/modules/plugins/platform/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index fcb4a97..dc09a77 100644 --- a/modules/plugins/pom.xml +++ b/modules/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index 417478b..4734c8f 100644 --- a/modules/plugins/postfix/pom.xml +++ b/modules/plugins/postfix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 28fac6b..3cf6bea 100644 --- a/modules/plugins/postgres/pom.xml +++ b/modules/plugins/postgres/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index e224079..a65a868 100644 --- a/modules/plugins/rhq-agent/pom.xml +++ b/modules/plugins/rhq-agent/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index e71114f..d40c78d 100644 --- a/modules/plugins/rhq-server/pom.xml +++ b/modules/plugins/rhq-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index a63ded1..4147b78 100644 --- a/modules/plugins/samba/pom.xml +++ b/modules/plugins/samba/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 5ca7584..01e5999 100644 --- a/modules/plugins/script/pom.xml +++ b/modules/plugins/script/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 3e056cb..9b275be 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index 939a5b3..fd90f55 100644 --- a/modules/plugins/snmptrapd/pom.xml +++ b/modules/plugins/snmptrapd/pom.xml @@ -2,7 +2,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index aedbc25..e091a22 100644 --- a/modules/plugins/sshd/pom.xml +++ b/modules/plugins/sshd/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 322346e..26296c3 100644 --- a/modules/plugins/sudoers/pom.xml +++ b/modules/plugins/sudoers/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index e533489..0a92b7d 100644 --- a/modules/plugins/tomcat/pom.xml +++ b/modules/plugins/tomcat/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index f6935f5..c3225c3 100644 --- a/modules/plugins/twitter/pom.xml +++ b/modules/plugins/twitter/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml index 7fa4439..ad23c9a 100644 --- a/modules/plugins/validate-all-plugins/pom.xml +++ b/modules/plugins/validate-all-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index d33757a..47eeda9 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 713ad3c..7203361 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index a0f8e6f..d9d15b5 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 4f59c1c..9f364e1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON311-SNAPSHOT</version> + <version>4.4.0.JON311ER1</version> <packaging>pom</packaging> <name>RHQ</name>

11 years, 10 months

1
0
0 / 0

[rhq] Branch 'feature/hadoop-plugin' - modules/plugins

by Jiri Kremser

modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopOperationsDelegate.java | 105 +++++++++- modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceComponent.java | 2 modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopSupportedOperations.java | 20 + modules/plugins/hadoop/src/main/resources/META-INF/rhq-plugin.xml | 10 4 files changed, 128 insertions(+), 9 deletions(-) New commits: commit 5d627b46e662f6a7ff3e310d76991b2ed3f57a1c Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed Aug 1 19:04:17 2012 +0200 3 simple operations on NameNode have been added diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopOperationsDelegate.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopOperationsDelegate.java index 4d97eeb..fdffe35 100644 --- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopOperationsDelegate.java +++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopOperationsDelegate.java @@ -18,9 +18,17 @@ */ package org.rhq.plugins.hadoop; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jetbrains.annotations.NotNull; + import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.operation.OperationResult; +import org.rhq.core.system.ProcessExecution; +import org.rhq.core.system.ProcessExecutionResults; +import org.rhq.core.system.SystemInfo; /** * Handles performing operations on Hadoop node instance. @@ -29,23 +37,41 @@ import org.rhq.core.pluginapi.operation.OperationResult; */ public class HadoopOperationsDelegate { + private static final Log LOG = LogFactory.getLog(HadoopOperationsDelegate.class); + private static final long MAX_WAIT = 1000 * 60 * 5; + private static final int MAX_OUTPUT = 2048; + private ResourceContext<HadoopServiceComponent> resourceContext; public HadoopOperationsDelegate(ResourceContext<HadoopServiceComponent> resourceContext) { this.resourceContext = resourceContext; } - public OperationResult invoke(HadoopSupportedOperations operation, Configuration parameters) - throws InterruptedException { + public OperationResult invoke(@NotNull + HadoopSupportedOperations operation, Configuration parameters) throws InterruptedException { - String message = null; + ProcessExecutionResults results = null; switch (operation) { case FORMAT: - message = format(); + throw new UnsupportedOperationException("This operation requires user interaction."); + // results = format(operation); + // break; + case FSCK: + results = fsck(operation); + break; + case LS: + results = ls(operation); break; default: throw new UnsupportedOperationException(operation.toString()); } + + String message = truncateString(results.getCapturedOutput()); + if (LOG.isDebugEnabled()) { + LOG.debug("CLI results: exitcode=[" + results.getExitCode() + "]; error=[" + results.getError() + + "]; output=" + message); + } + OperationResult result = new OperationResult(message); return result; } @@ -56,9 +82,76 @@ public class HadoopOperationsDelegate { * * @return message */ - private String format() { + private ProcessExecutionResults format(HadoopSupportedOperations operation) { + return invokeGeneralOperation(operation); + } + + /** + * @param operation + * @return + */ + private ProcessExecutionResults ls(HadoopSupportedOperations operation) { + return invokeGeneralOperation(operation); + } + + /** + * @param operation + * @return + */ + private ProcessExecutionResults fsck(HadoopSupportedOperations operation) { + return invokeGeneralOperation(operation); + } + + /** + * Executes the process and returns the exit code, err output and std output + * + * @param sysInfo instance of SystemInfo + * @param executable String with path to executable file + * @param args String with arguments passed to the executable file + * @param wait Max time to wait in milliseconds + * @param captureOutput Whether or not to capture the output + * @param killOnTimeout Whether or not to kill the process after the timeout + * @return the object encapsulating the exit code, err output and std output + * @throws InvalidPluginConfigurationException + */ + private static ProcessExecutionResults executeExecutable(@NotNull + SystemInfo sysInfo, String executable, String args, long wait, boolean captureOutput, boolean killOnTimeout) + throws InvalidPluginConfigurationException { + + ProcessExecution processExecution = new ProcessExecution(executable); + if (args != null) { + processExecution.setArguments(args.split(" ")); + } + processExecution.setWaitForCompletion(wait); + processExecution.setCaptureOutput(captureOutput); + processExecution.setKillOnTimeout(killOnTimeout); + + ProcessExecutionResults results = sysInfo.executeProcess(processExecution); + + return results; + } + + /** + * Truncate a string so it is short, usually for display or logging purposes. + * + * @param output the output to trim + * @return the trimmed output + */ + private String truncateString(String output) { + String outputToLog = output; + if (outputToLog != null && outputToLog.length() > MAX_OUTPUT) { + outputToLog = outputToLog.substring(0, MAX_OUTPUT) + "..."; + } + return outputToLog; + } + + private ProcessExecutionResults invokeGeneralOperation(HadoopSupportedOperations operation) { String hadoopHome = resourceContext.getPluginConfiguration() .getSimple(HadoopServiceDiscovery.HOME_DIR_PROPERTY).getStringValue(); - return null; + String executable = hadoopHome + operation.getRelativePathToExecutable(); + + ProcessExecutionResults results = executeExecutable(resourceContext.getSystemInformation(), executable, + operation.getArgs(), MAX_WAIT, true, true); + return results; } } diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceComponent.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceComponent.java index 16c38a8..94c1b4a 100644 --- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceComponent.java +++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopServiceComponent.java @@ -162,7 +162,7 @@ public class HadoopServiceComponent extends JMXServerComponent<ResourceComponent * @see org.rhq.core.pluginapi.operation.OperationFacet */ public OperationResult invokeOperation(String name, Configuration params) throws Exception { - HadoopSupportedOperations operation = HadoopSupportedOperations.valueOf(name); + HadoopSupportedOperations operation = HadoopSupportedOperations.valueOf(name.toUpperCase()); return operationsDelegate.invoke(operation, params); } diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopSupportedOperations.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopSupportedOperations.java index 90572d8..faddc95 100644 --- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopSupportedOperations.java +++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopSupportedOperations.java @@ -24,6 +24,24 @@ package org.rhq.plugins.hadoop; * @author Jirka Kremser */ public enum HadoopSupportedOperations { - FORMAT + FORMAT("/bin/hadoop", "namenode -format"), + FSCK("/bin/hadoop", "fsck /"), + LS("/bin/hadoop", "fs -ls"); + private final String relativePathToExecutable; + + private final String args; + + private HadoopSupportedOperations(String relativePathToExecutable, String args) { + this.relativePathToExecutable = relativePathToExecutable; + this.args = args; + } + + public String getRelativePathToExecutable() { + return relativePathToExecutable; + } + + public String getArgs() { + return args; + } } diff --git a/modules/plugins/hadoop/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/hadoop/src/main/resources/META-INF/rhq-plugin.xml index 36bc092..819d265 100644 --- a/modules/plugins/hadoop/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/hadoop/src/main/resources/META-INF/rhq-plugin.xml @@ -15,7 +15,15 @@ <process-scan name="NameNode" query="process|basename|match=^java.*,arg|-Dproc_namenode|match=.*"/> - <operation name="format" displayName="Format dfs" description="Format a new distributed-filesystem."/> + <operation name="format" displayName="Format dfs" description="Format a new distributed-filesystem."> + <results><c:simple-property name="operationResult" description="Outcome of formatting the dfs."/></results> + </operation> + <operation name="fsck" displayName="Check dfs" description="Runs a HDFS filesystem checking utility."> + <results><c:simple-property name="operationResult" description="Outcome of checking the dfs."/></results> + </operation> + <operation name="ls" displayName="Lists dfs" description="Lists the content of the distributed-filesystem."> + <results><c:simple-property name="operationResult" description="Outcome of listing the dfs."/></results> + </operation> <metric property="Hadoop:service=NameNode,name=NameNodeInfo:NameDirStatuses" displayName="NameNode Storage" dataType="trait" displayType="summary"/>

11 years, 10 months

1
0
0 / 0

[rhq] Branch 'mazz/test-rhq-on-as7' - modules/enterprise

by mazz

modules/enterprise/server/appserver/pom.xml | 10 modules/enterprise/server/appserver/src/main/bin-resources/bin/generate-db-password.bat | 115 ++ modules/enterprise/server/appserver/src/main/bin-resources/bin/generate-db-password.sh | 159 +++ modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-console.bat | 2 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.bat | 223 ++++ modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.security-policy | 10 modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh | 483 ++++++++++ modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf | 212 ++++ modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll |binary modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe |binary modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar |binary modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc | 16 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 5 13 files changed, 1226 insertions(+), 9 deletions(-) New commits: commit 61d8a7e4dedec28a9394b54077da931ad3dd9140 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Aug 1 12:58:30 2012 -0400 getting the startup scripts to work with AS7. diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml index ee378b8..36a74a4 100644 --- a/modules/enterprise/server/appserver/pom.xml +++ b/modules/enterprise/server/appserver/pom.xml @@ -60,12 +60,6 @@ </dependency> <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups-all</artifactId> - <version>2.2.9.1</version> - </dependency> - - <dependency> <groupId>org.opensymphony.quartz</groupId> <artifactId>quartz</artifactId>  @@ -159,8 +153,6 @@  <property name="rhq.dev.ds.connection-url" value="${rhq.dev.ds.connection-url}" /> - <property name="rhq.dev.ds.driver-class" value="${rhq.dev.ds.driver-class}" /> - <property name="rhq.dev.ds.xa-datasource-class" value="${rhq.dev.ds.xa-datasource-class}" /> <property name="rhq.dev.ds.user-name" value="${rhq.dev.ds.user-name}" /> <property name="rhq.dev.ds.password.encrypted" value="${rhq.dev.ds.password.encrypted}" /> <property name="rhq.dev.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" /> @@ -205,7 +197,7 @@ <property name="developer" value="${developer}" /> <property name="rhq.earName" value="${rhq.earName}" /> -  +  <property name="rhq.test.ds.type-mapping" value="${rhq.test.ds.type-mapping}" /> <property name="rhq.dev.ds.type-mapping" value="${rhq.dev.ds.type-mapping}" /> </ant> diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/generate-db-password.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/generate-db-password.bat new file mode 100644 index 0000000..a1f05b5 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/generate-db-password.bat @@ -0,0 +1,115 @@ +@echo off + +rem =========================================================================== +rem RHQ Server Windows Generate db password script +rem +rem This file is used to execute the generate a new encrypted db password. +rem +rem This script is customizable by setting the following environment variables: +rem +rem RHQ_SERVER_DEBUG - If this is defined, the script will emit debug +rem messages. +rem If not set or set to "false", debug is turned off. +rem +rem RHQ_SERVER_HOME - Defines where the Server's home install directory is. +rem If not defined, it will be assumed to be the parent +rem directory of the directory where this script lives. +rem +rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will +rem use. This will be ignored if +rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set. +rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are +rem not set, the Server's embedded JRE will be used. +rem +rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +rem executable to use. If this is set, +rem RHQ_SERVER_JAVA_HOME is ignored. +rem If this is not set, then +rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe +rem is used. If this and +rem RHQ_SERVER_JAVA_HOME are not set, the +rem Server's embedded JRE will be used. +rem +rem If the embedded JRE is to be used but is not available, the fallback +rem JRE to be used will be determined by the JAVA_HOME environment variable. +rem +rem =========================================================================== + +setlocal + +rem if debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_SERVER_DEBUG%" == "false" ( + set RHQ_SERVER_DEBUG= +) + +rem ---------------------------------------------------------------------- +rem Ensure password parameter is present +rem ---------------------------------------------------------------------- + +if /i "%1"=="" ( + echo Usage: %0 { plainTextPassword } + goto :done +) + +rem ---------------------------------------------------------------------- +rem Change directory so the current directory is the Server home. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_BIN_DIR_PATH=%~dp0 + +if not defined RHQ_SERVER_HOME ( + cd "%RHQ_SERVER_BIN_DIR_PATH%\.." +) else ( + cd "%RHQ_SERVER_HOME%" || ( + echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME% + exit /B 1 + ) +) + +set RHQ_SERVER_HOME=%CD% + +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME% + +rem ---------------------------------------------------------------------- +rem Find the Java executable and verify we have a VM available. +rem ---------------------------------------------------------------------- + +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( + if not defined RHQ_SERVER_JAVA_HOME call :prepare_embedded_jre +) + +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe + +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME% +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH% + +if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" ( + echo There is no JVM available. + echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately. + exit /B 1 +) + +set _JB_DIR=%RHQ_SERVER_HOME%\jbossas +"%RHQ_SERVER_JAVA_EXE_FILE_PATH%" -cp %_JB_DIR%\modules\org\picketbox\main\picketbox-4.0.7.Final.jar;%_JB_DIR%\modules\org\jboss\logging\main\jboss-logging-3.1.0.GA.jar org.picketbox.datasource.security.SecureIdentityLoginModule %1 + +goto :done + +rem ---------------------------------------------------------------------- +rem CALL subroutine that prepares to use the embedded JRE +rem ---------------------------------------------------------------------- + +:prepare_embedded_jre +set RHQ_SERVER_JAVA_HOME=%RHQ_SERVER_HOME%\jre +if defined RHQ_SERVER_DEBUG echo Using the embedded JRE +if not exist "%RHQ_SERVER_JAVA_HOME%" ( + if defined RHQ_SERVER_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME% + set RHQ_SERVER_JAVA_HOME=%JAVA_HOME% +) +goto :eof + +rem ---------------------------------------------------------------------- +rem CALL subroutine that exits this script normally +rem ---------------------------------------------------------------------- + +:done +endlocal diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/generate-db-password.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/generate-db-password.sh new file mode 100755 index 0000000..0320c08 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/generate-db-password.sh @@ -0,0 +1,159 @@ +#!/bin/sh + +# ============================================================================= +# RHQ Server UNIX Generate db password script +# +# This file is used to execute the generate a new encrypted db password. +# +# This script is customizable by setting the following environment variables: +# +# RHQ_SERVER_HOME - Defines where the server's home install directory is. +# If not defined, it will be assumed to be the parent +# directory of the directory where this script lives. +# +# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will +# use. This will be ignored if +# RHQ_SERVER_JAVA_EXE_FILE_PATH is set. +# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are +# not set, the Server's embedded JRE will be used. +# +# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +# executable to use. If this is set, +# RHQ_SERVER_JAVA_HOME is ignored. +# If this is not set, then +# $RHQ_SERVER_JAVA_HOME/bin/java +# is used. If this and +# RHQ_SERVER_JAVA_HOME are not set, the +# Server's embedded JRE will be used. +# +# If the embedded JRE is to be used but is not available, the fallback +# JRE to be used will be determined by the JAVA_HOME environment variable. +# +# ============================================================================= + +# ---------------------------------------------------------------------- +# Environment variables you can set to customize the launch of the RHQ Server. +# ---------------------------------------------------------------------- + +# RHQ_SERVER_HOME=/path/to/server/home +# RHQ_SERVER_DEBUG=true +# JAVA_HOME=/path/to/java/installation +# RHQ_SERVER_JAVA_EXE_FILE_PATH=/path/directly/to/java/executable +# ---------------------------------------------------------------------- +# Make sure we unset any lingering JBossAS environment variables that +# were set in the user's environment. This might happen if the user +# has an external JBossAS configured. +# ---------------------------------------------------------------------- + +unset JBOSS_HOME +unset RUN_CONF +unset JAVAC_JAR +unset JBOSS_CLASSPATH + +# ---------------------------------------------------------------------- +# Dumps a message iff debug mode is enabled +# ---------------------------------------------------------------------- + +debug_msg () +{ + # if debug variable is set, it is assumed to be on, unless its value is false + if [ "x$RHQ_SERVER_DEBUG" != "x" ]; then + if [ "$RHQ_SERVER_DEBUG" != "false" ]; then + echo $1 + fi + fi +} + + +# ---------------------------------------------------------------------- +# Determine what specific platform we are running on. +# Set some platform-specific variables. +# ---------------------------------------------------------------------- + +case "`uname`" in + CYGWIN*) _CYGWIN=true + ;; + Darwin*) _DARWIN=true + ;; + SunOS*) _SOLARIS=true + ;; + AIX*) _AIX=true + ;; +esac + +# ---------------------------------------------------------------------- +# Determine the RHQ Server installation directory. +# If RHQ_SERVER_HOME is not defined, we will assume we are running +# directly from the server installation's bin directory. +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_HOME" ]; then + _DOLLARZERO=`readlink "$0" 2>/dev/null || echo "$0"` + RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/.. +else + if [ ! -d "$RHQ_SERVER_HOME" ]; then + echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory" + echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" + exit 1 + fi +fi + +cd "$RHQ_SERVER_HOME" +RHQ_SERVER_HOME=`pwd` + +debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" + +if [ ! -f "${RHQ_SERVER_HOME}/jbossas/jboss-modules.jar" ]; then + echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid RHQ Server" + echo "Missing ${RHQ_SERVER_HOME}/jbossas/jboss-modules.jar" + exit 1 +fi + +# ---------------------------------------------------------------------- +# if we are on a Mac and JAVA_HOME is not set, then set it to /usr +# as this is the default location. +# ---------------------------------------------------------------------- +if [ -z "$JAVA_HOME" ]; then + if [ -n "$_DARWIN" ]; then + debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr" + JAVA_HOME=/usr + fi +fi + + +# ---------------------------------------------------------------------- +# Find the Java executable and verify we have a VM available +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then + if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then + RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre" + debug_msg "Using the embedded JRE" + if [ ! -d "$RHQ_SERVER_JAVA_HOME" ]; then + debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME" + RHQ_SERVER_JAVA_HOME="$JAVA_HOME" + fi + fi + debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME" + RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java" +fi +debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH" + +if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then + echo "There is no JVM available." + echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately." + exit 1 +fi + +# run.sh will use JAVA as the full java command +JAVA="$RHQ_SERVER_JAVA_EXE_FILE_PATH" +export JAVA + +if [ $# -eq 0 ] +then + echo "Usage generate-db-password <password>" + exit 1 +fi + +_JB_DIR=${RHQ_SERVER_HOME}/jbossas +$JAVA -cp ${_JB_DIR}/modules/org/picketbox/main/picketbox-4.0.7.Final.jar:${_JB_DIR}/modules/org/jboss/logging/main/jboss-logging-3.1.0.GA.jar org.picketbox.datasource.security.SecureIdentityLoginModule $* diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-console.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-console.bat new file mode 100644 index 0000000..4f7b79d --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-console.bat @@ -0,0 +1,2 @@ +cd %~dp0 +rhq-server.bat console diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.bat new file mode 100644 index 0000000..25db362 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.bat @@ -0,0 +1,223 @@ +@echo off + +rem =========================================================================== +rem RHQ Server Windows Startup Script +rem +rem This file is used to install, start, stop and remove the RHQ Server Windows +rem Service for the Windows platform. It can also be used to start the +rem RHQ Server in a console window. The RHQ Server is actually wrapped +rem by the Java Service Wrapper (JSW) and it is the JSW that is the actual +rem executable that is registered as the Windows Service. +rem +rem This script is customizable by setting the following environment variables: +rem +rem RHQ_SERVER_DEBUG - If this is defined, the script will emit debug +rem messages. +rem If not set or set to "false", debug is turned off. +rem +rem RHQ_SERVER_HOME - Defines where the Server's home install directory is. +rem If not defined, it will be assumed to be the parent +rem directory of the directory where this script lives. +rem +rem RHQ_SERVER_JAVA_HOME - The location of the JRE that the Server will +rem use. This will be ignored if +rem RHQ_SERVER_JAVA_EXE_FILE_PATH is set. +rem If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are +rem not set, the Server's embedded JRE will be used. +rem +rem RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +rem executable to use. If this is set, +rem RHQ_SERVER_JAVA_HOME is ignored. +rem If this is not set, then +rem %RHQ_SERVER_JAVA_HOME%\bin\java.exe +rem is used. If this and +rem RHQ_SERVER_JAVA_HOME are not set, the +rem Server's embedded JRE will be used. +rem +rem RHQ_SERVER_INSTANCE_NAME - The name of the Windows Service; it must +rem conform to the Windows Service naming +rem conventions. By default, this is the +rem name "rhqserver-%COMPUTERNAME%" +rem +rem RHQ_SERVER_WRAPPER_LOG_DIR_PATH - The full path to the location where +rem the wrapper log file will go. +rem +rem RHQ_SERVER_RUN_AS - if defined, then when the Windows Service is +rem installed, the value is the domain\username of the +rem user that the Windows Service will run as +rem +rem RHQ_SERVER_RUN_AS_ME - if defined, then when the Windows Service is +rem installed, the domain\username of the +rem user that the Windows Service will run as will +rem be the current user (.\%USERNAME%). This takes +rem precedence over RHQ_SERVER_RUN_AS. +rem +rem Note that you cannot define custom Java VM parameters or command line +rem arguments to pass to the RHQ Server standalone.sh. If you wish to pass in +rem specific arguments, modify the rhq-server-wrapper.conf file. +rem +rem If the embedded JRE is to be used but is not available, the fallback +rem JRE to be used will be determined by the JAVA_HOME environment variable. +rem +rem This script does not use the built-in JBossAS run.bat. +rem =========================================================================== + +setlocal + +rem if debug variable is set, it is assumed to be on, unless its value is false +if "%RHQ_SERVER_DEBUG%" == "false" ( + set RHQ_SERVER_DEBUG= +) + +rem ---------------------------------------------------------------------- +rem Change directory so the current directory is the Server home. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_BIN_DIR_PATH=%~dp0 + +if not defined RHQ_SERVER_HOME ( + cd "%RHQ_SERVER_BIN_DIR_PATH%\.." +) else ( + cd "%RHQ_SERVER_HOME%" || ( + echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME% + exit /B 1 + ) +) + +set RHQ_SERVER_HOME=%CD% + +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_HOME: %RHQ_SERVER_HOME% + +rem ---------------------------------------------------------------------- +rem Find the Java executable and verify we have a VM available. +rem ---------------------------------------------------------------------- + +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH ( + if not defined RHQ_SERVER_JAVA_HOME call :prepare_embedded_jre +) + +if not defined RHQ_SERVER_JAVA_EXE_FILE_PATH set RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_HOME%\bin\java.exe + +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_HOME: %RHQ_SERVER_JAVA_HOME% +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_JAVA_EXE_FILE_PATH: %RHQ_SERVER_JAVA_EXE_FILE_PATH% + +if not exist "%RHQ_SERVER_JAVA_EXE_FILE_PATH%" ( + echo There is no JVM available. + echo Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately. + exit /B 1 +) + +rem ---------------------------------------------------------------------- +rem Define the name used for the name of the Windows Service. +rem If this is not defined, the name of the computer is used. +rem ---------------------------------------------------------------------- + +if "%RHQ_SERVER_INSTANCE_NAME%"=="" ( + set RHQ_SERVER_INSTANCE_NAME=rhqserver-%COMPUTERNAME% +) +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_INSTANCE_NAME: %RHQ_SERVER_INSTANCE_NAME% + +rem ---------------------------------------------------------------------- +rem Determine the wrapper directory. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_WRAPPER_DIR_PATH=%RHQ_SERVER_BIN_DIR_PATH%\wrapper +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_DIR_PATH: %RHQ_SERVER_WRAPPER_DIR_PATH% + +rem ---------------------------------------------------------------------- +rem The Windows OS platform name is also the wrapper subdirectory name. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_OS_PLATFORM=windows-x86_32 +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_OS_PLATFORM: %RHQ_SERVER_OS_PLATFORM% + +rem ---------------------------------------------------------------------- +rem Determine the wrapper executable that this script will run. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_WRAPPER_EXE_FILE_PATH=%RHQ_SERVER_WRAPPER_DIR_PATH%\%RHQ_SERVER_OS_PLATFORM%\wrapper.exe +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_EXE_FILE_PATH: %RHQ_SERVER_WRAPPER_EXE_FILE_PATH% + +rem ---------------------------------------------------------------------- +rem Determine the Server wrapper configuration file. +rem ---------------------------------------------------------------------- + +set RHQ_SERVER_WRAPPER_CONF_FILE_PATH=%RHQ_SERVER_WRAPPER_DIR_PATH%\rhq-server-wrapper.conf +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_CONF_FILE_PATH: %RHQ_SERVER_WRAPPER_CONF_FILE_PATH% + +rem ---------------------------------------------------------------------- +rem Create and configure the wrapper log directory. +rem ---------------------------------------------------------------------- + +if "%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" == "" ( + if not exist "%RHQ_SERVER_HOME%\logs" ( + mkdir "%RHQ_SERVER_HOME%\logs" + ) + set RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_HOME%\logs +) +if defined RHQ_SERVER_DEBUG echo RHQ_SERVER_WRAPPER_LOG_DIR_PATH: %RHQ_SERVER_WRAPPER_LOG_DIR_PATH% + +rem ---------------------------------------------------------------------- +rem Determine what to do and do it. +rem ---------------------------------------------------------------------- + +rem Determine if there should be debug VM options passed into it. +rem For some reason, this can't go inside another if statement. +if defined RHQ_SERVER_DEBUG set _DEBUG_OPTS=wrapper.debug=true + +rem Determine what user the Windows Service will run as. +if defined RHQ_SERVER_RUN_AS set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=%RHQ_SERVER_RUN_AS%" +if defined RHQ_SERVER_RUN_AS_ME set _WRAPPER_NTSERVICE_ACCOUNT="wrapper.ntservice.account=.\%USERNAME%" + +if /i "%1"=="console" ( + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -c "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_SERVER_INSTANCE_NAME=%RHQ_SERVER_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_SERVER_OS_PLATFORM=%RHQ_SERVER_OS_PLATFORM%" "set.RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS% + goto done +) + +if /i "%1"=="install" ( + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -i "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" "set.RHQ_SERVER_HOME=%RHQ_SERVER_HOME%" "set.RHQ_SERVER_INSTANCE_NAME=%RHQ_SERVER_INSTANCE_NAME%" "set.RHQ_SERVER_JAVA_EXE_FILE_PATH=%RHQ_SERVER_JAVA_EXE_FILE_PATH%" "set.RHQ_SERVER_OS_PLATFORM=%RHQ_SERVER_OS_PLATFORM%" "set.RHQ_SERVER_WRAPPER_LOG_DIR_PATH=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%" %_WRAPPER_NTSERVICE_ACCOUNT% %_DEBUG_OPTS% + goto done +) + +if /i "%1"=="start" ( + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -t "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" + goto done +) + +if /i "%1"=="stop" ( + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -p "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" + goto done +) + +if /i "%1"=="remove" ( + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -r "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" + goto done +) + +if /i "%1"=="status" ( + "%RHQ_SERVER_WRAPPER_EXE_FILE_PATH%" -q "%RHQ_SERVER_WRAPPER_CONF_FILE_PATH%" + goto done +) + +echo Usage: %0 { install ^| start ^| stop ^| remove ^| status ^| console } +goto :done + +rem ---------------------------------------------------------------------- +rem CALL subroutine that prepares to use the embedded JRE +rem ---------------------------------------------------------------------- + +:prepare_embedded_jre +set RHQ_SERVER_JAVA_HOME=%RHQ_SERVER_HOME%\jre +if defined RHQ_SERVER_DEBUG echo Using the embedded JRE +if not exist "%RHQ_SERVER_JAVA_HOME%" ( + if defined RHQ_SERVER_DEBUG echo No embedded JRE found - will try to use JAVA_HOME: %JAVA_HOME% + set RHQ_SERVER_JAVA_HOME=%JAVA_HOME% +) +goto :eof + +rem ---------------------------------------------------------------------- +rem CALL subroutine that exits this script normally +rem ---------------------------------------------------------------------- + +:done +endlocal diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.security-policy b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.security-policy new file mode 100644 index 0000000..8860b47 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.security-policy @@ -0,0 +1,10 @@ +// We need the SecurityManager installed to enable sandboxing of CLI scripts +// but we don't define any other security measures on the RHQ server itself. +// +// Granting all permissions allows us to run the RHQ server as if no security +// manager was in place (which is assumed by default by JBoss AS) but be able +// to use it when we need it for our own purposes. + +grant { + permission java.security.AllPermission; +}; diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh new file mode 100644 index 0000000..f4fb511 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh @@ -0,0 +1,483 @@ +#!/bin/sh + +# chkconfig: 2345 92 26 +# description: Starts and stops the RHQ Server +# +# processname: java + +# ============================================================================= +# RHQ Server UNIX Startup Script +# +# This file is used to execute the RHQ Server on a UNIX platform as part of +# the platform's bootup sequence or as a foreground console process. +# Run this script without any command line options for the syntax help. +# +# This script is customizable by setting the following environment variables: +# +# Note that if this script is to be used as an init.d script, you must set +# RHQ_SERVER_HOME so this script knows where to find the Server installation. +# +# RHQ_SERVER_DEBUG - If this is defined, the script will emit debug +# messages. If this is not defined or set to "false" +# debug messages are not emitted. +# +# RHQ_SERVER_HOME - Defines where the server's home install directory is. +# If not defined, it will be assumed to be the parent +# directory of the directory where this script lives. +# +# RHQ_SERVER_JAVA_HOME - The location of the JRE that the server will +# use. This will be ignored if +# RHQ_SERVER_JAVA_EXE_FILE_PATH is set. +# If this and RHQ_SERVER_JAVA_EXE_FILE_PATH are +# not set, the Server's embedded JRE will be used. +# +# RHQ_SERVER_JAVA_EXE_FILE_PATH - Defines the full path to the Java +# executable to use. If this is set, +# RHQ_SERVER_JAVA_HOME is ignored. +# If this is not set, then +# $RHQ_SERVER_JAVA_HOME/bin/java +# is used. If this and +# RHQ_SERVER_JAVA_HOME are not set, the +# Server's embedded JRE will be used. +# +# RHQ_SERVER_JAVA_OPTS - Java VM command line options to be +# passed into the Server's VM. If this is not defined +# this script will pass in a default set of options. +# If this is set, it completely overrides the +# Server's defaults. If you only want to add options +# to the Server's defaults, then you will want to +# use RHQ_SERVER_ADDITIONAL_JAVA_OPTS instead. +# +# RHQ_SERVER_ADDITIONAL_JAVA_OPTS - additional Java VM command line options +# to be passed into the Server's VM. This +# is added to RHQ_SERVER_JAVA_OPTS; it +# is mainly used to augment the Server's +# default set of options. This can be +# left unset if it is not needed. +# +# RHQ_SERVER_CMDLINE_OPTS - If this is defined, these are the command line +# arguments that will be passed to the RHQ Server +# JBossAS standalone.sh. If you only want to add +# options to the Server's defaults, then you will +# want to use RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS +# instead. +# +# RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS - additional command line arguments to +# be passed to the RHQ Server JBossAS +# standalone.sh. This is added to +# RHQ_SERVER_CMDLINE_OPTS; it is mainly +# used to augment the Server's default +# set of options. This can be left unset +# if it is not needed. +# +# RHQ_SERVER_PIDFILE_DIR - a full path to a writable directory where this +# script can write its pidfile to. +# If not defined, this defaults to the Server's +# bin directory. +# +# If the embedded JRE is to be used but is not available, the fallback +# JRE to be used will be determined by the JAVA_HOME environment variable. +# +# This script calls standalone.sh when starting the underlying JBossAS server. +# ============================================================================= + +# ---------------------------------------------------------------------- +# Environment variables that can customize the launch of the RHQ Server. +# ---------------------------------------------------------------------- + +# RHQ_SERVER_HOME=/path/to/server/home +# RHQ_SERVER_DEBUG=true +# JAVA_HOME=/path/to/java/installation +# RHQ_SERVER_JAVA_EXE_FILE_PATH=/path/directly/to/java/executable +# RHQ_SERVER_JAVA_OPTS=VM options +# RHQ_SERVER_ADDITIONAL_JAVA_OPTS=additional VM options +# RHQ_SERVER_CMDLINE_OPTS=standalone.sh options +# RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS=additional standalone.sh options + +# ---------------------------------------------------------------------- +# Environment variables to set in order to enable remote debugging. +# ---------------------------------------------------------------------- + +#RHQ_SERVER_ADDITIONAL_JAVA_OPTS="-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n" + +# Enable JProfiler +#JPROFILER_HOME="/opt/jprofiler6" +#RHQ_SERVER_ADDITIONAL_JAVA_OPTS="$RHQ_SERVER_ADDITIONAL_JAVA_OPTS -agentlib:jprofilerti=port=8849 -Xbootclasspath/a:$JPROFILER_HOME/bin/agent.jar" +#export PATH="$PATH:$JPROFILER_HOME/bin" +#export LD_LIBRARY_PATH="$JPROFILER_HOME/bin/linux-x64" + +# ---------------------------------------------------------------------- +# Make sure we unset any lingering JBossAS environment variables that +# were set in the user's environment. This might happen if the user +# has an external JBossAS configured. +# ---------------------------------------------------------------------- + +unset JBOSS_HOME +unset RUN_CONF +unset JAVAC_JAR +unset JBOSS_CLASSPATH + +# ---------------------------------------------------------------------- +# Dumps a message iff debug mode is enabled +# ---------------------------------------------------------------------- + +debug_msg () +{ + # if debug variable is set, it is assumed to be on, unless its value is false + if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then + echo $1 + fi +} + +# ---------------------------------------------------------------------- +# Sets _SERVER_STATUS, _SERVER_RUNNING and _SERVER_PID based on the +# status of the RHQ Server VM start script (standalone.sh). +# Also sets _JVM_STATUS, _JVM_RUNNING and _JVM_PID based on the +# status of the JBossAS Java Virtual Machine. +# ---------------------------------------------------------------------- + +check_status () +{ + if [ -f "$_SERVER_PIDFILE" ]; then + _SERVER_PID=`cat "$_SERVER_PIDFILE"` + if [ -n "$_SERVER_PID" ] && kill -0 $_SERVER_PID 2>/dev/null ; then + _SERVER_STATUS="RHQ Server (pid $_SERVER_PID) is $1" + _SERVER_RUNNING=1 + else + _SERVER_STATUS="RHQ Server (pid $_SERVER_PID) is NOT running" + _SERVER_RUNNING=0 + fi + else + _SERVER_STATUS="RHQ Server (no pid file) is NOT running" + _SERVER_RUNNING=0 + fi + + if [ -f "$_JVM_PIDFILE" ]; then + _JVM_PID=`cat "$_JVM_PIDFILE"` + if [ -n "$_JVM_PID" ] && kill -0 $_JVM_PID 2>/dev/null ; then + _JVM_STATUS="JBossAS Java VM child process (pid $_JVM_PID) is $1" + _JVM_RUNNING=1 + else + _JVM_STATUS="JBossAS Java VM child process (pid $_JVM_PID) is NOT running" + _JVM_RUNNING=0 + fi + else + _JVM_STATUS="JBossAS Java VM child process (no pid file) is NOT running" + _JVM_RUNNING=0 + fi +} + +# ---------------------------------------------------------------------- +# Ensures that the PID files no longer exist +# ---------------------------------------------------------------------- + +remove_pid_files () +{ + if [ -f "$_SERVER_PIDFILE" ]; then + rm -f "$_SERVER_PIDFILE" + fi + if [ -f "$_JVM_PIDFILE" ]; then + rm -f "$_JVM_PIDFILE" + fi +} + +# ---------------------------------------------------------------------- +# Determine what specific platform we are running on. +# Set some platform-specific variables. +# ---------------------------------------------------------------------- + +case "`uname`" in + CYGWIN*) _CYGWIN=true + ;; + Linux*) _LINUX=true + ;; + Darwin*) _DARWIN=true + ;; + SunOS*) _SOLARIS=true + ;; + AIX*) _AIX=true + ;; +esac + +# ---------------------------------------------------------------------- +# Determine the RHQ Server installation directory. +# If RHQ_SERVER_HOME is not defined, we will assume we are running +# directly from the server installation's bin directory. +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_HOME" ]; then + if [ -n "${_LINUX}${_SOLARIS}${_CYGWIN}" ]; then + # only certain platforms support the -e argument for readlink + _READLINK_ARG="-e" + fi + _DOLLARZERO=`readlink $_READLINK_ARG "$0" 2>/dev/null || echo "$0"` + RHQ_SERVER_HOME=`dirname "$_DOLLARZERO"`/.. +else + if [ ! -d "$RHQ_SERVER_HOME" ]; then + echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid directory" + echo "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" + exit 1 + fi +fi + +cd "$RHQ_SERVER_HOME" +RHQ_SERVER_HOME=`pwd` + +debug_msg "RHQ_SERVER_HOME: $RHQ_SERVER_HOME" + +if [ ! -f "${RHQ_SERVER_HOME}/jbossas/jboss-modules.jar" ]; then + echo "ERROR! RHQ_SERVER_HOME is not pointing to a valid RHQ Server" + echo "Missing ${RHQ_SERVER_HOME}/jbossas/jboss-modules.jar" + exit 1 +fi + +# ---------------------------------------------------------------------- +# if we are on a Mac and JAVA_HOME is not set, then set it to /usr +# as this is the default location. +# ---------------------------------------------------------------------- +if [ -z "$JAVA_HOME" ]; then + if [ -n "$_DARWIN" ]; then + debug_msg "Running on Mac OS X, setting JAVA_HOME to /usr" + JAVA_HOME=/usr + fi +fi + +# create the logs directory +_LOG_DIR_PATH="${RHQ_SERVER_HOME}/logs" +if [ -n "$_CYGWIN" ]; then + _LOG_DIR_PATH=`cygpath --windows --path "$_LOG_DIR_PATH"` +fi +if [ ! -d "${_LOG_DIR_PATH}" ]; then + mkdir "${_LOG_DIR_PATH}" +fi + +# ---------------------------------------------------------------------- +# Find the Java executable and verify we have a VM available +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then + if [ -z "$RHQ_SERVER_JAVA_HOME" ]; then + RHQ_SERVER_JAVA_HOME="${RHQ_SERVER_HOME}/jre" + if [ -d "$RHQ_SERVER_JAVA_HOME" ]; then + debug_msg "Using the embedded JRE" + else + debug_msg "No embedded JRE found - will try to use JAVA_HOME: $JAVA_HOME" + RHQ_SERVER_JAVA_HOME="$JAVA_HOME" + fi + fi + debug_msg "RHQ_SERVER_JAVA_HOME: $RHQ_SERVER_JAVA_HOME" + RHQ_SERVER_JAVA_EXE_FILE_PATH="${RHQ_SERVER_JAVA_HOME}/bin/java" +fi +debug_msg "RHQ_SERVER_JAVA_EXE_FILE_PATH: $RHQ_SERVER_JAVA_EXE_FILE_PATH" + +if [ ! -f "$RHQ_SERVER_JAVA_EXE_FILE_PATH" ]; then + echo "There is no JVM available." + echo "Please set RHQ_SERVER_JAVA_HOME or RHQ_SERVER_JAVA_EXE_FILE_PATH appropriately." + exit 1 +fi + +# standalone.sh will use JAVA as the full java command +JAVA="$RHQ_SERVER_JAVA_EXE_FILE_PATH" +export JAVA + +# ---------------------------------------------------------------------- +# Prepare the VM command line options to be passed in +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_JAVA_OPTS" ]; then + RHQ_SERVER_JAVA_OPTS="-Xms1024M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M -Djava.net.preferIPv4Stack=true -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000" +fi +# Add the JVM opts that we always want to specify, whether or not the user set RHQ_SERVER_JAVA_OPTS. +# Note that the double equals for the policy file specification IS INTENTIONAL +RHQ_SERVER_JAVA_OPTS="-Dapp.name=rhq-server ${RHQ_SERVER_JAVA_OPTS} -Djboss.server.log.dir=${_LOG_DIR_PATH} -Djava.awt.headless=true -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.server.default.config=standalone.xml -Djboss.modules.system.pkgs=org.jboss.byteman -Djava.security.manager -Djava.security.policy==${RHQ_SERVER_HOME}/bin/rhq-server.security-policy" + +debug_msg "RHQ_SERVER_JAVA_OPTS: $RHQ_SERVER_JAVA_OPTS" +debug_msg "RHQ_SERVER_ADDITIONAL_JAVA_OPTS: $RHQ_SERVER_ADDITIONAL_JAVA_OPTS" + +# standalone.sh wants the options to be in the JAVA_OPTS variable +JAVA_OPTS="$RHQ_SERVER_JAVA_OPTS $RHQ_SERVER_ADDITIONAL_JAVA_OPTS" +export JAVA_OPTS + +# ---------------------------------------------------------------------- +# Prepare the command line arguments passed to the RHQ Server JBossAS +# standalone.sh script +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_CMDLINE_OPTS" ]; then + _PROPS_FILE_PATH="${RHQ_SERVER_HOME}/bin/rhq-server.properties" + + # convert paths if we are on Windows + if [ -n "$_CYGWIN" ]; then + _PROPS_FILE_PATH=`cygpath --windows --path "$_PROPS_FILE_PATH"` + fi + + RHQ_SERVER_CMDLINE_OPTS="-P ${_PROPS_FILE_PATH}" +fi + +debug_msg "RHQ_SERVER_CMDLINE_OPTS: $RHQ_SERVER_CMDLINE_OPTS" +debug_msg "RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS: $RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS" + +# JBoss may parse its command line args such that later options of a +# certain type may override earlier options of that same type, so make sure the +# additional opts are added after the base opts, since we want the additional +# opts to take precedence +_CMDLINE_OPTS="$RHQ_SERVER_CMDLINE_OPTS $RHQ_SERVER_ADDITIONAL_CMDLINE_OPTS" + +# ---------------------------------------------------------------------- +# Now find the JBossAS standalone.sh script +# ---------------------------------------------------------------------- + +_JBOSS_RUN_SCRIPT="${RHQ_SERVER_HOME}/jbossas/bin/standalone.sh" + +if [ ! -f "$_JBOSS_RUN_SCRIPT" ]; then + echo "ERROR! Cannot find the JBossAS run script" + echo "Not found: $_JBOSS_RUN_SCRIPT" + exit 1 +fi +debug_msg "_JBOSS_RUN_SCRIPT: $_JBOSS_RUN_SCRIPT" + +# ---------------------------------------------------------------------- +# Define where we want to write the pidfiles - let user override the dir +# Note that we actually have two pidfiles - one is for the script +# that starts the JBossAS Java virtual machine and the second is the +# actual server's Java virtual machine process itself. +# ---------------------------------------------------------------------- + +if [ -z "$RHQ_SERVER_PIDFILE_DIR" ]; then + RHQ_SERVER_PIDFILE_DIR="${RHQ_SERVER_HOME}/bin" +fi +mkdir -p "$RHQ_SERVER_PIDFILE_DIR" + +_SERVER_PIDFILE="${RHQ_SERVER_PIDFILE_DIR}/rhq-server.pid" +_JVM_PIDFILE="${RHQ_SERVER_PIDFILE_DIR}/rhq-jvm.pid" + +# ---------------------------------------------------------------------- +# Execute the command that the user wants us to do +# ---------------------------------------------------------------------- + +check_status "running" + +case "$1" in +'console') + if [ "$_SERVER_RUNNING" = "1" ]; then + echo "$_SERVER_STATUS" + exit 0 + fi + + echo "Starting RHQ Server in console..." + + # we are running in foreground, make both pids show the same process + echo "$$" > "$_SERVER_PIDFILE" + echo "$$" > "$_JVM_PIDFILE" + + # start the server, making sure its working directory is the JBossAS bin directory + cd "${RHQ_SERVER_HOME}/jbossas/bin" + "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS + + _JBOSS_STATUS=$? + + remove_pid_files + + exit $_JBOSS_STATUS + ;; + +'start') + if [ "$_SERVER_RUNNING" = "1" ]; then + echo "$_SERVER_STATUS" + exit 0 + fi + + echo "Trying to start the RHQ Server..." + + LAUNCH_JBOSS_IN_BACKGROUND=true + JBOSS_PIDFILE="$_JVM_PIDFILE" + export LAUNCH_JBOSS_IN_BACKGROUND + export JBOSS_PIDFILE + + # start the server, making sure its working directory is the JBossAS bin directory + cd "${RHQ_SERVER_HOME}/jbossas/bin" + if [ -n "$RHQ_SERVER_DEBUG" ] && [ "$RHQ_SERVER_DEBUG" != "false" ]; then + "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS & + else + "$_JBOSS_RUN_SCRIPT" $_CMDLINE_OPTS > /dev/null 2>&1 & + fi + + echo "$!" > "$_SERVER_PIDFILE" + + sleep 5 + check_status "starting" + echo "$_SERVER_STATUS" + + if [ "$_SERVER_RUNNING" = "1" ]; then + exit 0 + else + echo "Failed to start - make sure the RHQ Server is fully configured properly" + exit 1 + fi + ;; + +'stop') + if [ "$_SERVER_RUNNING" = "0" ]; then + echo "$_SERVER_STATUS" + remove_pid_files + exit 0 + fi + + echo "Trying to stop the RHQ Server..." + + echo "RHQ Server (pid=${_SERVER_PID}) is stopping..." + + while [ "$_SERVER_RUNNING" = "1" ]; do + kill -TERM $_SERVER_PID + sleep 2 + check_status "stopping..." + done + + remove_pid_files + echo "RHQ Server has stopped." + exit 0 + ;; + +'kill') + if [ "$_SERVER_RUNNING" = "0" ]; then + echo "$_SERVER_STATUS" + fi + if [ "$_JVM_RUNNING" = "0" ]; then + echo "$_JVM_STATUS" + remove_pid_files + exit 0 + fi + + echo "Trying to kill the RHQ Server..." + + echo "RHQ Server parent process (pid=${_SERVER_PID}) is being killed..." + while [ "$_SERVER_RUNNING" = "1" ]; do + kill -9 $_SERVER_PID + sleep 2 + check_status "killing..." + done + + echo "Java Virtual Machine child process (pid=${_JVM_PID}) is being killed..." + while [ "$_JVM_RUNNING" = "1" ]; do + kill -9 $_JVM_PID + sleep 2 + check_status "killing..." + done + + remove_pid_files + echo "RHQ Server has been killed." + exit 0 + ;; + +'status') + echo "$_SERVER_STATUS" + echo "$_JVM_STATUS" + exit 0 + ;; + +*) + echo "Usage: $0 { start | stop | kill | status | console }" + exit 1 + ;; +esac + diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf new file mode 100644 index 0000000..9fef419 --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf @@ -0,0 +1,212 @@ +#***************************************************************************** +# RHQ Server Java Service Wrapper Configuration File +# +# If you wish to modify these settings or add additional ones, it is +# recommended that you do not modify this file; instead, create your own +# override include file named "rhq-server-wrapper.inc" and place it in the +# same directory where this file is located. +# +# See http://wrapper.tanukisoftware.org/doc/english/properties.html +# for full documentation on all available wrapper.* settings +#***************************************************************************** + +#***************************************************************************** +# Environment Variables Required +# +# All of the below environment variables may be either specified in the +# process environment or in the wrapper environment configuration file or on +# the command line. The wrapper environment configuration file must be +# named "rhq-server-wrapper.env" and must be placed in the same directory +# where this file is located. +# +# Note that all paths must be full, absolute paths unless noted otherwise. +# +# set.RHQ_SERVER_HOME - RHQ Server installation directory +# set.RHQ_SERVER_INSTANCE_NAME - A name to identify the RHQ Server +# set.RHQ_SERVER_JAVA_EXE_FILE_PATH - Java executable +# set.RHQ_SERVER_OS_PLATFORM - The operating system platform name +# set.RHQ_SERVER_WRAPPER_LOG_DIR_PATH - The Java Service Wrapper's log file (helpful if installing, uninstalling or starting fails) +#***************************************************************************** + +# Load in the specific environment for the RHQ Server instance to start +#include %RHQ_SERVER_HOME%/bin/wrapper/rhq-server-wrapper.env + +#***************************************************************************** +# Start Properties +#***************************************************************************** +# Java JVM Executable (quotes not needed) +wrapper.java.command=%RHQ_SERVER_JAVA_EXE_FILE_PATH% + +# Java Main class. This class must implement the WrapperListener interface. (quotes not needed) +wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp + +# Java Classpath (include wrapper.jar). Add classpath elements starting at 1 (quotes not needed) +wrapper.java.classpath.1=%RHQ_SERVER_HOME%/bin/wrapper/%RHQ_SERVER_OS_PLATFORM%/wrapper.jar + +# Java Library Path (location of wrapper.dll/libwrapper.so and other JNI libs) (quotes not needed) +wrapper.java.library.path.1=%RHQ_SERVER_HOME%/bin/wrapper/%RHQ_SERVER_OS_PLATFORM% + +# The RHQ Server starts the JBossAS container +wrapper.app.parameter.1=-jar +wrapper.app.parameter.2="%RHQ_SERVER_HOME%/jbossas/jboss-modules.jar" + +# Additional command line arguments to be passed to the RHQ Server/JBossAS container (quotes ARE needed) +wrapper.app.parameter.3=-mp +wrapper.app.parameter.4="%RHQ_SERVER_HOME%/jbossas/modules" +wrapper.app.parameter.5=-jaxpmodule +wrapper.app.parameter.6=javax.xml.jaxp-provider +wrapper.app.parameter.7=org.jboss.as.standalone +wrapper.app.parameter.8="-Djboss.home.dir=%RHQ_SERVER_HOME%/jbossas" +wrapper.app.parameter.9=-P +wrapper.app.parameter.10="%RHQ_SERVER_HOME%/bin/rhq-server.properties" + +# Additional JVM parameters (quotes ARE needed) +wrapper.java.additional.1="-D[Standalone]" +wrapper.java.additional.2=-Dapp.name=rhq-server +wrapper.java.additional.3=-server +wrapper.java.additional.4=-Xms1024M +wrapper.java.additional.5=-Xmx1024M +wrapper.java.additional.6=-XX:PermSize=256M +wrapper.java.additional.7=-XX:MaxPermSize=256M +wrapper.java.additional.8=-XX:+TieredCompilation +wrapper.java.additional.9=-XX:+UseCompressedOops +wrapper.java.additional.10=-Djava.net.preferIPv4Stack=true +wrapper.java.additional.11=-Dorg.jboss.resolver.warning=true +wrapper.java.additional.12=-Dsun.rmi.dgc.client.gcInterval=3600000 +wrapper.java.additional.13=-Dsun.rmi.dgc.server.gcInterval=3600000 +wrapper.java.additional.14=-Djboss.modules.system.pkgs=org.jboss.byteman +wrapper.java.additional.15=-Djava.awt.headless=true +wrapper.java.additional.16=-Djboss.server.default.config=standalone.xml +wrapper.java.additional.17="-Dorg.jboss.boot.log.file=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%/jbossas-boot.log" +wrapper.java.additional.18="-Dlogging.configuration=file:%RHQ_SERVER_HOME%/jbossas/standalone/configuration/logging.properties" +wrapper.java.additional.19=-Dsun.lang.ClassLoader.allowArraySyntax=true +wrapper.java.additional.20=-Djava.security.manager +# the double equals for the policy file specification IS INTENTIONAL +wrapper.java.additional.21="-Djava.security.policy==%RHQ_SERVER_HOME%/bin/rhq-server.security-policy" +# Don't need these now, but this is commented out in case we need to add an endorsed dir in the future +#wrapper.java.additional.22="-Djava.endorsed.dirs=%RHQ_SERVER_HOME%/jbossas/lib/endorsed" + +# We want to make sure the Server starts in the JBossAS bin directory +wrapper.working.dir=%RHQ_SERVER_HOME%/jbossas/bin + +#***************************************************************************** +# Wrapper Logging Properties +#***************************************************************************** +# if TRUE, this will turn logging level immediately to DEBUG +wrapper.debug=FALSE + +# Format of output for the console. (See docs for formats) +wrapper.console.format=M + +# Log Level for console output. (NONE,DEBUG,STATUS,INFO,ERROR,FATAL) +wrapper.console.loglevel=INFO + +# Log file to use for wrapper output logging. (quotes not needed) +wrapper.logfile=%RHQ_SERVER_WRAPPER_LOG_DIR_PATH%/rhq-server-wrapper.log + +# Format of output for the log file. (See docs for formats) +wrapper.logfile.format=LPTM + +# Log Level for log file output. (NONE,DEBUG,STATUS,INFO,ERROR,FATAL) +wrapper.logfile.loglevel=ERROR + +# Maximum size that the log file will be allowed to grow to before +# the log is rolled. Size is specified in bytes. The default value +# of 0, disables log rolling. May abbreviate with the 'k' (kb) or +# 'm' (mb) suffix. For example: 10m = 10 megabytes. +wrapper.logfile.maxsize=1m + +# Maximum number of rolled log files which will be allowed before old +# files are deleted. The default value of 0 implies no limit. +wrapper.logfile.maxfiles=1 + +# Log Level for sys/event log output. (See docs for log levels) +wrapper.syslog.loglevel=NONE + +# if JVM hangs, this tries to get a thread dump +# (if TRUE, then ntservice.console is forced to TRUE as well) +wrapper.request_thread_dump_on_failed_jvm_exit=FALSE + +#***************************************************************************** +# Wrapper Windows Properties +#***************************************************************************** +# Title to use when running as a console +wrapper.console.title=RHQ Server [%RHQ_SERVER_INSTANCE_NAME%] + +#***************************************************************************** +# Wrapper Windows XP Service Properties +#***************************************************************************** +# WARNING - Do not modify any of these properties when an application +# using this configuration file has been installed as a service. +# Please uninstall the service before modifying this section. The +# service can then be reinstalled. + +# Name of the service +wrapper.ntservice.name=%RHQ_SERVER_INSTANCE_NAME% + +# Display name of the service +wrapper.ntservice.displayname=RHQ Server [%RHQ_SERVER_INSTANCE_NAME%] + +# Description of the service +wrapper.ntservice.description=RHQ Server instance named %RHQ_SERVER_INSTANCE_NAME% + +# Service dependencies. Add dependencies as needed starting from 1 +wrapper.ntservice.dependency.1= + +# Mode in which the service is installed. AUTO_START or DEMAND_START +wrapper.ntservice.starttype=AUTO_START + +# Allow service to interact with desktop (must be FALSE if account is specified) +wrapper.ntservice.interactive=FALSE + +# Show a console - only takes effect if interactive is TRUE +wrapper.ntservice.console=FALSE + +# The service runs as this user; Local System account is used if not specified +# If prompt is true, the user will be prompted for the password. If false, +# the password configuration property will be used. +#wrapper.ntservice.account=.\username +wrapper.ntservice.password.prompt=TRUE +#wrapper.ntservice.password=xyz + +#***************************************************************************** +# Wrapper UNIX Service Properties +#***************************************************************************** +# For UNIX, make sure it is daemonized +wrapper.daemonize=TRUE + +#***************************************************************************** +# Wrapper Shutdown Monitoring Properties +#***************************************************************************** +# File to be monitored - when anchor file is deleted, the instance will shutdown +#wrapper.anchorfile=%RHQ_SERVER_HOME%\bin\anchor +#wrapper.anchor.poll_interval=5 + +# auto-restart on weird exit status - if exiting normally, just shutdown +wrapper.on_exit.default=RESTART +wrapper.on_exit.0=SHUTDOWN + +# immediately restart the JVM when java.lang.OutOfMemoryError is detected in its output +wrapper.filter.trigger.1=java.lang.OutOfMemoryError +wrapper.filter.action.1=RESTART + +# Determine when to restart or if an invocation simply failed on startup +wrapper.max_failed_invocations=2 +wrapper.successful_invocation_time=300 +wrapper.startup.timeout=30 + +# How to poll the VM to make sure it is not hung +wrapper.ping.interval=30 +wrapper.ping.timeout=45 +wrapper.cpu.timeout=10 + +# Allow our server some extra time to shutdown, since it may take a while to clear the comm repo +wrapper.shutdown.timeout=180 +wrapper.jvm_exit.timeout=180 + +#***************************************************************************** +# Wrapper Override Properties +# wrapper.XXX properties defined in this included file override any +# properties previously defined above. +#***************************************************************************** +#include %RHQ_SERVER_HOME%/bin/wrapper/rhq-server-wrapper.inc diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll new file mode 100644 index 0000000..37c4f33 Binary files /dev/null and b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll differ diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe new file mode 100644 index 0000000..a46a2ac Binary files /dev/null and b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe differ diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar new file mode 100644 index 0000000..c766405 Binary files /dev/null and b/modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar differ diff --git a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc new file mode 100644 index 0000000..060f39c --- /dev/null +++ b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc @@ -0,0 +1,16 @@ +# +# Additional dev-only options for the RHQ Server Java Service Wrapper +# + +# enable remote debugging +wrapper.java.additional.22=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n + +# enable jprofiler +#set.PATH=%PATH%;<jprofiler-install-dir>\bin\windows +#wrapper.java.additional.23=-agentlib:jprofilerti=port=8849 +#wrapper.java.additional.24=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar + +# disable JVM startup timeout +wrapper.startup.timeout=0 +# disable JVM ping timeout +wrapper.ping.timeout=0 diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index e4888b4..eded774 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -199,6 +199,11 @@ <delete dir="${jboss.home}/standalone/tmp" /> <delete dir="${jboss.home}/standalone/work" />  + <echo>Delete unused configurations</echo> + <delete file="${jboss.home}/standalone/configuration/standalone-ha.xml" /> + <delete file="${jboss.home}/standalone/configuration/standalone-full.xml" /> + <delete file="${jboss.home}/standalone/configuration/standalone-full-ha.xml" /> +  <!-- <echo>Upgrading Quartz to v${quartz.version} ...</echo>

11 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits August 2012